From dfc01588c9c81318aaf7a5c1ace7e813da02d33c Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: May 23 2013 08:50:14 +0000 Subject: Added more USB quirks for the libusb-based backend (STR #4311) --- diff --git a/cups-usblp-quirks.patch b/cups-usblp-quirks.patch new file mode 100644 index 0000000..c7f1cbf --- /dev/null +++ b/cups-usblp-quirks.patch @@ -0,0 +1,62 @@ +diff -up cups-1.6.2/backend/usb-libusb.c.quirks cups-1.6.2/backend/usb-libusb.c +--- cups-1.6.2/backend/usb-libusb.c.quirks 2013-03-14 15:31:07.000000000 +0100 ++++ cups-1.6.2/backend/usb-libusb.c 2013-05-23 10:44:34.456769834 +0200 +@@ -142,8 +142,12 @@ static const struct quirk_printer_struct + { 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */ + { 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */ + { 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */ ++ { 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International, ++ Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */ + { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, + by zut */ ++ { 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D ++ Printer, https://bugs.launchpad.net/bugs/1160638 */ + { 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200 + Printer, http://www.cups.org/str.php?L4155 */ + { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300 +@@ -158,6 +162,8 @@ static const struct quirk_printer_struct + Printer, http://www.cups.org/str.php?L4155 */ + { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560 + Printer, http://www.cups.org/str.php?L4155 */ ++ { 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150 ++ Printer, https://bugs.launchpad.net/bugs/1160638 */ + { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd + HL-1430 Laser Printer, + https://bugs.launchpad.net/bugs/1038695 */ +@@ -165,24 +171,33 @@ static const struct quirk_printer_struct + USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd + HL-1440 Laser Printer, + https://bugs.launchpad.net/bugs/1000253 */ ++ { 0x04f9, 0x000e, USBLP_QUIRK_BIDIR | ++ USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd ++ HL-1450 Laser Printer, ++ https://bugs.launchpad.net/bugs/1000253 */ + { 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. + Okipage 14ex Printer, + https://bugs.launchpad.net/bugs/872483 */ + { 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d, + https://bugs.launchpad.net/bugs/872483 */ +- { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, ++ { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR | ++ USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, + http://bugs.debian.org/697970 */ ++ { 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670, ++ https://bugs.launchpad.net/bugs/872483 */ + { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt + Printer M129C */ + { 0x067b, 0x2305, USBLP_QUIRK_BIDIR | + USBLP_QUIRK_NO_REATTACH | + USBLP_QUIRK_RESET }, ++ /* Prolific Technology, Inc. PL2305 Parallel Port ++ (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ + { 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124 + https://bugzilla.redhat.com/show_bug.cgi?id=867392 */ + { 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210 + https://bugs.launchpad.net/bugs/1102470 */ +- /* Prolific Technology, Inc. PL2305 Parallel Port +- (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ ++ { 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics ++ CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */ + { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices, + https://bugs.launchpad.net/bugs/1032456 */ + { 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices, diff --git a/cups.spec b/cups.spec index c80c79a..e416e62 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.6.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -55,6 +55,7 @@ Patch24: cups-ricoh-deviceid-oid.patch Patch25: cups-systemd-socket.patch Patch26: cups-lpd-manpage.patch Patch27: cups-avahi-address.patch +Patch28: cups-usblp-quirks.patch Patch100: cups-lspp.patch @@ -224,6 +225,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch26 -p1 -b .lpd-manpage # Use IP address when resolving DNSSD URIs (bug #948288). %patch27 -p1 -b .avahi-address +# More USB quirks for the libusb-based backend (STR #4311). +# Fixed in 1.6.3 +%patch28 -p1 -b .quirks %if %lspp # LSPP support. @@ -625,6 +629,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Thu May 23 2013 Jiri Popelka - 1:1.6.2-7 +- Added more USB quirks for the libusb-based backend (STR #4311) + * Thu May 23 2013 Jiri Popelka - 1:1.6.2-6 - don't ship Russian web templates because they're broken (#960571, STR #4310)