diff --git a/cups-str2664.patch b/cups-str2664.patch new file mode 100644 index 0000000..8ca7ee9 --- /dev/null +++ b/cups-str2664.patch @@ -0,0 +1,12 @@ +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) diff --git a/cups.spec b/cups.spec index e9f70fd..7e6e888 100644 --- a/cups.spec +++ b/cups.spec @@ -46,6 +46,7 @@ Patch19: cups-eggcups.patch 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 @@ lpd emulation. %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 @@ rm -rf $RPM_BUILD_ROOT %{cups_serverbin}/daemon/cups-lpd %changelog +* Thu Jan 10 2008 Tim Waugh +- Apply patch to fix busy looping in the backends (bug #426653, STR #2664). + * Wed Jan 9 2008 Tim Waugh - Apply patch to prevent overlong PPD lines from causing failures except in strict mode (bug #405061). Needed for compatibility with older