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

cups-polld: restart polling on error (bug #769292, STR #4031).

Browse Source
This commit is contained in:
Tim Waugh 2012-02-23 10:52:22 +00:00
parent cd400605c0
commit 1b8e2d6fcd
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cups-polld-reconnect.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up cups-1.5.2/scheduler/cups-polld.c.polld-reconnect cups-1.5.2/scheduler/cups-polld.c
--- cups-1.5.2/scheduler/cups-polld.c.polld-reconnect 2011-05-07 00:07:28.000000000 +0100
+++ cups-1.5.2/scheduler/cups-polld.c 2012-02-23 10:50:57.272513141 +0000
@@ -291,6 +291,7 @@ poll_server(http_t *http, /* I - H
fprintf(stderr, "ERROR: %s CUPS-Get-Printers failed: %s\n", prefix,
cupsLastErrorString());
ippDelete(response);
+ restart_polling = 1;
return (-1);
}

9
cups.spec
View File

@ -19,7 +19,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.5.2 Version: 1.5.2
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -77,6 +77,7 @@ Patch34: cups-avahi-5-services.patch
Patch35: cups-icc.patch Patch35: cups-icc.patch
Patch36: cups-systemd-socket.patch Patch36: cups-systemd-socket.patch
Patch37: cups-str4014.patch Patch37: cups-str4014.patch
Patch38: cups-polld-reconnect.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -297,6 +298,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
# never started processing (bug #784786, STR #4014). # never started processing (bug #784786, STR #4014).
%patch37 -p1 -b .str4014 %patch37 -p1 -b .str4014
# cups-polld: restart polling on error (bug #769292, STR #4031).
%patch38 -p1 -b .polld-reconnect
%if %lspp %if %lspp
# LSPP support. # LSPP support.
%patch100 -p1 -b .lspp %patch100 -p1 -b .lspp
@ -656,6 +660,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ipptool.1.gz %{_mandir}/man1/ipptool.1.gz
%changelog %changelog
* Thu Feb 23 2012 Tim Waugh <twaugh@redhat.com> 1:1.5.2-4
- cups-polld: restart polling on error (bug #769292, STR #4031).
* Thu Feb 16 2012 Tim Waugh <twaugh@redhat.com> 1:1.5.2-3 * Thu Feb 16 2012 Tim Waugh <twaugh@redhat.com> 1:1.5.2-3
- Removed hard requirement on colord as it is optional. - Removed hard requirement on colord as it is optional.