Updated: PKGBUILD

5 files changed, 62 insertions, 147 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5638fe5081b8..81db3b0210f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cups-ipp14
-	pkgver = 2.2.8
-	pkgrel = 3
+	pkgver = 2.3.3
+	pkgrel = 1
 	url = https://www.cups.org/
 	arch = i686
 	arch = x86_64
@@ -26,45 +26,48 @@ pkgbase = cups-ipp14
 	makedepends = inetutils
 	makedepends = libpaper
 	makedepends = valgrind
-	provides = cups=2.2.8-3
+	provides = cups=${pkgver}
 	conflicts = cups
 	replaces = cups
-	source = https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz
-	source = https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz.sig
+	source = https://github.com/apple/cups/releases/download/v2.3.3/cups-2.3.3-source.tar.gz
+	source = https://github.com/apple/cups/releases/download/v2.3.3/cups-2.3.3-source.tar.gz.sig
 	source = cups.logrotate
 	source = cups.pam
 	source = cups.sysusers
-	source = guid.patch
 	source = cups-no-export-ssllibs.patch
-	source = cups-no-gzip-man.patch
 	source = cups-1.6.2-statedir.patch
 	source = cups-systemd-socket.patch
 	source = guid.patch
-	source = cups-2.2.8-5325.patch
 	source = add-ipp-backend-of-cups-1.4.patch
 	validpgpkeys = 3737FD0D0E63B30172440D2DDBA3A7AB08D76223
 	validpgpkeys = 45D083946E3035282B3CCA9AF434104235DA97EB
 	validpgpkeys = 845464660B686AAB36540B6F999559A027815955
-	sha256sums = 3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4
+	sha256sums = 261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee
 	sha256sums = SKIP
 	sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
 	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
 	sha256sums = 06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2
-	sha256sums = d4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d
 	sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
-	sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
 	sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
-	sha256sums = f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a
+	sha256sums = 3d8e24fd340fecef7101672d342433365cf78130b7182ecfd03071e31e894a9b
 	sha256sums = d4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d
-	sha256sums = b1daf250e16d34539149535c68a241f32223b1f34d142d0ee369fde019340de9
 	sha256sums = 375614399e38ddb7af9375472a75e8a83eb3c587595ee079286cbc45094e3c26
 
+pkgname = libcups-ipp14
+	pkgdesc = The CUPS Printing System - client libraries and headers
+	depends = gnutls
+	depends = libtiff>=4.0.0
+	depends = libpng>=1.5.7
+	depends = krb5
+	depends = avahi
+	depends = libusb
+
 pkgname = cups-ipp14
 	pkgdesc = The CUPS Printing System - daemon package
 	install = cups.install
 	depends = acl
 	depends = pam
-	depends = libcups-ipp14>=2.2.8
+	depends = libcups-ipp14>=2.3.3
 	depends = cups-filters
 	depends = bc
 	depends = dbus
@@ -73,13 +76,13 @@ pkgname = cups-ipp14
 	depends = hicolor-icon-theme
 	optdepends = xdg-utils: xdg .desktop file support
 	optdepends = colord: for ICC color profile support
+	optdepends = logrotate: for logfile rotation support
 	backup = etc/cups/cupsd.conf
 	backup = etc/cups/snmp.conf
 	backup = etc/cups/printers.conf
 	backup = etc/cups/classes.conf
 	backup = etc/cups/cups-files.conf
 	backup = etc/cups/subscriptions.conf
-	backup = etc/dbus-1/system.d/cups.conf
 	backup = etc/logrotate.d/cups
 	backup = etc/pam.d/cups
 
diff --git a/PKGBUILD b/PKGBUILD
index 8204d9fd3924..5c0bd9fe429f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,14 @@
-# $Id$
-# Maintainer: Gicu GORODENCO <cyclopsihus@gmail.com>
+# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: Gicu GORODENCO <cyclopsihus@gmail.com>
 # Contributor (cups): Andreas Radke <andyrtr@archlinux.org>
 
