extra/cups to 2.3.0-3

extra/cups/PKGBUILD

@@ -5,10 +5,10 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.2.12
-pkgrel=1
+pkgver=2.3.0
+pkgrel=3
 arch=('x86_64')
-license=('GPL')
+license=('Apache' 'custom')
 url="https://www.cups.org/"
 makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls'
              'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
@@ -19,20 +19,18 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
         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)
-sha256sums=('0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8'
+sha256sums=('acaf0229cf008ea8f06353ffd1bbd62d71dbe88990dd3330650ef87edb95a1a5'
             'SKIP'
             'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
             'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
-            'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
             '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-            '9d6e9c46e009c54563e7c9e140484af83874747fe371569a982a082e6877a283'
+            '656374f4933ad33d34bbaf4ac89ce4ee13c04fd398454eadbb8cbcf68418c704'
             'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security@cups.org>
 validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <security@cups.org>"
@@ -44,8 +42,6 @@ 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
   # move /var/run -> /run for pid file
   patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
 
@@ -107,6 +103,9 @@ depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb')
   # 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() {

extra/cups/cups-no-gzip-man.patch

@@ -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
- 		;;
- 	*)

extra/cups/cups-systemd-socket.patch

@@ -19,14 +19,19 @@ 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 @@
+--- 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,11 @@
+ [Unit]
  Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+-After=sssd.service
++After=sssd.service network.target
  
- [Path]
--PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
-+PathExistsGlob=@CUPS_REQUESTS@/d*
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
+-Type=simple
++Type=notify
+ Restart=on-failure
  
  [Install]
- WantedBy=multi-user.target