diff --git a/cups-str4380.patch b/cups-str4380.patch new file mode 100644 index 0000000..4e181bd --- /dev/null +++ b/cups-str4380.patch @@ -0,0 +1,20 @@ +diff -up cups-1.7.1/cups/dest.c.str4380 cups-1.7.1/cups/dest.c +--- cups-1.7.1/cups/dest.c.str4380 2014-03-05 13:09:02.211609453 +0000 ++++ cups-1.7.1/cups/dest.c 2014-03-05 13:09:58.871858297 +0000 +@@ -953,11 +953,11 @@ cupsEnumDests( + * Get Bonjour-shared printers... + */ + +- data.type = type; +- data.mask = mask; +- data.devices = cupsArrayNew3((cups_array_func_t)cups_dnssd_compare_devices, +- NULL, NULL, 0, NULL, +- (cups_afree_func_t)cups_dnssd_free_device); ++ data.type = type; ++ data.mask = mask; ++ data.cb = cb; ++ data.user_data = user_data; ++ data.devices = cupsArrayNew3((cups_array_func_t)cups_dnssd_compare_devices, NULL, NULL, 0, NULL, (cups_afree_func_t)cups_dnssd_free_device); + + # ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&data.main_ref) != kDNSServiceErr_NoError) diff --git a/cups.spec b/cups.spec index 36e42c1..06c3e61 100644 --- a/cups.spec +++ b/cups.spec @@ -70,6 +70,7 @@ Patch39: cups-final-content-type.patch Patch40: cups-dbus-notifier.patch Patch41: cups-usb-timeout.patch Patch42: cups-avahi-browse.patch +Patch43: cups-str4380.patch Patch100: cups-lspp.patch @@ -270,6 +271,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch41 -p1 -b .usb-timeout # Prevent dnssd backend exiting too early (bug #1026940, STR #4365). %patch42 -p1 -b .avahi-browse +# Fix for cupsEnumDest() 'removed' callbacks (bug #1054312, STR #4380). +%patch43 -p1 -b .str4380 %if %lspp # LSPP support. @@ -659,6 +662,7 @@ rm -f %{cups_serverbin}/backend/smb %changelog * Tue Mar 11 2014 Tim Waugh - 1:1.6.4-4 +- Fix for cupsEnumDest() 'removed' callbacks (bug #1054312, STR #4380). - Prevent dnssd backend exiting too early (bug #1026940, STR #4365). - Use '-f' when using rm in %%setup section. - Prevent USB timeouts causing incorrect print output (bug #1026914).