diff --git a/cups-usb-timeout.patch b/cups-usb-timeout.patch new file mode 100644 index 0000000..2c95e09 --- /dev/null +++ b/cups-usb-timeout.patch @@ -0,0 +1,30 @@ +diff -up cups-1.7.0/backend/usb-libusb.c.usb-timeout cups-1.7.0/backend/usb-libusb.c +--- cups-1.7.0/backend/usb-libusb.c.usb-timeout 2013-07-17 16:51:43.000000000 +0100 ++++ cups-1.7.0/backend/usb-libusb.c 2013-11-28 16:44:03.785124015 +0000 +@@ -496,7 +496,7 @@ print_device(const char *uri, /* I - De + iostatus = libusb_bulk_transfer(g.printer->handle, + g.printer->write_endp, + print_buffer, g.print_bytes, +- &bytes, 60000); ++ &bytes, 72 * 60 * 60000); + /* + * Ignore timeout errors, but retain the number of bytes written to + * avoid sending duplicate data... +@@ -519,7 +519,7 @@ print_device(const char *uri, /* I - De + iostatus = libusb_bulk_transfer(g.printer->handle, + g.printer->write_endp, + print_buffer, g.print_bytes, +- &bytes, 60000); ++ &bytes, 72 * 60 * 60000); + } + + /* +@@ -534,7 +534,7 @@ print_device(const char *uri, /* I - De + iostatus = libusb_bulk_transfer(g.printer->handle, + g.printer->write_endp, + print_buffer, g.print_bytes, +- &bytes, 60000); ++ &bytes, 72 * 60 * 60000); + } + + if (iostatus) diff --git a/cups.spec b/cups.spec index d81e467..c1fbc0b 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.6.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -68,6 +68,7 @@ Patch37: cups-full-relro.patch Patch38: cups-web-devices-timeout.patch Patch39: cups-final-content-type.patch Patch40: cups-dbus-notifier.patch +Patch41: cups-usb-timeout.patch Patch100: cups-lspp.patch @@ -264,6 +265,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch39 -p1 -b .final-content-type # Avoid stale lockfile in dbus notifier (bug #1026949). %patch40 -p1 -b .dbus-notifier +# Prevent USB timeouts causing incorrect print output (bug #1026914). +%patch41 -p1 -b .usb-timeout %if %lspp # LSPP support. @@ -652,6 +655,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Tue Mar 11 2014 Tim Waugh - 1:1.6.4-4 +- Prevent USB timeouts causing incorrect print output (bug #1026914). + * Thu Nov 14 2013 Tim Waugh - 1:1.6.4-3 - Avoid stale lockfile in dbus notifier (bug #1026949).