version 2.0.0-1

7 files changed, 118 insertions, 104 deletions

diff --git a/.AURINFO b/.AURINFO
index 1bbff27e500e..e5badce9effd 100644
--- a/.AURINFO
+++ b/.AURINFO
@@ -1,6 +1,6 @@
 pkgbase = cups-nosystemd
 	pkgdesc = The CUPS Printing System - daemon package
-	pkgver = 1.7.5
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = http://www.cups.org/
 	install = cups-nosystemd.install
@@ -16,38 +16,24 @@ pkgbase = cups-nosystemd
 	makedepends = gzip
 	makedepends = autoconf
 	makedepends = avahi
-	makedepends = openssl
+	makedepends = gnutls
 	makedepends = inetutils
 	depends = acl
 	depends = pam
-	depends = libcups>=1.7.5
+	depends = libcups>=2.0.0
 	depends = cups-filters
 	depends = bc
 	depends = colord
-	depends = libusb
 	depends = dbus
 	depends = hicolor-icon-theme
 	depends = libpaper
 	optdepends = xdg-utils: xdg .desktop file support
 	optdepends = cups-openrc: cups openrc initscript
-	provides = cups=1.7.5
+	provides = cups=2.0.0
 	conflicts = cups
 	conflicts = cups-eudev
 	replaces = cups
 	replaces = cups-eudev
-	source = http://www.cups.org/software/1.7.5/cups-1.7.5-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-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
 	backup = etc/cups/cupsd.conf
 	backup = etc/cups/snmp.conf
 	backup = etc/cups/printers.conf
@@ -58,6 +44,28 @@ 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/2.0.0/cups-2.0.0-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-1.6.0-fix-install-perms.patch
+	source = cups-1.6.2-statedir.patch
+	source = str4495.patch
+	source = str4500.patch
+	md5sums = 2cdd81fea23e9e29555c24bdfd0d7c89
+	md5sums = 9657daa21760bb0b5fa3d8b51d5e01a1
+	md5sums = fc8286f185e2cc5f7e1f6843bf193e2b
+	md5sums = 96f82c38f3f540b53f3e5144900acf17
+	md5sums = 3ba9e3410df1dc3015463d615ef91b3b
+	md5sums = 1beb4896f217bc241bc08a422274ec0c
+	md5sums = 90c30380d4c8cd48a908cfdadae1ea24
+	md5sums = 5117f65342fcc69c6a506529e4daca9e
+	md5sums = 451609db34f95209d64c38474de27ce1
+	md5sums = 84da6459947d4fb62398e9bad7922a11
+	md5sums = 8c0514e41c3b50b2b838b218f683e227
 
 pkgname = cups-nosystemd
 
diff --git a/.SRCINFO b/.SRCINFO
index 8256fb0e4e33..e5badce9effd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cups-nosystemd
 	pkgdesc = The CUPS Printing System - daemon package
-	pkgver = 1.7.5
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = http://www.cups.org/
 	install = cups-nosystemd.install
@@ -16,21 +16,20 @@ pkgbase = cups-nosystemd
 	makedepends = gzip
 	makedepends = autoconf
 	makedepends = avahi
-	makedepends = openssl
+	makedepends = gnutls
 	makedepends = inetutils
 	depends = acl
 	depends = pam
-	depends = libcups>=1.7.5
+	depends = libcups>=2.0.0
 	depends = cups-filters
 	depends = bc
 	depends = colord
-	depends = libusb
 	depends = dbus
 	depends = hicolor-icon-theme
 	depends = libpaper
 	optdepends = xdg-utils: xdg .desktop file support
 	optdepends = cups-openrc: cups openrc initscript
-	provides = cups=1.7.5
+	provides = cups=2.0.0
 	conflicts = cups
 	conflicts = cups-eudev
 	replaces = cups
@@ -45,32 +44,28 @@ 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.5/cups-1.7.5-source.tar.bz2
+	source = http://www.cups.org/software/2.0.0/cups-2.0.0-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-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 = 5d893edc2957005f78e2b2423fdace2e
+	source = str4495.patch
+	source = str4500.patch
+	md5sums = 2cdd81fea23e9e29555c24bdfd0d7c89
 	md5sums = 9657daa21760bb0b5fa3d8b51d5e01a1
-	md5sums = 26e9b4e65c0a4d76db5737c9b156fd80
+	md5sums = fc8286f185e2cc5f7e1f6843bf193e2b
 	md5sums = 96f82c38f3f540b53f3e5144900acf17
 	md5sums = 3ba9e3410df1dc3015463d615ef91b3b
-	md5sums = cc4101beccb5ed6deb1c92707a575925
+	md5sums = 1beb4896f217bc241bc08a422274ec0c
 	md5sums = 90c30380d4c8cd48a908cfdadae1ea24
