diff --git a/cups-str3947.patch b/cups-str3947.patch new file mode 100644 index 0000000..9bff194 --- /dev/null +++ b/cups-str3947.patch @@ -0,0 +1,26 @@ +diff -up cups-1.5.0/notifier/dbus.c.str3947 cups-1.5.0/notifier/dbus.c +--- cups-1.5.0/notifier/dbus.c.str3947 2011-03-04 16:55:59.000000000 +0000 ++++ cups-1.5.0/notifier/dbus.c 2011-09-28 10:42:56.298760622 +0100 +@@ -4,7 +4,7 @@ + * D-Bus notifier for CUPS. + * + * Copyright 2008-2010 by Apple Inc. +- * Copyright (C) 2007 Red Hat, Inc. ++ * Copyright (C) 2011 Red Hat, Inc. + * Copyright (C) 2007 Tim Waugh + * Copyright 1997-2005 by Easy Software Products. + * +@@ -423,10 +423,11 @@ main(int argc, /* I - Number of comm + p = printer_reasons; + for (i = 0; i < attr->num_values; i++) + { +- strcpy(p, attr->values[i].string.text); +- p += strlen(p); + if (i) + *p++ = ','; ++ ++ strcpy(p, attr->values[i].string.text); ++ p += strlen(p); + } + dbus_message_iter_append_string(&iter, &printer_reasons); + } diff --git a/cups.spec b/cups.spec index 2bb788d..2c1750d 100644 --- a/cups.spec +++ b/cups.spec @@ -13,7 +13,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.5.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -56,6 +56,7 @@ Patch20: cups-filter-debug.patch Patch21: cups-uri-compat.patch Patch22: cups-cups-get-classes.patch Patch23: cups-str3382.patch +Patch24: cups-str3947.patch Patch25: cups-0755.patch Patch26: cups-snmp-quirks.patch Patch27: cups-hp-deviceid-oid.patch @@ -263,6 +264,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch22 -p1 -b .cups-get-classes # Fix temporary filename creation. %patch23 -p1 -b .str3382 +# Fixed string manipulation in the dbus notifier (STR #3947, bug #741833). +%patch24 -p1 -b .str3947 # Use mode 0755 for binaries and libraries where appropriate. %patch25 -p1 -b .0755 # Handle SNMP supply level quirks (bug #581825). @@ -639,6 +642,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ipptool.1.gz %changelog +* Wed Sep 28 2011 Tim Waugh 1:1.5.0-10 +- Fixed string manipulation in the dbus notifier (STR #3947, bug #741833). + * Thu Sep 22 2011 Tim Waugh 1:1.5.0-9 - Fixed systemd socket activation support (bug #738709, bug #738710).