rpms/cups/F-8 cups-str2664.patch,NONE,1.1 cups.spec,1.380,1.381

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25782

Modified Files:
	cups.spec 
Added Files:
	cups-str2664.patch 
Log Message:
* Thu Jan 10 2008 Tim Waugh <twaugh at redhat.com>
- Apply patch to fix busy looping in the backends (bug #426653, STR #2664).


cups-str2664.patch:

--- NEW FILE cups-str2664.patch ---
diff -up cups-1.3.5/backend/runloop.c~ cups-1.3.5/backend/runloop.c
--- cups-1.3.5/backend/runloop.c~	2007-08-22 19:34:34.000000000 +0100
+++ cups-1.3.5/backend/runloop.c	2008-01-09 15:37:44.000000000 +0000
@@ -216,7 +216,7 @@ backendRunLoop(
       FD_SET(CUPS_SC_FD, &input);
 
     FD_ZERO(&output);
-    if (print_bytes || !use_bc)
+    if (print_bytes || (!use_bc && !side_cb))
       FD_SET(device_fd, &output);
 
     if (use_bc || side_cb)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- cups.spec	9 Jan 2008 17:45:36 -0000	1.380
+++ cups.spec	10 Jan 2008 09:12:56 -0000	1.381
@@ -46,6 +46,7 @@
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
 Patch22: cups-strict-ppd-line-length.patch
+Patch23: cups-str2664.patch
 Patch25: cups-usb-paperout.patch
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -159,6 +160,7 @@
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
 %patch22 -p1 -b .strict-ppd-line-length
+%patch23 -p1 -b .str2664
 %patch25 -p1 -b .usb-paperout
 
 %if %lspp
@@ -451,6 +453,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jan 10 2008 Tim Waugh <twaugh at redhat.com>
+- Apply patch to fix busy looping in the backends (bug #426653, STR #2664).
+
 * Wed Jan  9 2008 Tim Waugh <twaugh at redhat.com>
 - Apply patch to prevent overlong PPD lines from causing failures except
   in strict mode (bug #405061).  Needed for compatibility with older