-	md5sums = 8fe27d4248cacbc02824e7937cab4088
-	md5sums = df0c367c0022e3c7d8e01827e8a6c5e7
-	md5sums = f30c2a161caaf27854581507cde8cac6
 	md5sums = 5117f65342fcc69c6a506529e4daca9e
 	md5sums = 451609db34f95209d64c38474de27ce1
-	md5sums = b578bcd17949a7203237ba1e31f78ef9
+	md5sums = 84da6459947d4fb62398e9bad7922a11
+	md5sums = 8c0514e41c3b50b2b838b218f683e227
 
 pkgname = cups-nosystemd
 
diff --git a/PKGBUILD b/PKGBUILD
index 2e8a73ec6254..f6f07ea03045 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,17 @@
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname="cups-nosystemd"
-pkgver=1.7.5
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="The CUPS Printing System - daemon package"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
 groups=('eudev-base')
-depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb'
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord'
          'dbus' 'hicolor-icon-theme' 'libpaper')
 makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'xdg-utils' 'krb5' 'xinetd'
-             'gzip' 'autoconf' 'avahi' 'openssl' 'inetutils')
+             'gzip' 'autoconf' 'avahi' 'gnutls' 'inetutils')
 optdepends=('xdg-utils: xdg .desktop file support'
             'cups-openrc: cups openrc initscript')
 provides=("cups=${pkgver}")
