summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2014-12-31 13:58:27 +0300
committerAlexey D2015-06-11 10:07:11 +0300
commitc43bc990b9feaedc985afa8678e7a5e031643abc (patch)
tree7a2b26fd1149825005b0458c25bf02fbfbb99791
parentba7001ee84f4aaa62f31a31996afd3bbb3417607 (diff)
downloadaur-c43bc990b9feaedc985afa8678e7a5e031643abc.tar.gz
version 2.0.1-1
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD29
2 files changed, 12 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7a1a3bfe352..fa7945c2a33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = cups-nosystemd
pkgdesc = The CUPS Printing System - daemon package
- pkgver = 2.0.0
- pkgrel = 2
+ pkgver = 2.0.1
+ pkgrel = 1
url = http://www.cups.org/
install = cups-nosystemd.install
arch = i686
@@ -20,7 +20,7 @@ pkgbase = cups-nosystemd
makedepends = inetutils
depends = acl
depends = pam
- depends = libcups>=2.0.0
+ depends = libcups>=2.0.1
depends = cups-filters
depends = bc
depends = colord
@@ -29,7 +29,7 @@ pkgbase = cups-nosystemd
depends = libpaper
optdepends = xdg-utils: xdg .desktop file support
optdepends = cups-openrc: cups openrc initscript
- provides = cups=2.0.0
+ provides = cups=2.0.1
conflicts = cups
conflicts = cups-eudev
replaces = cups
@@ -43,8 +43,7 @@ pkgbase = cups-nosystemd
backup = etc/dbus-1/system.d/cups.conf
backup = etc/logrotate.d/cups
backup = etc/pam.d/cups
- backup = etc/xinetd.d/cups-lpd
- source = http://www.cups.org/software/2.0.0/cups-2.0.0-source.tar.bz2
+ source = http://www.cups.org/software/2.0.1/cups-2.0.1-source.tar.bz2
source = cups
source = cups.logrotate
source = cups.pam
@@ -53,9 +52,7 @@ 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 = str4495.patch
- source = str4500.patch
- md5sums = 2cdd81fea23e9e29555c24bdfd0d7c89
+ md5sums = 7f7c33071035fb20d0879929a42da711
md5sums = 9657daa21760bb0b5fa3d8b51d5e01a1
md5sums = fc8286f185e2cc5f7e1f6843bf193e2b
md5sums = 96f82c38f3f540b53f3e5144900acf17
@@ -64,8 +61,6 @@ pkgbase = cups-nosystemd
md5sums = 90c30380d4c8cd48a908cfdadae1ea24
md5sums = 5117f65342fcc69c6a506529e4daca9e
md5sums = 451609db34f95209d64c38474de27ce1
- md5sums = 84da6459947d4fb62398e9bad7922a11
- md5sums = 8c0514e41c3b50b2b838b218f683e227
pkgname = cups-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index ed24174287c..3a907e5a28f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname="cups-nosystemd"
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
pkgdesc="The CUPS Printing System - daemon package"
arch=('i686' 'x86_64')
license=('GPL')
@@ -27,8 +27,8 @@ backup=(etc/cups/cupsd.conf
etc/cups/subscriptions.conf
etc/dbus-1/system.d/cups.conf
etc/logrotate.d/cups
- etc/pam.d/cups
- etc/xinetd.d/cups-lpd)
+ etc/pam.d/cups)
+ #etc/xinetd.d/cups-lpd)
source=(http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
cups cups.logrotate cups.pam
# improve build and linking
@@ -37,11 +37,8 @@ source=(http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-no-gzip-man.patch
cups-1.6.0-fix-install-perms.patch
cups-1.6.2-statedir.patch
- # bugfixes
- str4495.patch
- str4500.patch # FC
)
-md5sums=('2cdd81fea23e9e29555c24bdfd0d7c89'
+md5sums=('7f7c33071035fb20d0879929a42da711'
'9657daa21760bb0b5fa3d8b51d5e01a1'
'fc8286f185e2cc5f7e1f6843bf193e2b'
'96f82c38f3f540b53f3e5144900acf17'
@@ -49,9 +46,7 @@ md5sums=('2cdd81fea23e9e29555c24bdfd0d7c89'
'1beb4896f217bc241bc08a422274ec0c'
'90c30380d4c8cd48a908cfdadae1ea24'
'5117f65342fcc69c6a506529e4daca9e'
- '451609db34f95209d64c38474de27ce1'
- '84da6459947d4fb62398e9bad7922a11'
- '8c0514e41c3b50b2b838b218f683e227')
+ '451609db34f95209d64c38474de27ce1')
prepare() {
cd cups-${pkgver}
@@ -71,17 +66,6 @@ prepare() {
# fix permissions on some files (by Gentoo)
patch -Np0 -i "$srcdir"/cups-1.6.0-fix-install-perms.patch
-
- # bugfixes
- # https://bugs.archlinux.org/task/40937 - https://www.cups.org/str.php?L4495
- # adds a warning to the config file and honors the FatalErrors directive
- patch -Np0 -i "$srcdir"/str4495.patch
-
- # https://www.cups.org/str.php?L4500
- # /etc/cups/ppd/*.ppd not world-readable, cupsGetPPD() returns symlink
- patch -Np1 -i "$srcdir"/str4500.patch
-
-
# set MaxLogSize to 0 to prevent using cups internal log rotation
sed -i -e '5i\ ' conf/cupsd.conf.in
sed -i -e '6i# Disable cups internal logging - use logrotate instead' conf/cupsd.conf.in
@@ -108,7 +92,6 @@ build() {
--enable-raw-printing \
--enable-dbus --with-dbusdir=/etc/dbus-1 \
--enable-ssl=yes \
- --disable-gnutls \
--enable-threads \
--enable-avahi \
--enable-libpaper \