summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2014-01-19 13:39:56 +0400
committerAlexey D2015-06-11 10:07:10 +0300
commitbec9a76915702b6137ca8e2c223eff5af4198e8e (patch)
treed99492f62c7691d91448975d48998d5807147ff1
parent8b07540a6686db2a6354c84f7f1b5f31d2d6909a (diff)
downloadaur-bec9a76915702b6137ca8e2c223eff5af4198e8e.tar.gz
version 1.7.1-1
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD20
2 files changed, 15 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4371fd55116..69624dece6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cups-nosystemd
pkgdesc = The CUPS Printing System - daemon package
- pkgver = 1.7.0
+ pkgver = 1.7.1
pkgrel = 1
url = http://www.cups.org/
install = cups-nosystemd.install
@@ -11,14 +11,15 @@ pkgbase = cups-nosystemd
makedepends = libpng>=1.5.7
makedepends = xdg-utils
makedepends = krb5
- makedepends = gnutls>=2.8.3
makedepends = xinetd
makedepends = gzip
makedepends = autoconf
makedepends = avahi
+ makedepends = openssl
+ makedepends = inetutils
depends = acl
depends = pam
- depends = libcups>=1.7.0
+ depends = libcups>=1.7.1
depends = cups-filters
depends = bc
depends = colord
@@ -26,7 +27,7 @@ pkgbase = cups-nosystemd
depends = dbus
depends = hicolor-icon-theme
optdepends = xdg-utils: xdg .desktop file support
- provides = cups=1.7.0
+ provides = cups=1.7.1
conflicts = cups
replaces = cups
backup = etc/cups/cupsd.conf
@@ -39,28 +40,26 @@ pkgbase = cups-nosystemd
backup = etc/logrotate.d/cups
backup = etc/pam.d/cups
backup = etc/xinetd.d/cups-lpd
- source = http://www.cups.org/software/1.7.0/cups-1.7.0-source.tar.bz2
+ source = http://www.cups.org/software/1.7.1/cups-1.7.1-source.tar.bz2
source = cups
source = cups.logrotate
source = cups.pam
source = cups-no-export-ssllibs.patch
source = cups-no-gcrypt.patch
source = cups-no-gzip-man.patch
- source = cups-dbus-utf8.patch
source = cups-res_init.patch
source = cups-avahi-address.patch
source = cups-enum-all.patch
source = cups-1.6.0-fix-install-perms.patch
source = cups-1.6.2-statedir.patch
source = get-ppd-file-for-statically-configured-ipp-shared-queues.patch
- md5sums = 5ab496a2ce27017fcdb3d7ec4818a75a
+ md5sums = 55277c40fd4b7183dc3671d39c5c42b7
md5sums = 9657daa21760bb0b5fa3d8b51d5e01a1
md5sums = f861b18f4446c43918c8643dcbbd7f6d
md5sums = 96f82c38f3f540b53f3e5144900acf17
md5sums = 3ba9e3410df1dc3015463d615ef91b3b
md5sums = cc4101beccb5ed6deb1c92707a575925
md5sums = 90c30380d4c8cd48a908cfdadae1ea24
- md5sums = a2a88b3a3257c3b5fd3edcc169e6aca4
md5sums = 8fe27d4248cacbc02824e7937cab4088
md5sums = df0c367c0022e3c7d8e01827e8a6c5e7
md5sums = f30c2a161caaf27854581507cde8cac6
diff --git a/PKGBUILD b/PKGBUILD
index 7e0176411f6..317b8f82d2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname="cups-nosystemd"
-pkgver=1.7.0
+pkgver=1.7.1
pkgrel=1
pkgdesc="The CUPS Printing System - daemon package"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus' 'hicolor-icon-theme')
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'xinetd' 'gzip' 'autoconf' 'avahi')
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'xdg-utils' 'krb5' 'xinetd' 'gzip' 'autoconf' 'avahi' 'openssl' 'inetutils')
optdepends=('xdg-utils: xdg .desktop file support')
provides=("cups=${pkgver}")
conflicts=('cups')
@@ -32,7 +32,6 @@ source=(http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-no-gcrypt.patch
cups-no-gzip-man.patch
# FC
- cups-dbus-utf8.patch
cups-res_init.patch
cups-avahi-address.patch
cups-enum-all.patch
@@ -41,14 +40,13 @@ source=(http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-1.6.2-statedir.patch
# Debian
get-ppd-file-for-statically-configured-ipp-shared-queues.patch)
-md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a'
+md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
'9657daa21760bb0b5fa3d8b51d5e01a1'
'f861b18f4446c43918c8643dcbbd7f6d'
'96f82c38f3f540b53f3e5144900acf17'
'3ba9e3410df1dc3015463d615ef91b3b'
'cc4101beccb5ed6deb1c92707a575925'
'90c30380d4c8cd48a908cfdadae1ea24'
- 'a2a88b3a3257c3b5fd3edcc169e6aca4'
'8fe27d4248cacbc02824e7937cab4088'
'df0c367c0022e3c7d8e01827e8a6c5e7'
'f30c2a161caaf27854581507cde8cac6'
@@ -69,9 +67,6 @@ prepare() {
# various bugfixes (upstream reports/SVN or Fedora/Debian
- # Ensure attributes are valid UTF-8 in dbus notifier
- patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
-
# Applications could not get the PPD file for statically-configured IPP-shared print queues
patch -Np1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
@@ -107,7 +102,8 @@ build() {
--enable-pam=yes \
--enable-raw-printing \
--enable-dbus --with-dbusdir=/etc/dbus-1 \
- --enable-ssl=yes --enable-gnutls \
+ --enable-ssl=yes --enable-openssl \
+ --disable-gnutls \
--enable-threads \
--enable-avahi\
--with-php=/usr/bin/php-cgi \
@@ -117,9 +113,9 @@ build() {
check() {
cd "$srcdir/cups-$pkgver"
- #httpAddrGetList(workstation64): FAIL
- #1 TESTS FAILED!
- #make[1]: *** [testhttp] Error 1
+
+ #./run-stp-tests.sh: line 782: 6307 Aborted (core dumped) $VALGRIND ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f > /tmp/cups-$user/log/debug_log 2>&1
+ #FAIL: 87 error messages, expected 33.
make -k check || /bin/true
}