[arch-commits] Commit in cups/trunk (PKGBUILD fix_endless_loops.diff)

[Andreas Radke]

    Date: Tuesday, October 4, 2016 @ 19:30:09
  Author: andyrtr
Revision: 277714

upgpkg: cups 2.2.1-1

upstream update 2.2.1

Modified:
  cups/trunk/PKGBUILD
Deleted:
  cups/trunk/fix_endless_loops.diff

------------------------+
 PKGBUILD               |   12 +++-------
 fix_endless_loops.diff |   54 -----------------------------------------------
 2 files changed, 4 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-04 19:21:21 UTC (rev 277713)
+++ PKGBUILD	2016-10-04 19:30:09 UTC (rev 277714)
@@ -3,8 +3,8 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.2.0
-pkgrel=4
+pkgver=2.2.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -21,9 +21,8 @@
         cups-1.6.0-fix-install-perms.patch
         # bugfixes
         cups-systemd-socket.patch
-        fix_endless_loops.diff
 )
-md5sums=('e22d943cff300411d3616dc2ee86272c'
+md5sums=('a94da2a1e9dbdccb4f3836a38a431931'
          'fc8286f185e2cc5f7e1f6843bf193e2b'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
@@ -31,8 +30,7 @@
          '39dd3141991c3052b73f59ece70e1ea6'
          '451609db34f95209d64c38474de27ce1'
          '5117f65342fcc69c6a506529e4daca9e'
-         '53bb3c80ee6823d36f9ab499373edfc5'
-         '32f6e1f907247dab466c37403d87d4e4')
+         '53bb3c80ee6823d36f9ab499373edfc5')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
 
 prepare() {
@@ -54,8 +52,6 @@
   # bug fixes
   # make sure network is up when starting and notify systemd - FC
   patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
-  # fix endless loops; FS#50796; https://github.com/apple/cups/issues/4870
-  patch -Np1 -i ${srcdir}/fix_endless_loops.diff
 
   # set MaxLogSize to 0 to prevent using cups internal log rotation
   sed -i -e '5i\ ' conf/cupsd.conf.in

Deleted: fix_endless_loops.diff
===================================================================
--- fix_endless_loops.diff	2016-10-04 19:21:21 UTC (rev 277713)
+++ fix_endless_loops.diff	2016-10-04 19:30:09 UTC (rev 277714)
@@ -1,54 +0,0 @@
-diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
-index 6e2ad81..e9ef53e 100644
---- a/cups/http-addrlist.c
-+++ b/cups/http-addrlist.c
-@@ -304,6 +304,8 @@ httpAddrConnect2(
- 
-     if (result > 0)
-     {
-+      http_addrlist_t *connaddr = NULL;	/* Connected address, if any */
-+
-       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_ISSET(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 */
-