rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
Resolves: rhbz#1054312
This commit is contained in:
Tim Waugh 2014-03-05 13:15:02 +00:00
parent 7cb9904f3b
commit fee478c5ac
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cups-str4380.patch Normal file
View File

@ -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)

8
cups.spec
View File

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