From 87d9daf0c810172d54e1e1a19d7fe83d1cb90aac Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 4 Oct 2016 19:13:34 +0200
Subject: [PATCH] rebase to 2.2.1

---
 .gitignore                   |   1 +
 cups-2.2.0-source.tar.gz.sig | Bin 543 -> 0 bytes
 cups-2.2.1-source.tar.gz.sig | Bin 0 -> 543 bytes
 cups-cpu-hammering.patch     |  54 -----------------------------------
 cups.spec                    |  10 +++----
 sources                      |   2 +-
 6 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 cups-2.2.0-source.tar.gz.sig
 create mode 100644 cups-2.2.1-source.tar.gz.sig
 delete mode 100644 cups-cpu-hammering.patch

diff --git a/.gitignore b/.gitignore
index a06b5ed..59ca53a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@ cups-1.4.4-source.tar.bz2
 /cups-2.2b2-source.tar.gz
 /cups-2.2rc1-source.tar.gz
 /cups-2.2.0-source.tar.gz
+/cups-2.2.1-source.tar.gz
diff --git a/cups-2.2.0-source.tar.gz.sig b/cups-2.2.0-source.tar.gz.sig
deleted file mode 100644
index ce3843c7436d39cbd3a23827380ee7a8e7f35c1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0SW*H1p-&tkJtbT2@u<(r>h9pVk6il5CD@BGErM)MOx3_@7$|9
zry;eD@XkYSSLK;uL8B5Wg8S*B_{MjSLo8KBOyB%>&ud&;GJE9{HaVThg0JUi5b`4-
z9N#H+-voLLH^QD;uL4N)a0KcF62du4*(C*DiuP6~6USl;JA!Vz4k`-iL7JwTo#C${
z-rqsq5<dVHJ9fi}RgNG<JnlWD?WP6I4!!nAf%?WH;NxA@Nsr7I8}{r2BITURp=AZp
zFa)W<S{VSAb|zsA{RRk-Oe!)U@(M|HbN4f<5@U)G0xG7~B8TYQ%dpNn@_1c7h$*Sc
zheODyTeAp|L+UnyAI*QfTp{2wCrNM-j4C<Rl(b$iX0y7k^zpT5gG_`(&8P*3$v`s}
zcUC++D=xoUBZ7$FC2u*<*_HgKqWJeKtE1I}g1MQ{$FC%t^k8kmbBvJ+9qC2k&^(9m
z#y|93En(%s&Sy;o_}U#%1e?2Hz%<Fl@uD2LUXPpNPa`5dn#R6Ei0lg|w0WEwQ%6al
zK0a#Y*C-|bPQj)aypdBgA_)#rgh%7O&3qjHk;b%;>2%#{mqLQ!mpxOKbQ?4fZjq)_
ziS{CQONf=A#2at~$&v$?+R}WK)=$KsKWN}(^aY=vQ5_`%XA9{mTsM2jkSI>ob%dH>
h=C!PsBhHWkat#um&74NiS!Ogo<+||rR5bu<shp*0{|^8F

diff --git a/cups-2.2.1-source.tar.gz.sig b/cups-2.2.1-source.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..456129ebc9b9f68b0c2804491b549ecad36c483f
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0SW*H1p-&{x6=R$2@u<(r>h9pVj~GI5C1?mgB8Bj*P9t2xk7&l
zTlRX9eBg%U6k@u<zAB0Xai8^Nj&i@N6G(91(~F$??0RGwk4NuusV-9>v|y|1Bx;)U
zO=(OH=rEfdfLU)&4QjNVi~B(ZoVVwMydz@Szn0qW#}GlsfIp)1@e6TBAjaXrk8)o*
z*ILTD3)EZ1Z~@tx=}o*eSFHLeu^l4hcQs|g5Lnro2L#K#=eEd?1w>B2sHH$}{i8pG
z>x6*^M3ImRy<E`IB|vo-f{boVFhhn2ibX;aN+=}3-LmEig(`!dnYEcE)yndAUs6`<
zsp2X2k}V$>n&7ncqXg#`6VSU_^OL{odTxd1zrn51B)$L2TW=RQb}+cs#&n}~F0^FF
z68iSO1-aoxFuVE<5elLCh*-FL&(9u?bzXOEn$9e9yD0}_ta539Xi>k8qg5M}=ddKS
zw3Udv86BXFz46d#OU%)>0vwm9&7q7D^cdi9n9q(YrTb*+CFXTQzFA8oiT~k`|7k<U
z*_`y#q%fXx8Ku>JDu;li44MuaX(3Ci%>o=~Z(Ymluv|dFyX#@<YAgaWxxa`B4ZEsf
z*=JpP`oVP>amE{~bT}|}m5<hA59Be1CV#kP!&TF#N*$O=>E^pU0C@Z6)a!@WA(*a=
h0DShe_tr8%CFCIk#7oEJq{_B^ou9uguD*F{BPYp04~75$

literal 0
HcmV?d00001

diff --git a/cups-cpu-hammering.patch b/cups-cpu-hammering.patch
deleted file mode 100644
index a23d296..0000000
--- a/cups-cpu-hammering.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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
-@@ -304,6 +304,8 @@ httpAddrConnect2(
- 
-     if (result > 0)
-     {
-+      http_addrlist_t *connaddr = NULL;
-+
-       for (i = 0; i < nfds; i ++)
-       {
- #  ifdef HAVE_POLL
-@@ -314,7 +316,7 @@ httpAddrConnect2(
- #  endif /* HAVE_POLL */
- 	{
- 	  *sock    = fds[i];
--	  addrlist = addrs[i];
-+	  connaddr = addrs[i];
- 
- #  ifdef DEBUG
- 	  len   = sizeof(peer);
-@@ -322,11 +324,29 @@ httpAddrConnect2(
- 	    DEBUG_printf(("1httpAddrConnect2: Connected to %s:%d...", httpAddrString(&peer, temp, sizeof(temp)), httpAddrPort(&peer)));
- #  endif /* DEBUG */
- 	}
--	else
-+# ifdef HAVE_POLL
-+	else if (pfds[i].revents & (POLLERR | POLLHUP))
-+# else
-+	else if (FD_SET(fds[i], &error))
-+# endif /* HAVE_POLL */
-+        {
-+         /*
-+          * Error on socket, remove from the "pool"...
-+          */
-+
- 	  httpAddrClose(NULL, fds[i]);
-+          nfds --;
-+          if (i < nfds)
-+          {
-+            memmove(fds + i, fds + i + 1, (size_t)(nfds - i) * (sizeof(fds[0])));
-+            memmove(addrs + i, addrs + i + 1, (size_t)(nfds - i) * (sizeof(addrs[0])));
-+          }
-+          i --;
-+        }
-       }
- 
--      return (addrlist);
-+      if (connaddr)
-+        return (connaddr);
-     }
- #endif /* O_NONBLOCK */
- 
diff --git a/cups.spec b/cups.spec
index 57ee425..92b3229 100644
--- a/cups.spec
+++ b/cups.spec
@@ -14,8 +14,8 @@
 Summary: CUPS printing system
 Name: cups
 Epoch: 1
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -62,7 +62,6 @@ Patch34: cups-avahi-no-threaded.patch
 Patch35: cups-ipp-multifile.patch
 Patch36: cups-web-devices-timeout.patch
 Patch37: cups-synconclose.patch
-Patch38: cups-cpu-hammering.patch
 
 Patch100: cups-lspp.patch
 
@@ -256,8 +255,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch36 -p1 -b .web-devices-timeout
 # Set the default for SyncOnClose to Yes.
 %patch37 -p1 -b .synconclose
-# fixing looping in partial failing service (bug #1366775)
-%patch38 -p1 -b .cpu-hammering
 
 %if %{lspp}
 # LSPP support.
@@ -620,6 +617,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Tue Oct 04 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.1-1
+- rebase to 2.2.1
+
 * Thu Sep 22 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.0-2
 - fixing looping in partial failing service (bug #1366775)
 
diff --git a/sources b/sources
index 14943e6..1645fc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e22d943cff300411d3616dc2ee86272c  cups-2.2.0-source.tar.gz
+a94da2a1e9dbdccb4f3836a38a431931  cups-2.2.1-source.tar.gz