summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2016-09-26 08:37:14 +0300
committerAlexey D2016-09-26 08:37:14 +0300
commit1cd08f3ecfe406c7b11ecf8db96f7ebedf7c5d5b (patch)
tree32c728ba38ed288a680cc441908319f2943f7b1a
parent39d2fcb0c7d1c2f31acdef4ef4e6521abd0c650c (diff)
downloadaur-1cd08f3ecfe406c7b11ecf8db96f7ebedf7c5d5b.tar.gz
version 2.2.0-1
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD12
-rw-r--r--cups-no-gzip-man.patch2
-rw-r--r--fix_endless_loops.diff54
4 files changed, 71 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5f554a1f2e3..85df0c7d4e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Jun 21 06:00:19 UTC 2016
+# Mon Sep 26 05:36:52 UTC 2016
pkgbase = cups-nosystemd
pkgdesc = The CUPS Printing System - daemon package
- pkgver = 2.1.4
+ pkgver = 2.2.0
pkgrel = 1
url = http://www.cups.org/
install = cups-nosystemd.install
@@ -22,7 +22,7 @@ pkgbase = cups-nosystemd
makedepends = inetutils
depends = acl
depends = pam
- depends = libcups>=2.1.4
+ depends = libcups>=2.2.0
depends = cups-filters
depends = bc
depends = colord
@@ -31,7 +31,7 @@ pkgbase = cups-nosystemd
depends = libpaper
optdepends = xdg-utils: xdg .desktop file support
optdepends = cups-openrc: cups openrc initscript
- provides = cups=2.1.4
+ provides = cups=2.2.0
conflicts = cups
conflicts = cups-eudev
replaces = cups
@@ -45,7 +45,7 @@ pkgbase = cups-nosystemd
backup = etc/dbus-1/system.d/cups.conf
backup = etc/logrotate.d/cups
backup = etc/pam.d/cups
- source = https://github.com/apple/cups/releases/download/release-2.1.4/cups-2.1.4-source.tar.gz
+ source = https://github.com/apple/cups/releases/download/v2.2.0/cups-2.2.0-source.tar.gz
source = cups
source = cups.logrotate
source = cups.pam
@@ -54,15 +54,17 @@ pkgbase = cups-nosystemd
source = cups-no-gzip-man.patch
source = cups-1.6.0-fix-install-perms.patch
source = cups-1.6.2-statedir.patch
- md5sums = 9f9bf6e3b9c20a3519b4dc409666d6e7
+ source = fix_endless_loops.diff
+ md5sums = e22d943cff300411d3616dc2ee86272c
md5sums = 9657daa21760bb0b5fa3d8b51d5e01a1
md5sums = fc8286f185e2cc5f7e1f6843bf193e2b
md5sums = 96f82c38f3f540b53f3e5144900acf17
md5sums = 3ba9e3410df1dc3015463d615ef91b3b
md5sums = 1beb4896f217bc241bc08a422274ec0c
- md5sums = 90c30380d4c8cd48a908cfdadae1ea24
+ md5sums = 39dd3141991c3052b73f59ece70e1ea6
md5sums = 5117f65342fcc69c6a506529e4daca9e
md5sums = 451609db34f95209d64c38474de27ce1
+ md5sums = 32f6e1f907247dab466c37403d87d4e4
pkgname = cups-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index 8f7513024e1..20cb777c801 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname="cups-nosystemd"
-pkgver=2.1.4
+pkgver=2.2.0
pkgrel=1
pkgdesc="The CUPS Printing System - daemon package"
arch=('i686' 'x86_64')
@@ -29,7 +29,7 @@ backup=(etc/cups/cupsd.conf
etc/logrotate.d/cups
etc/pam.d/cups)
#etc/xinetd.d/cups-lpd)
-source=(https://github.com/apple/cups/releases/download/release-${pkgver}/cups-${pkgver}-source.tar.gz
+source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz
cups cups.logrotate cups.pam
# improve build and linking
cups-no-export-ssllibs.patch
@@ -37,16 +37,18 @@ source=(https://github.com/apple/cups/releases/download/release-${pkgver}/cups-$
cups-no-gzip-man.patch
cups-1.6.0-fix-install-perms.patch
cups-1.6.2-statedir.patch
+ fix_endless_loops.diff
)
-md5sums=('9f9bf6e3b9c20a3519b4dc409666d6e7'
+md5sums=('e22d943cff300411d3616dc2ee86272c'
'9657daa21760bb0b5fa3d8b51d5e01a1'
'fc8286f185e2cc5f7e1f6843bf193e2b'
'96f82c38f3f540b53f3e5144900acf17'
'3ba9e3410df1dc3015463d615ef91b3b'
'1beb4896f217bc241bc08a422274ec0c'
- '90c30380d4c8cd48a908cfdadae1ea24'
+ '39dd3141991c3052b73f59ece70e1ea6'
'5117f65342fcc69c6a506529e4daca9e'
- '451609db34f95209d64c38474de27ce1')
+ '451609db34f95209d64c38474de27ce1'
+ '32f6e1f907247dab466c37403d87d4e4')
prepare() {
cd cups-${pkgver}
diff --git a/cups-no-gzip-man.patch b/cups-no-gzip-man.patch
index 69899b9cb7d..a66971cbc4b 100644
--- a/cups-no-gzip-man.patch
+++ b/cups-no-gzip-man.patch
@@ -4,7 +4,7 @@ diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/confi
@@ -69,10 +69,10 @@ case "$uname" in
;;
Linux* | GNU* | Darwin*)
- # Linux, GNU Hurd, and OS X
+ # Linux, GNU Hurd, and macOS
- MAN1EXT=1.gz
- MAN5EXT=5.gz
- MAN7EXT=7.gz
diff --git a/fix_endless_loops.diff b/fix_endless_loops.diff
new file mode 100644
index 00000000000..eff5aee74a3
--- /dev/null
+++ b/fix_endless_loops.diff
@@ -0,0 +1,54 @@
+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 */
+