From b4b4411cb5c053852bdfe677cab8bb5eedd224f2 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Fri, 19 Apr 2013 13:20:30 +0200 Subject: [PATCH 1/5] amend previous commit and fix versions in changelog --- cups.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cups.spec b/cups.spec index 3b3f11d..1f8eac4 100644 --- a/cups.spec +++ b/cups.spec @@ -342,7 +342,7 @@ d /var/spool/cups/tmp - - - 30d EOF # /usr/lib/tmpfiles.d/cups-lp.conf (bug #812641) -cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/cups-lp.conf < ${RPM_BUILD_ROOT}%{_tmpfilesdir}/cups-lp.conf < 1:1.6.1-4 +* Thu Apr 4 2013 Tim Waugh 1:1.6.2-4 - Use IP address when resolving DNSSD URIs (bug #948288). -* Thu Mar 28 2013 Tim Waugh 1:1.6.1-3 +* Thu Mar 28 2013 Tim Waugh 1:1.6.2-3 - Check for cupsd.conf existence prior to grepping it (bug #928816). * Tue Mar 19 2013 Jiri Popelka - 1:1.6.2-2 From 024c4ff312929cc046250aaf19052c822e1ff42a Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Wed, 15 May 2013 12:54:40 +0200 Subject: [PATCH 2/5] move cups/ppdc/ to filesystem subpackage --- cups.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cups.spec b/cups.spec index 1f8eac4..f038c2e 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.6.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -578,7 +578,6 @@ rm -f %{cups_serverbin}/backend/smb %{_datadir}/cups/examples %{_datadir}/cups/mime/mime.types %{_datadir}/cups/mime/mime.convs -%dir %{_datadir}/cups/ppdc %{_datadir}/cups/ppdc/*.defs %{_datadir}/cups/ppdc/*.h @@ -598,6 +597,7 @@ rm -f %{cups_serverbin}/backend/smb %dir %{_datadir}/cups/drv %dir %{_datadir}/cups/mime %dir %{_datadir}/cups/model +%dir %{_datadir}/cups/ppdc %dir %{_datadir}/ppd %files devel @@ -621,6 +621,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Wed May 15 2013 Jiri Popelka - 1:1.6.2-5 +- move cups/ppdc/ to filesystem subpackage + * Wed Apr 10 2013 Tim Waugh - cups-dbus-utf.patch: now that the scheduler only accepts valid UTF-8 strings for job-name, there's no need to validate it as UTF-8 in the From c314542ce0202933bd3c4f255e6d1c16b4fd1cbb Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Thu, 23 May 2013 10:29:56 +0200 Subject: [PATCH 3/5] don't ship Russian web templates because they're broken (#960571, STR #4310) --- cups.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cups.spec b/cups.spec index f038c2e..c80c79a 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.6.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -360,6 +360,10 @@ s:.*\('%{_datadir}'/\)\([^/_]\+\)\(.*\.po$\):%lang(\2) \1\2\3: /^\([^%].*\)/d ' > %{name}.lang +# don't ship Russian web templates because they're broken (#960571, STR #4310) +# will be fixed in 1.6.3 +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/www/ru +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/cups/templates/ru %post %systemd_post %{name}.path %{name}.socket %{name}.service @@ -517,7 +521,7 @@ rm -f %{cups_serverbin}/backend/smb %dir %{_datadir}/%{name}/www/es %dir %{_datadir}/%{name}/www/fr %dir %{_datadir}/%{name}/www/ja -%dir %{_datadir}/%{name}/www/ru +#%%dir %{_datadir}/%{name}/www/ru %{_datadir}/%{name}/www/images %{_datadir}/%{name}/www/*.css %doc %{_datadir}/%{name}/www/index.html @@ -528,7 +532,7 @@ rm -f %{cups_serverbin}/backend/smb %doc %{_datadir}/%{name}/www/es/index.html %doc %{_datadir}/%{name}/www/fr/index.html %doc %{_datadir}/%{name}/www/ja/index.html -%doc %{_datadir}/%{name}/www/ru/index.html +#%%doc %{_datadir}/%{name}/www/ru/index.html %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket %{_unitdir}/%{name}.path @@ -561,14 +565,14 @@ rm -f %{cups_serverbin}/backend/smb %dir %{_datadir}/cups/templates/es %dir %{_datadir}/cups/templates/fr %dir %{_datadir}/cups/templates/ja -%dir %{_datadir}/cups/templates/ru +#%%dir %{_datadir}/cups/templates/ru %{_datadir}/cups/templates/*.tmpl %{_datadir}/cups/templates/ca/*.tmpl %{_datadir}/cups/templates/cs/*.tmpl %{_datadir}/cups/templates/es/*.tmpl %{_datadir}/cups/templates/fr/*.tmpl %{_datadir}/cups/templates/ja/*.tmpl -%{_datadir}/cups/templates/ru/*.tmpl +#%%{_datadir}/cups/templates/ru/*.tmpl %dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp %dir %attr(0710,root,lp) %{_localstatedir}/spool/cups %dir %attr(0755,lp,sys) %{_localstatedir}/log/cups @@ -621,6 +625,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Thu May 23 2013 Jiri Popelka - 1:1.6.2-6 +- don't ship Russian web templates because they're broken (#960571, STR #4310) + * Wed May 15 2013 Jiri Popelka - 1:1.6.2-5 - move cups/ppdc/ to filesystem subpackage From dfc01588c9c81318aaf7a5c1ace7e813da02d33c Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Thu, 23 May 2013 10:50:14 +0200 Subject: [PATCH 4/5] Added more USB quirks for the libusb-based backend (STR #4311) --- cups-usblp-quirks.patch | 62 +++++++++++++++++++++++++++++++++++++++++ cups.spec | 9 +++++- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 cups-usblp-quirks.patch 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) From 5f1314986b4212becd62e188bb55bb9dfdd73168 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 4 Jun 2013 11:00:27 +0100 Subject: [PATCH 5/5] Return from cupsEnumDests() once all records have been returned. --- cups-enum-all.patch | 17 +++++++++++++++++ cups.spec | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 cups-enum-all.patch diff --git a/cups-enum-all.patch b/cups-enum-all.patch new file mode 100644 index 0000000..0ac3983 --- /dev/null +++ b/cups-enum-all.patch @@ -0,0 +1,17 @@ +diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c +--- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100 ++++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100 +@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb( + break; + + case AVAHI_BROWSER_REMOVE: +- case AVAHI_BROWSER_ALL_FOR_NOW: + case AVAHI_BROWSER_CACHE_EXHAUSTED: + break; ++ ++ case AVAHI_BROWSER_ALL_FOR_NOW: ++ avahi_simple_poll_quit(data->simple_poll); ++ break; + } + } + diff --git a/cups.spec b/cups.spec index e416e62..2c281fd 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.6.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -56,6 +56,7 @@ Patch25: cups-systemd-socket.patch Patch26: cups-lpd-manpage.patch Patch27: cups-avahi-address.patch Patch28: cups-usblp-quirks.patch +Patch29: cups-enum-all.patch Patch100: cups-lspp.patch @@ -228,6 +229,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results. # More USB quirks for the libusb-based backend (STR #4311). # Fixed in 1.6.3 %patch28 -p1 -b .quirks +# Return from cupsEnumDests() once all records have been returned. +%patch29 -p1 -b .enum-all %if %lspp # LSPP support. @@ -629,6 +632,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Tue Jun 4 2013 Tim Waugh - 1:1.6.2-8 +- Return from cupsEnumDests() once all records have been returned. + * Thu May 23 2013 Jiri Popelka - 1:1.6.2-7 - Added more USB quirks for the libusb-based backend (STR #4311)