[cups/f19: 2/2] Merge branch 'f18' into f19
Tim Waugh
twaugh at fedoraproject.org
Tue Jun 25 12:16:13 UTC 2013
commit 8e3d134a894e8da9bd403c599c0f9e7a4c7b4bb3
Merge: 77e4d88 0a1c56e
Author: Tim Waugh <twaugh at redhat.com>
Date: Tue Jun 25 09:26:26 2013 +0100
Merge branch 'f18' into f19
cups-usblp-quirks.patch | 16 +++++++++++-----
cups.spec | 8 ++++++--
2 files changed, 17 insertions(+), 7 deletions(-)
---
diff --cc cups-usblp-quirks.patch
index c7f1cbf,15e0c0b..59ecb0d
--- a/cups-usblp-quirks.patch
+++ b/cups-usblp-quirks.patch
@@@ -1,46 -1,56 +1,52 @@@
- 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
-diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-libusb.c
---- cups-1.5.4/backend/usb-libusb.c.usblp-quirks 2012-07-16 18:16:46.000000000 +0100
-+++ cups-1.5.4/backend/usb-libusb.c 2013-06-25 09:20:42.821779510 +0100
-@@ -70,7 +70,7 @@ typedef struct usb_printer_s /**** USB
- read_endp, /* Read endpoint */
- protocol, /* Protocol: 1 = Uni-di, 2 = Bi-di. */
- usblp_attached, /* "usblp" kernel module attached? */
-- opened_for_job; /* Set to 1 by print_device() */
-+ reset_after_job; /* Set to 1 by print_device() */
- unsigned int quirks; /* Quirks flags */
- struct libusb_device_handle *handle; /* Open handle to device */
- } usb_printer_t;
-@@ -122,6 +122,8 @@ struct quirk_printer_struct {
- #define USBLP_QUIRK_USB_INIT 0x2 /* needs vendor USB init string */
- #define USBLP_QUIRK_BAD_CLASS 0x4 /* descriptor uses vendor-specific
- Class or SubClass */
-+#define USBLP_QUIRK_RESET 0x4000 /* After printing do a reset
-+ for clean-up */
- #define USBLP_QUIRK_NO_REATTACH 0x8000 /* After printing we cannot re-attach
- the usblp kernel module */
-
-@@ -141,15 +143,47 @@ static const struct quirk_printer_struct
++diff -up cups-1.6.2/backend/usb-libusb.c.usblp-quirks cups-1.6.2/backend/usb-libusb.c
++--- cups-1.6.2/backend/usb-libusb.c.usblp-quirks 2013-03-14 14:31:07.000000000 +0000
+++++ cups-1.6.2/backend/usb-libusb.c 2013-06-25 09:25:35.941884975 +0100
+@@ -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 <kernel at zut.de> */
-+ { 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
-+ Printer, https://bugs.launchpad.net/bugs/1032385 */
-+ { 0x04a9, 0x1721, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP210
-+ https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53 */
-+ { 0x04a9, 0x170c, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP500
-+ Printer, https://bugs.launchpad.net/bugs/1032456 */
-+ { 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
-+ Printer, https://bugs.launchpad.net/bugs/1050009 */
++ { 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
++@@ -154,10 +158,14 @@ static const struct quirk_printer_struct
++ Printer, https://bugs.launchpad.net/bugs/1032456 */
++ { 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
++ Printer, https://bugs.launchpad.net/bugs/1050009 */
+ + { 0x04a9, 0x1730, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP540
+ + Printer, https://bugzilla.redhat.com/967873 */
-+ { 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550
-+ Printer, http://www.cups.org/str.php?L4155 */
-+ { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
-+ Printer, http://www.cups.org/str.php?L4155 */
-+ { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
-+ HL-1430 Laser Printer,
-+ https://bugs.launchpad.net/bugs/1038695 */
- { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR |
++ { 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550
+ 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
++@@ -165,24 +173,33 @@ static const struct quirk_printer_struct
USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
-- HL-1440 Laser Printer */
-+ HL-1440 Laser Printer,
+ 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,
+ { 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 */
diff --cc cups.spec
index d144a20,1f943f3..9fb3c27
--- a/cups.spec
+++ b/cups.spec
@@@ -7,14 -9,12 +7,14 @@@
# but we use lib for compatibility with 3rd party drivers (at upstream request).
%global cups_serverbin %{_exec_prefix}/lib/cups
-Summary: Common Unix Printing System
+Summary: CUPS printing system
Name: cups
-Version: 1.5.4
-Release: 29%{?dist}
+Epoch: 1
+Version: 1.6.2
- Release: 10%{?dist}
++Release: 11%{?dist}
License: GPLv2
Group: System Environment/Daemons
+Url: http://www.cups.org/
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
# Pixmap for desktop file
Source2: cupsprinter.png
@@@ -197,46 -257,98 +197,47 @@@ Sends IPP requests to the specified UR
%patch11 -p1 -b .pid
# Fix implementation of com.redhat.PrinterSpooler D-Bus object.
%patch12 -p1 -b .eggcups
-# More sophisticated implementation of cupsGetPassword than getpass.
-%patch13 -p1 -b .getpass
# Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
-%patch14 -p1 -b .driverd-timeout
+%patch13 -p1 -b .driverd-timeout
# Only enforce maximum PPD line length when in strict mode.
-%patch15 -p1 -b .strict-ppd-line-length
+%patch14 -p1 -b .strict-ppd-line-length
# Re-open the log if it has been logrotated under us.
-%patch16 -p1 -b .logrotate
+%patch15 -p1 -b .logrotate
# Support for errno==ENOSPACE-based USB paper-out reporting.
-%patch17 -p1 -b .usb-paperout
-# Simplify the DNSSD parts so they can build using the compat library.
-%patch18 -p1 -b .build
-# Re-initialise the resolver on failure in httpAddrGetList().
-%patch19 -p1 -b .res_init
+%patch16 -p1 -b .usb-paperout
+# Re-initialise the resolver on failure in httpAddrGetList() (bug #567353).
+%patch17 -p1 -b .res_init
# Log extra debugging information if no filters are available.
-%patch20 -p1 -b .filter-debug
+%patch18 -p1 -b .filter-debug
# Allow the usb backend to understand old-style URI formats.
-%patch21 -p1 -b .uri-compat
-# Ensure attributes are valid UTF-8 in dbus notifier (bug #863387).
-%patch22 -p1 -b .dbus-utf8
+%patch19 -p1 -b .uri-compat
# Fix temporary filename creation.
-%patch23 -p1 -b .str3382
-# Problem is a port reset which is done by the new USB backend of CUPS 1.5.4 and 1.6.x to clean up after the job.
-# This patch adds a quirk handler for this reset so that it will not be done for all printers.
-# (bug #847923, STR #4155, STR #4191)
-# Added usblp quirk for Canon PIXMA MP540 (bug #967873).
-%patch24 -p1 -b .usblp-quirks
+%patch20 -p1 -b .str3382
# Use mode 0755 for binaries and libraries where appropriate.
-%patch25 -p1 -b .0755
-# Handle SNMP supply level quirks (bug #581825).
-%patch26 -p1 -b .snmp-quirks
+%patch21 -p1 -b .0755
# Add an SNMP query for HP's device ID OID (STR #3552).
-%patch27 -p1 -b .hp-deviceid-oid
+%patch22 -p1 -b .hp-deviceid-oid
# Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
-%patch28 -p1 -b .dnssd-deviceid
+%patch23 -p1 -b .dnssd-deviceid
# Add an SNMP query for Ricoh's device ID OID (STR #3552).
-%patch29 -p1 -b .ricoh-deviceid-oid
-
-# Avahi support:
-# - discovery in the dnssd backend
-# - service announcement in the scheduler
-%patch30 -p1 -b .avahi-1-config
-%patch31 -p1 -b .avahi-2-backend
-%patch32 -p1 -b .avahi-3-timeouts
-%patch33 -p1 -b .avahi-4-poll
-%patch34 -p1 -b .avahi-5-services
-
-# ICC colord support.
-%patch35 -p1 -b .icc
-
+%patch24 -p1 -b .ricoh-deviceid-oid
# Add support for systemd socket activation (patch from Lennart
# Poettering).
-%patch36 -p1 -b .systemd-socket
-
-# Don't use the IPP Create-Job operation, widely implemented
-# unreliably (bug #854989).
-%patch37 -p1 -b .ipp-no-create-job
-
-# CUPS now includes the port number in the Host: header for HTTP requests. (r10572)
-%patch40 -p1 -b .r10572
-# The scheduler no longer allows job-name values
-# that are not valid network Unicode strings (STR #4072)
-%patch41 -p1 -b .str4072
-# cupsBackendReport() now filters out all control characters
-# from the reported 1284 device IDs (STR #4124)
-%patch42 -p1 -b .str4124
-# The IPP backend could get stuck in an endless loop on certain network errors
-# (STR #4194)
-%patch43 -p1 -b .str4194
-# The IPP backend did not send a cancel request to printers when a job was
-# canceled and the printer did not support Create-Job.
-%patch44 -p1 -b .r10638
-# Work around broken 1284 device IDs that use a newline instead of a semicolon.
-%patch45 -p1 -b .r10642
-# Apply upstream patch to stop backend spinning on failed auth (bug #873264).
-%patch46 -p1 -b .str4190
-
-# Apply upstream fix for CVE-2012-5519 (STR #4223, bug #875898).
-%patch47 -p1 -b .str4223
-
-# The IPP backend now stops queues when the server
-# configuration prevents successful job submission (STR #4125)
-%patch48 -p1 -b .str4125
-# Fixed a problem with local Kerberos authentication (STR #4140, bug #837602)
-%patch49 -p1 -b .str4140
-# The CUPS library did not always detect a timed out connection to the server
-# which could cause temporary loss of printing from applications (STR #4187)
-%patch50 -p1 -b .str4187
-# Don't set auth-info-required all of the time (STR #4205)
-%patch51 -p1 -b .str4205
+%patch25 -p1 -b .systemd-socket
+# Talk about systemd in cups-lpd manpage (part of bug #884641).
+%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
++# Added usblp quirk for Canon PIXMA MP540 (bug #967873).
++%patch28 -p1 -b .usblp-quirks
+# Return from cupsEnumDests() once all records have been returned.
+%patch29 -p1 -b .enum-all
# Prevent stringpool damage leading to memory leaks (bug #974048).
-%patch52 -p1 -b .stringpool-setprinterattr
+%patch30 -p1 -b .stringpool-setprinterattr
+# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
+%patch31 -p1 -b .dymo-deviceid
%if %lspp
# LSPP support.
@@@ -638,75 -766,32 +639,78 @@@ rm -f %{cups_serverbin}/backend/sm
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
-* Tue Jun 25 2013 Tim Waugh <twaugh at redhat.com> 1:1.5.4-29
++* Tue Jun 25 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-11
+ - Added usblp quirk for Canon PIXMA MP540 (bug #967873).
+
-* Thu Jun 13 2013 Tim Waugh <twaugh at redhat.com> 1:1.5.4-28
+* Tue Jun 18 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-10
+- Added IEEE 1284 Device ID for a Dymo device (bug #747866).
+
+* Thu Jun 13 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-9
- Prevent stringpool damage leading to memory leaks (bug #974048).
-* Tue Apr 23 2013 Tim Waugh <twaugh at redhat.com> 1:1.5.4-27
-- dnssd backend: don't crash if avahi gives a callback with no TXT
- record (bug #927040).
+* Tue Jun 4 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.2-8
+- Return from cupsEnumDests() once all records have been returned.
-* Tue Mar 5 2013 Tim Waugh <twaugh at redhat.com> 1:1.5.4-26
+* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-7
+- Added more USB quirks for the libusb-based backend (STR #4311)
+
+* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-6
+- don't ship Russian web templates because they're broken (#960571, STR #4310)
+
+* Wed May 15 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-5
+- move cups/ppdc/ to filesystem subpackage
+
+* Wed Apr 10 2013 Tim Waugh <twaugh at redhat.com>
+- 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
+ dbus notifier.
+
+* Thu Apr 4 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-4
+- Use IP address when resolving DNSSD URIs (bug #948288).
+
+* Thu Mar 28 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.2-3
+- Check for cupsd.conf existence prior to grepping it (bug #928816).
+
+* Tue Mar 19 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-2
+- revert previous bug #919489 fix (i.e we don't ship banners now)
+
+* Mon Mar 18 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-1
+- 1.6.2
+
+* Wed Mar 13 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.1-26
+- ship banners again (#919489)
+
+* Tue Mar 5 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-25
+- Talk about systemd in cups-lpd manpage (part of bug #884641).
+
+* Tue Mar 5 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-24
- Documentation fixes from STR #4223 (bug #915981).
-* Fri Feb 15 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-25
-- Fixed STR #4232 fix (STR #4276).
+* Wed Feb 27 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.1-23
+- Removed obsolete browsing directives from cupsd.conf (bug #880826, STR #4157).
+- Updated summary and descriptions (#882982).
+- Fixed bogus dates in changelog.
+
+* Fri Feb 15 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-22
+- Applied colorman fix from STR #4232 and STR #4276.
-* Fri Jan 18 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-24
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.6.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Jan 18 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.6.1-20
- Add quirk rule for Canon MP210 (#847923).
-* Mon Jan 14 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-23
+* Mon Jan 14 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.6.1-19
- Fix unowned directories (#894531).
-* Tue Dec 18 2012 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-22
-- backport fixes for STR #4125, STR #4140, STR #4187, STR #4205, STR #4232
+* Thu Jan 10 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.6.1-18
+- Clean /var/spool/cups/tmp with tmpfiles.d instead of tmpwatch&cron (#893834).
+
+* Wed Dec 19 2012 Jiri Popelka <jpopelka at redhat.com> 1:1.6.1-17
+- Migrate cups-lpd from xinetd to systemd socket activatable service (#884641).
+- Clean up old Requires/Conflicts/Obsoletes/Provides.
-* Thu Dec 6 2012 Tim Waugh <twaugh at redhat.com> 1:1.5.4-21
+* Thu Dec 6 2012 Tim Waugh <twaugh at redhat.com> 1:1.6.1-16
- Additional fix relating to CVE-2012-5519 to avoid misleading error
message about actions to take to enable file device URIs.
More information about the scm-commits
mailing list