[cups] Fix for cupsEnumDest() 'removed' callbacks (bug #1054312, STR #4380).

[Tim Waugh]

commit fee478c5ac568e8a4d918dae040fa3a16d78ca95
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Mar 5 13:15:02 2014 +0000

    Fix for cupsEnumDest() 'removed' callbacks (bug #1054312, STR #4380).
    
    Resolves: rhbz#1054312

 cups-str4380.patch |   20 ++++++++++++++++++++
 cups.spec          |    8 +++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
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 9a147ed..f61bd5d 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -68,6 +68,7 @@ Patch40: cups-final-content-type.patch
 Patch41: cups-journal.patch
 Patch42: cups-synconclose.patch
 Patch43: cups-avahi-browse.patch
+Patch44: cups-str4380.patch
 
 Patch100: cups-lspp.patch
 
@@ -263,6 +264,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch42 -p1 -b .synconclose
 # Prevent dnssd backend exiting too early (bug #1026940, STR #4365).
 %patch43 -p1 -b .avahi-browse
+# Fix for cupsEnumDest() 'removed' callbacks (bug #1054312, STR #4380).
+%patch44 -p1 -b .str4380
 
 %if %lspp
 # LSPP support.
@@ -643,6 +646,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Wed Mar  5 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.1-5
+- Fix for cupsEnumDest() 'removed' callbacks (bug #1054312, STR #4380).
+
 * Mon Feb 17 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.1-4
 - Document 'journal' logging target.