From 523b1be22fcebb6624a4dab6bde7e4aedc9734cd Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 4 Oct 2016 19:03:57 +0200 Subject: [PATCH 1/2] fixing typo in cups-cpu-hammering.patch --- cups-cpu-hammering.patch | 7 +++---- cups.spec | 5 ++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cups-cpu-hammering.patch b/cups-cpu-hammering.patch index a23d296..8938f13 100644 --- a/cups-cpu-hammering.patch +++ b/cups-cpu-hammering.patch @@ -1,7 +1,6 @@ -diff -up cups-2.2.0/CHANGES.txt.cpu-hammering cups-2.2.0/CHANGES.txt diff -up cups-2.2.0/cups/http-addrlist.c.cpu-hammering cups-2.2.0/cups/http-addrlist.c ---- cups-2.2.0/cups/http-addrlist.c.cpu-hammering 2016-09-19 19:56:54.074866957 +0200 -+++ cups-2.2.0/cups/http-addrlist.c 2016-09-21 11:45:22.264775409 +0200 +--- cups-2.2.0/cups/http-addrlist.c.cpu-hammering 2016-10-04 18:54:55.697172885 +0200 ++++ cups-2.2.0/cups/http-addrlist.c 2016-10-04 18:56:41.038252500 +0200 @@ -304,6 +304,8 @@ httpAddrConnect2( if (result > 0) @@ -28,7 +27,7 @@ diff -up cups-2.2.0/cups/http-addrlist.c.cpu-hammering cups-2.2.0/cups/http-addr +# ifdef HAVE_POLL + else if (pfds[i].revents & (POLLERR | POLLHUP)) +# else -+ else if (FD_SET(fds[i], &error)) ++ else if (FD_ISSET(fds[i], &error)) +# endif /* HAVE_POLL */ + { + /* diff --git a/cups.spec b/cups.spec index 57ee425..dc8c36c 100644 --- a/cups.spec +++ b/cups.spec @@ -15,7 +15,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Url: http://www.cups.org/ Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz @@ -620,6 +620,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Tue Oct 04 2016 Zdenek Dohnal - 1:2.2.0-3 +- fixing typo in cups-cpu-hammering.patch + * Thu Sep 22 2016 Zdenek Dohnal - 1:2.2.0-2 - fixing looping in partial failing service (bug #1366775) From b804f627c259f9946ff894d040230f09c388fc04 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 7 Nov 2016 19:01:50 +0100 Subject: [PATCH 2/2] 873123 - (cups-usb-quirks) usb printer doesn't print (usblp0: USB Bidirectional printer dev) --- cups-libusb-quirks.patch | 16 +++++++++++++--- cups.spec | 5 ++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/cups-libusb-quirks.patch b/cups-libusb-quirks.patch index c30e5c7..50ec7be 100644 --- a/cups-libusb-quirks.patch +++ b/cups-libusb-quirks.patch @@ -1,6 +1,6 @@ -diff -up cups-2.1.4/backend/org.cups.usb-quirks.libusb-quirks cups-2.1.4/backend/org.cups.usb-quirks ---- cups-2.1.4/backend/org.cups.usb-quirks.libusb-quirks 2016-06-15 14:46:46.122497874 +0200 -+++ cups-2.1.4/backend/org.cups.usb-quirks 2016-06-15 14:48:47.752552749 +0200 +diff -up cups-2.2.0/backend/org.cups.usb-quirks.libusb-quirks cups-2.2.0/backend/org.cups.usb-quirks +--- cups-2.2.0/backend/org.cups.usb-quirks.libusb-quirks 2016-09-14 01:39:47.000000000 +0200 ++++ cups-2.2.0/backend/org.cups.usb-quirks 2016-11-07 18:46:32.913920903 +0100 @@ -76,6 +76,9 @@ # Canon, Inc. MP510 Printer (https://bugs.launchpad.net/bugs/1050009) 0x04a9 0x1717 unidir @@ -11,3 +11,13 @@ diff -up cups-2.1.4/backend/org.cups.usb-quirks.libusb-quirks cups-2.1.4/backend # Canon, Inc. MP550 Printer (Issue #4155) 0x04a9 0x173d unidir +@@ -127,6 +130,9 @@ + # All Samsung devices (https://bugs.launchpad.net/bugs/1032456) + 0x04e8 soft-reset + ++# Samsung ML-2160 Series (https://bugzilla.redhat.com/show_bug.cgi?id=873123) ++0x04e8 0x330f unidir ++ + # All Zebra devices (https://bugs.launchpad.net/bugs/1001028) + 0x0a5f unidir + diff --git a/cups.spec b/cups.spec index dc8c36c..e5c6412 100644 --- a/cups.spec +++ b/cups.spec @@ -15,7 +15,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Url: http://www.cups.org/ Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz @@ -620,6 +620,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Mon Nov 07 2016 Zdenek Dohnal - 1:2.2.0-4 +- #873123 - (cups-usb-quirks) usb printer doesn't print (usblp0: USB Bidirectional printer dev) + * Tue Oct 04 2016 Zdenek Dohnal - 1:2.2.0-3 - fixing typo in cups-cpu-hammering.patch