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

Merge branch 'f14' into f15

Browse Source
This commit is contained in:
Tim Waugh 2011-07-13 11:17:30 +01:00
commit 6d47608f7b
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups-polld-busy-loop.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up cups-1.4.7/cups/request.c.polld-busy-loop cups-1.4.7/cups/request.c
--- cups-1.4.7/cups/request.c.polld-busy-loop 2011-03-04 19:28:38.000000000 +0000
+++ cups-1.4.7/cups/request.c 2011-07-13 10:21:25.397211968 +0100
@@ -395,7 +395,7 @@ cupsGetResponse(http_t *http, /* I -
{
status = httpUpdate(http);
}
- while (http->state == HTTP_POST_RECV);
+ while (status != HTTP_ERROR && http->state == HTTP_POST_RECV);
DEBUG_printf(("2cupsGetResponse: status=%d", status));

8
cups.spec
View File

@ -13,7 +13,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.7 Version: 1.4.7
Release: 6%{?dist} Release: 7%{?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
@ -71,6 +71,7 @@ Patch32: cups-texttops-rotate-page.patch
Patch33: cups-usb-parallel.patch Patch33: cups-usb-parallel.patch
Patch34: cups-str3535.patch Patch34: cups-str3535.patch
Patch35: cups-str3875.patch Patch35: cups-str3875.patch
Patch36: cups-polld-busy-loop.patch
Patch40: cups-avahi-1-config.patch Patch40: cups-avahi-1-config.patch
Patch41: cups-avahi-2-backend.patch Patch41: cups-avahi-2-backend.patch
@ -290,6 +291,8 @@ module.
%patch34 -p1 -b .str3535 %patch34 -p1 -b .str3535
# Fix SNMP supply level crasher (STR #3875, bug #719057). # Fix SNMP supply level crasher (STR #3875, bug #719057).
%patch35 -p1 -b .str3875 %patch35 -p1 -b .str3875
# Avoid busy loop in cups-polld (bug #720921).
%patch36 -p1 -b .polld-busy-loop
# Avahi support: # Avahi support:
# - discovery in the dnssd backend # - discovery in the dnssd backend
@ -627,6 +630,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Wed Jul 13 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.7-7
- Avoid busy loop in cups-polld (bug #720921).
* Thu Jul 7 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.7-6 * Thu Jul 7 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.7-6
- Fix SNMP supply level crasher (STR #3875, bug #719057). - Fix SNMP supply level crasher (STR #3875, bug #719057).