summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2017-01-19 09:50:23 +0300
committerAlexey D2017-01-19 09:50:23 +0300
commit18f38c38eaf4758abc53aab96a3201975cb6032a (patch)
tree9b4289e8f552d2ddab4aaa4ed004c047f79cb4c8
parent1cd08f3ecfe406c7b11ecf8db96f7ebedf7c5d5b (diff)
downloadaur-18f38c38eaf4758abc53aab96a3201975cb6032a.tar.gz
version 2.2.2-1
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD24
-rw-r--r--fix_endless_loops.diff54
3 files changed, 26 insertions, 84 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 85df0c7d4e1..eb2533d3320 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
# Generated by mksrcinfo v8
-# Mon Sep 26 05:36:52 UTC 2016
+# Thu Jan 19 06:48:22 UTC 2017
pkgbase = cups-nosystemd
pkgdesc = The CUPS Printing System - daemon package
- pkgver = 2.2.0
+ pkgver = 2.2.2
pkgrel = 1
- url = http://www.cups.org/
+ url = https://www.cups.org/
install = cups-nosystemd.install
arch = i686
arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = cups-nosystemd
makedepends = inetutils
depends = acl
depends = pam
- depends = libcups>=2.2.0
+ depends = libcups>=2.2.2
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.2.0
+ provides = cups=2.2.2
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/v2.2.0/cups-2.2.0-source.tar.gz
+ source = https://github.com/apple/cups/releases/download/v2.2.2/cups-2.2.2-source.tar.gz
source = cups
source = cups.logrotate
source = cups.pam
@@ -54,17 +54,15 @@ 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
- source = fix_endless_loops.diff
- md5sums = e22d943cff300411d3616dc2ee86272c
- md5sums = 9657daa21760bb0b5fa3d8b51d5e01a1
- md5sums = fc8286f185e2cc5f7e1f6843bf193e2b
- md5sums = 96f82c38f3f540b53f3e5144900acf17
- md5sums = 3ba9e3410df1dc3015463d615ef91b3b
- md5sums = 1beb4896f217bc241bc08a422274ec0c
- md5sums = 39dd3141991c3052b73f59ece70e1ea6
- md5sums = 5117f65342fcc69c6a506529e4daca9e
- md5sums = 451609db34f95209d64c38474de27ce1
- md5sums = 32f6e1f907247dab466c37403d87d4e4
+ sha256sums = f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6
+ sha256sums = 87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b
+ sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
+ sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
+ sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
+ sha256sums = 1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1
+ sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
+ sha256sums = 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8
+ sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
pkgname = cups-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index 20cb777c801..817510d5c63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname="cups-nosystemd"
-pkgver=2.2.0
+pkgver=2.2.2
pkgrel=1
pkgdesc="The CUPS Printing System - daemon package"
arch=('i686' 'x86_64')
license=('GPL')
-url="http://www.cups.org/"
+url="https://www.cups.org/"
groups=('eudev-base')
depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord'
'dbus' 'hicolor-icon-theme' 'libpaper')
@@ -37,18 +37,16 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
cups-no-gzip-man.patch
cups-1.6.0-fix-install-perms.patch
cups-1.6.2-statedir.patch
- fix_endless_loops.diff
)
-md5sums=('e22d943cff300411d3616dc2ee86272c'
- '9657daa21760bb0b5fa3d8b51d5e01a1'
- 'fc8286f185e2cc5f7e1f6843bf193e2b'
- '96f82c38f3f540b53f3e5144900acf17'
- '3ba9e3410df1dc3015463d615ef91b3b'
- '1beb4896f217bc241bc08a422274ec0c'
- '39dd3141991c3052b73f59ece70e1ea6'
- '5117f65342fcc69c6a506529e4daca9e'
- '451609db34f95209d64c38474de27ce1'
- '32f6e1f907247dab466c37403d87d4e4')
+sha256sums=('f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6'
+ '87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b'
+ 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
+ '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+ 'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
+ '1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1'
+ 'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
+ '4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8'
+ '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af')
prepare() {
cd cups-${pkgver}
diff --git a/fix_endless_loops.diff b/fix_endless_loops.diff
deleted file mode 100644
index eff5aee74a3..00000000000
--- a/fix_endless_loops.diff
+++ /dev/null
@@ -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 */
-