diff --git a/cups-str4005.patch b/cups-str4005.patch new file mode 100644 index 0000000..bbb488c --- /dev/null +++ b/cups-str4005.patch @@ -0,0 +1,25 @@ +diff -up cups-1.5.0/cups/backend.c.backend-bad-id cups-1.5.0/cups/backend.c +--- cups-1.5.0/cups/backend.c.backend-bad-id 2011-04-29 23:45:35.000000000 +0100 ++++ cups-1.5.0/cups/backend.c 2012-01-17 12:23:13.687442534 +0000 +@@ -110,7 +110,8 @@ cupsBackendReport( + + + /* +- * 'quote_string()' - Write a quoted string to stdout, escaping \ and ". ++ * 'quote_string()' - Write a quoted string to stdout, escaping \ and ", ++ * and replacing newline with space. + */ + + static void +@@ -125,7 +126,10 @@ quote_string(const char *s) /* I - Stri + if (*s == '\\' || *s == '\"') + putchar('\\'); + +- putchar(*s); ++ if (*s == '\n') ++ putchar(' '); ++ else ++ putchar(*s); + + s ++; + } diff --git a/cups.spec b/cups.spec index d8f4809..b201e4c 100644 --- a/cups.spec +++ b/cups.spec @@ -75,6 +75,7 @@ Patch35: cups-polld-busy-loop.patch Patch36: cups-CVE-2011-2896.patch Patch37: cups-str3947.patch Patch38: cups-str4004.patch +Patch39: cups-str4005.patch Patch40: cups-avahi-1-config.patch Patch41: cups-avahi-2-backend.patch @@ -301,6 +302,9 @@ module. # Don't accept Device URIs of '\0' from SNMP devices # (bug #770646, STR #4004). %patch38 -p1 -b .str4004 +# Replace newline characters with spaces in reported Device IDs +# (bug #782129, STR #4005). +%patch39 -p1 -b .str4005 # Avahi support: # - discovery in the dnssd backend @@ -644,6 +648,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Jan 17 2012 Tim Waugh 1:1.4.8-8 +- Replace newline characters with spaces in reported Device IDs + (bug #782129, STR #4005). - Don't accept Device URIs of '\0' from SNMP devices (bug #770646, STR #4004).