packages (CUPS_1_4): cups/cups.spec, cups/cups-polld-busy-loop.patch (NEW) ...

[arekm]

Author: arekm                        Date: Sun Aug 28 05:37:36 2011 GMT
Module: packages                      Tag: CUPS_1_4
---- Log message:
- rel 2; avoid busy loop and cpu eating in cups-polld

---- Files affected:
packages/cups:
   cups.spec (1.298.2.3 -> 1.298.2.4) , cups-polld-busy-loop.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.298.2.3 packages/cups/cups.spec:1.298.2.4
--- packages/cups/cups.spec:1.298.2.3	Fri Aug  5 14:38:26 2011
+++ packages/cups/cups.spec	Sun Aug 28 07:37:30 2011
@@ -18,7 +18,7 @@
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão
 Name:		cups
 Version:	1.4.8
-Release:	1
+Release:	2
 Epoch:		1
 License:	LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
 Group:		Applications/Printing
@@ -43,6 +43,7 @@
 Patch10:	%{name}-peercred.patch
 Patch11:	%{name}-usb.patch
 Patch12:	%{name}-desktop.patch
+Patch13:	%{name}-polld-busy-loop.patch
 URL:		http://www.cups.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -310,6 +311,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -727,6 +729,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.298.2.4  2011/08/28 05:37:30  arekm
+- rel 2; avoid busy loop and cpu eating in cups-polld
+
 Revision 1.298.2.3  2011/08/05 12:38:26  baggins
 - 1.4.8
 

================================================================
Index: packages/cups/cups-polld-busy-loop.patch
diff -u /dev/null packages/cups/cups-polld-busy-loop.patch:1.1.2.1
--- /dev/null	Sun Aug 28 07:37:36 2011
+++ packages/cups/cups-polld-busy-loop.patch	Sun Aug 28 07:37:30 2011
@@ -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));
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.298.2.3&r2=1.298.2.4&f=u