diff --git a/cups-polld-reconnect.patch b/cups-polld-reconnect.patch new file mode 100644 index 0000000..5e966d1 --- /dev/null +++ b/cups-polld-reconnect.patch @@ -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); + } + diff --git a/cups.spec b/cups.spec index 6f5aa35..bd6b9df 100644 --- a/cups.spec +++ b/cups.spec @@ -13,7 +13,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.8 -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 @@ -85,6 +85,7 @@ Patch44: cups-avahi-5-services.patch Patch45: cups-icc.patch Patch46: cups-upgrade.patch +Patch47: cups-polld-reconnect.patch Patch100: cups-lspp.patch @@ -323,6 +324,9 @@ module. # (bug #748988). %patch46 -p1 -b .upgrade +# cups-polld: restart polling on error (bug #769292, STR #4031). +%patch47 -p1 -b .polld-reconnect + %if %lspp # LSPP support. %patch100 -p1 -b .lspp @@ -652,6 +656,9 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Thu Feb 23 2012 Tim Waugh 1:1.4.8-10 +- cups-polld: restart polling on error (bug #769292, STR #4031). + * Thu Feb 16 2012 Tim Waugh 1:1.4.8-9 - Apply patch from upstream revision 9974 to fix encryption upgrades (bug #748988).