-_pkgbase="cups"
-pkgbase="${_pkgbase}-ipp14"
-### Commenting the "split packages sections - unsupported by AUR apparently ###
-#pkgname=('libcups-ipp14' 'cups-ipp14')
-pkgname=(${pkgbase})
-pkgver=2.2.8
-pkgrel=3
+pkgbase="cups-ipp14"
+_pkgbase=cups
+pkgname=('libcups-ipp14' 'cups-ipp14')
+pkgver=2.3.3
+pkgrel=1
 arch=('i686' 'x86_64')
-provides=('cups=2.2.8-3')
+provides=('cups=${pkgver}')
 replaces=('cups')
 conflicts=('cups')
 license=('GPL')
@@ -19,31 +17,27 @@ makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls'
              'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus' 
              'avahi'  'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
 source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
-        cups.logrotate cups.pam
-        cups.sysusers guid.patch
+        cups.logrotate
+	cups.pam
+        cups.sysusers
         # improve build and linking
         cups-no-export-ssllibs.patch
-        cups-no-gzip-man.patch
         cups-1.6.2-statedir.patch
         # bugfixes
         cups-systemd-socket.patch
-        guid.patch
-        cups-2.2.8-5325.patch
+	guid.patch
         # IPP 1.4
         add-ipp-backend-of-cups-1.4.patch)
 