@@ -35,59 +35,55 @@ source=(http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-no-export-ssllibs.patch
         cups-no-gcrypt.patch
         cups-no-gzip-man.patch
-        # FC
-        cups-res_init.patch
-        cups-avahi-address.patch
-        cups-enum-all.patch
-        # Gentoo
-        cups-1.6.0-fix-install-perms.patch
-        cups-1.6.2-statedir.patch
-        # Debian
-        get-ppd-file-for-statically-configured-ipp-shared-queues.patch)
-md5sums=('5d893edc2957005f78e2b2423fdace2e'
+	cups-1.6.0-fix-install-perms.patch
+	cups-1.6.2-statedir.patch
+	# bugfixes
+	str4495.patch
+	str4500.patch # FC
+	)
+md5sums=('2cdd81fea23e9e29555c24bdfd0d7c89'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
-         '26e9b4e65c0a4d76db5737c9b156fd80'
+         'fc8286f185e2cc5f7e1f6843bf193e2b'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
-         'cc4101beccb5ed6deb1c92707a575925'
+         '1beb4896f217bc241bc08a422274ec0c'
          '90c30380d4c8cd48a908cfdadae1ea24'
-         '8fe27d4248cacbc02824e7937cab4088'
-         'df0c367c0022e3c7d8e01827e8a6c5e7'
-         'f30c2a161caaf27854581507cde8cac6'
          '5117f65342fcc69c6a506529e4daca9e'
          '451609db34f95209d64c38474de27ce1'
-         'b578bcd17949a7203237ba1e31f78ef9')
+         '84da6459947d4fb62398e9bad7922a11'
+         '8c0514e41c3b50b2b838b218f683e227')
 
 prepare() {
   cd cups-${pkgver}
 
+  # improve build and linking
   # Do not export SSL libs in cups-config
   patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-
+  # https://www.cups.org/str.php?L4399
   patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
 
   # don't zip man pages in make install, let makepkg do that / Fedora
   patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
 
-  # various bugfixes (upstream reports/SVN or Fedora/Debian
-
-  # 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
+  # move /var/run -> /run for pid file
+  patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
 
-  # fix permissions on some files - alternative: cups-0755.patch by FC
+  # fix permissions on some files (by Gentoo)
   patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
 
-  # move /var/run -> /run for pid file
-  patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
 
-  # Re-initialise the resolver on failure in httpAddrGetList()
-  patch -Np1 -i ${srcdir}/cups-res_init.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"
 
-  # Use IP address when resolving DNSSD URIs
-  patch -Np1 -i ${srcdir}/cups-avahi-address.patch
 
-  # Return from cupsEnumDests() once all records have been returned.
-  patch -Np1 -i ${srcdir}/cups-enum-all.patch
+  # set MaxLogSize to 0 to prevent using cups internal log rotation
+  sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
 
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
@@ -109,7 +105,7 @@ build() {
      --enable-pam=yes \
      --enable-raw-printing \
      --enable-dbus --with-dbusdir=/etc/dbus-1 \
-     --enable-ssl=yes --enable-openssl \
+     --enable-ssl=yes \
      --disable-gnutls \
      --enable-threads \
      --enable-avahi \
diff --git a/cups-no-gcrypt.patch b/cups-no-gcrypt.patch
index 4eaff67ceecc..0cd64b191879 100644
--- a/cups-no-gcrypt.patch
+++ b/cups-no-gcrypt.patch
@@ -1,40 +1,11 @@
-diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4
---- cups-1.5.0.orig//config-scripts/cups-ssl.m4	2011-01-11 08:05:58.000000000 +0100
-+++ cups-1.5.0/config-scripts/cups-ssl.m4	2011-08-02 10:44:26.011047900 +0200
-@@ -96,7 +96,6 @@
+diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4
+--- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry	2014-09-12 15:41:23.324760213 +0200
++++ cups-2.0rc1/config-scripts/cups-ssl.m4	2014-09-12 15:43:13.124203363 +0200
+@@ -60,7 +60,6 @@ if test x$enable_ssl != xno; then
      dnl Then look for GNU TLS...
      if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
-     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
--    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
+     	AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
+-    	AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
  	if $PKGCONFIG --exists gnutls; then
  	    have_ssl=1
  	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-@@ -108,18 +107,6 @@
- 	    AC_DEFINE(HAVE_GNUTLS)
- 	fi
- 
--	if test $have_ssl = 1; then
--	    CUPS_SERVERCERT="ssl/server.crt"
--	    CUPS_SERVERKEY="ssl/server.key"
--
--            if $PKGCONFIG --exists gcrypt; then
--	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
--	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
--	    elif test "x$LIBGCRYPTCONFIG" != x; then
--	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
--	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
--	    fi
--	fi
-     fi
- 
-     dnl Check for the OpenSSL library last...
---- cups-1.5.0.orig//cups/http-private.h	2011-01-22 01:07:22.000000000 +0100
-+++ cups-1.5.0/cups/http-private.h	2011-08-02 10:42:43.341604107 +0200
-@@ -93,7 +93,6 @@
- #  elif defined HAVE_GNUTLS
- #    include <gnutls/gnutls.h>
- #    include <gnutls/x509.h>
--#    include <gcrypt.h>
- #  elif defined(HAVE_CDSASSL)
- #    include <CoreFoundation/CoreFoundation.h>
- #    include <Security/Security.h>
diff --git a/cups.logrotate b/cups.logrotate
index b4245bc52b0e..19e12101be2b 100644
--- a/cups.logrotate
+++ b/cups.logrotate
@@ -1,4 +1,5 @@
 /var/log/cups/*_log {
    missingok
    notifempty
+   sharedscripts
 }
diff --git a/str4495.patch b/str4495.patch
new file mode 100644
index 000000000000..e02fac93835f
--- /dev/null
+++ b/str4495.patch
@@ -0,0 +1,26 @@
+Index: conf/cups-files.conf.in
+===================================================================
+--- conf/cups-files.conf.in	(revision 12220)
++++ conf/cups-files.conf.in	(working copy)
+@@ -15,6 +15,7 @@
+ #Group @CUPS_GROUP@
+
+ # Administrator user group, used to match @SYSTEM in cupsd.conf policy rules...
++# This cannot contain the Group value for security reasons...
+ SystemGroup @CUPS_SYSTEM_GROUPS@
+ @CUPS_SYSTEM_AUTHKEY@
+
+Index: scheduler/conf.c
+===================================================================
+--- scheduler/conf.c	(revision 12220)
++++ scheduler/conf.c	(working copy)
+@@ -995,6 +995,9 @@
+
+       cupsdLogMessage(CUPSD_LOG_NOTICE,
+                       "Group and SystemGroup cannot use the same groups.");
++      if (FatalErrors & (CUPSD_FATAL_CONFIG | CUPSD_FATAL_PERMISSIONS))
++        return (0);
++
+       cupsdLogMessage(CUPSD_LOG_INFO, "Resetting Group to \"nobody\"...");
+
+       group = getgrnam("nobody");
diff --git a/str4500.patch b/str4500.patch
new file mode 100644
index 000000000000..b69b559e8fcf
--- /dev/null
+++ b/str4500.patch
@@ -0,0 +1,17 @@
+diff -up cups-2.0.0/cups/util.c.str4500 cups-2.0.0/cups/util.c
+--- cups-2.0.0/cups/util.c.str4500	2014-10-15 12:59:27.105942488 +0100
++++ cups-2.0.0/cups/util.c	2014-10-15 13:03:38.618187112 +0100
+@@ -846,10 +846,10 @@ cupsGetPPD3(http_t     *http,		/* I  - H
+ 
+     snprintf(ppdname, sizeof(ppdname), "%s/ppd/%s.ppd", cg->cups_serverroot,
+              name);
+-    if (!stat(ppdname, &ppdinfo))
++    if (!stat(ppdname, &ppdinfo) && !access(ppdname, R_OK))
+     {
+      /*
+-      * OK, the file exists, use it!
++      * OK, the file exists and is readable, use it!
+       */
+ 
+       if (buffer[0])
+