-sha256sums=('3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4'
+sha256sums=('261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee'
             'SKIP'
             'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
-            'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d'
             'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
-            'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
             '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-            'f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a'
+            '3d8e24fd340fecef7101672d342433365cf78130b7182ecfd03071e31e894a9b'
             'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d'
-            'b1daf250e16d34539149535c68a241f32223b1f34d142d0ee369fde019340de9'
             '375614399e38ddb7af9375472a75e8a83eb3c587595ee079286cbc45094e3c26')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security@cups.org>
 validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <security@cups.org>"
@@ -58,21 +52,16 @@ prepare() {
 
   # improve build and linking
   # Do not export SSL libs in cups-config
-  patch -Np1 -i ${srcdir}/cups-no-export-ssllibs.patch
-  # don't zip man pages in make install, let makepkg do that / Fedora
-  patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
+  patch -Np1 -i "${srcdir}"/cups-no-export-ssllibs.patch
   # move /var/run -> /run for pid file
-  patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
+  patch -Np1 -i "${srcdir}"/cups-1.6.2-statedir.patch
 
   # bug fixes
   # make sure network is up when starting and notify systemd - FC
-  patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
+  patch -Np1 -i "${srcdir}"/cups-systemd-socket.patch
 
   # FS#56818 - https://github.com/apple/cups/issues/5236
-  patch -Np1 -i ${srcdir}/guid.patch
-
-  # https://github.com/apple/cups/issues/5325
-  patch -Np1 -i ${srcdir}/cups-2.2.8-5325.patch
+  patch -Np1 -i "${srcdir}"/guid.patch
 
   # set MaxLogSize to 0 to prevent using cups internal log rotation
   sed -i -e '5i\ ' conf/cupsd.conf.in
@@ -100,8 +89,10 @@ build() {
      --with-cups-group=209 \
      --enable-pam=yes \
      --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 \
+     --enable-dbus=yes \
+     --with-dbusdir=/usr/share/dbus-1 \
      --enable-ssl=yes \
+     --enable-relro \
      --enable-threads \
      --enable-avahi\
      --enable-libpaper \
@@ -115,7 +106,21 @@ check() {
   #make -k check || /bin/true
 }
 
-package() {
+package_libcups-ipp14() {
+pkgdesc="The CUPS Printing System - client libraries and headers"
+depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb')
+
+  cd ${pkgbase}-${pkgver}
+  make BUILDROOT="${pkgdir}" install-headers install-libs
+  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
+  mkdir -p "${pkgdir}"/usr/bin
+  install -m755 "${srcdir}"/"${_pkgbase}"-${pkgver}/cups-config "${pkgdir}"/usr/bin/cups-config
+
+  # add license + exception
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" {LICENSE,NOTICE}
+}
+
+package_cups-ipp14() {
 pkgdesc="The CUPS Printing System - daemon package"
 install=cups.install
 backup=(etc/cups/cupsd.conf
@@ -124,13 +129,13 @@ backup=(etc/cups/cupsd.conf
         etc/cups/classes.conf
         etc/cups/cups-files.conf
         etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
         etc/logrotate.d/cups
         etc/pam.d/cups)
 depends=('acl' 'pam' "libcups-ipp14>=${pkgver}" 'cups-filters' 'bc' 
          'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
 optdepends=('xdg-utils: xdg .desktop file support'
-            'colord: for ICC color profile support')
+            'colord: for ICC color profile support'
+            'logrotate: for logfile rotation support')
 
   cd ${_pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-data install-exec
diff --git a/cups-2.2.8-5325.patch b/cups-2.2.8-5325.patch
deleted file mode 100644
index 7e7a6530c621..000000000000
--- a/cups-2.2.8-5325.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/cups/ipp.c b/cups/ipp.c
-index 9346b201f..d6e39d5d8 100644
---- a/cups/ipp.c
-+++ b/cups/ipp.c
-@@ -5101,16 +5101,19 @@ ippValidateAttribute(
- 	      break;
- 	  }
- 
--	  if (*ptr < ' ' || *ptr == 0x7f)
--	  {
--	    ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
--	    return (0);
--	  }
--	  else if (*ptr)
--	  {
--	    ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
--	    return (0);
--	  }
-+          if (*ptr)
-+          {
-+	    if (*ptr < ' ' || *ptr == 0x7f)
-+	    {
-+	      ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
-+	      return (0);
-+	    }
-+	    else
-+	    {
-+	      ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
-+	      return (0);
-+	    }
-+          }
- 
- 	  if ((ptr - attr->values[i].string.text) > (IPP_MAX_TEXT - 1))
- 	  {
-@@ -5163,16 +5166,19 @@ ippValidateAttribute(
- 	      break;
- 	  }
- 
--	  if (*ptr < ' ' || *ptr == 0x7f)
--	  {
--	    ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
--	    return (0);
--	  }
--	  else if (*ptr)
-+	  if (*ptr)
- 	  {
--	    ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
--	    return (0);
--	  }
-+	    if (*ptr < ' ' || *ptr == 0x7f)
-+	    {
-+	      ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
-+	      return (0);
-+	    }
-+	    else
-+	    {
-+	      ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
-+	      return (0);
-+	    }
-+          }
- 
- 	  if ((ptr - attr->values[i].string.text) > (IPP_MAX_NAME - 1))
- 	  {
-
diff --git a/cups-no-gzip-man.patch b/cups-no-gzip-man.patch
deleted file mode 100644
index a66971cbc4b7..000000000000
--- a/cups-no-gzip-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
---- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man	2011-05-12 07:21:56.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-manpages.m4	2011-05-23 17:25:50.000000000 +0200
-@@ -69,10 +69,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and macOS
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 3369ceb57ce2..5393b5178762 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -19,25 +19,15 @@ diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
    if (fg)
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
 diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
---- cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg	2014-03-21 15:50:24.000000000 +0100
-+++ cups-2.0.2/scheduler/org.cups.cupsd.path.in	2015-02-10 13:40:24.295545063 +0100
-@@ -2,7 +2,7 @@
- Description=CUPS Scheduler
- 
- [Path]
--PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
-+PathExistsGlob=@CUPS_REQUESTS@/d*
- 
- [Install]
- WantedBy=multi-user.target
-diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
---- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg	2014-10-21 13:55:01.000000000 +0200
-+++ cups-2.0.2/scheduler/org.cups.cupsd.service.in	2015-02-10 13:40:24.296545049 +0100
-@@ -1,10 +1,11 @@
+--- cups-2.3.0/scheduler/org.cups.cupsd.service.in	2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/scheduler/org.cups.cupsd.service.in.new	2019-08-25 20:20:25.805339727 +0200
+@@ -1,11 +1,12 @@
  [Unit]
  Description=CUPS Scheduler
  Documentation=man:cupsd(8)
-+After=network.target
+-After=sssd.service
++After=sssd.service network-online.target
++Wants=network-online.target
  
  [Service]
  ExecStart=@sbindir@/cupsd -l
@@ -46,4 +36,3 @@ diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/schedu
  Restart=on-failure
  
  [Install]
-