cups: update to 2.4.0

3 files changed, 57 insertions, 58 deletions

diff --git a/cups/.footprint b/cups/.footprint
index 134cd4c8e..d31bc37bd 100644
--- a/cups/.footprint
+++ b/cups/.footprint
@@ -53,11 +53,13 @@ drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cups/
 drwxr-xr-x	root/root	usr/lib/cups/backend/
 lrwxrwxrwx	root/root	usr/lib/cups/backend/http -> ipp
--rwx------	root/root	usr/lib/cups/backend/ipp
--rwx------	root/root	usr/lib/cups/backend/lpd
+lrwxrwxrwx	root/root	usr/lib/cups/backend/https -> ipp
+-rwxr--r--	root/root	usr/lib/cups/backend/ipp
+lrwxrwxrwx	root/root	usr/lib/cups/backend/ipps -> ipp
+-rwxr--r--	root/root	usr/lib/cups/backend/lpd
 -rwxr-xr-x	root/root	usr/lib/cups/backend/snmp
 -rwxr-xr-x	root/root	usr/lib/cups/backend/socket
--rwxr-xr-x	root/root	usr/lib/cups/backend/usb
+-rwxr--r--	root/root	usr/lib/cups/backend/usb
 drwxr-xr-x	root/root	usr/lib/cups/cgi-bin/
 -rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/admin.cgi
 -rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/classes.cgi
@@ -85,12 +87,15 @@ drwxr-xr-x	root/root	usr/lib/cups/monitor/
 -rwxr-xr-x	root/root	usr/lib/cups/monitor/bcp
 -rwxr-xr-x	root/root	usr/lib/cups/monitor/tbcp
 drwxr-xr-x	root/root	usr/lib/cups/notifier/
+-rwxr-xr-x	root/root	usr/lib/cups/notifier/dbus
 -rwxr-xr-x	root/root	usr/lib/cups/notifier/mailto
 -rwxr-xr-x	root/root	usr/lib/cups/notifier/rss
 lrwxrwxrwx	root/root	usr/lib/libcups.so -> libcups.so.2
 -rwxr-xr-x	root/root	usr/lib/libcups.so.2
 lrwxrwxrwx	root/root	usr/lib/libcupsimage.so -> libcupsimage.so.2
 -rwxr-xr-x	root/root	usr/lib/libcupsimage.so.2
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/cups.pc
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/cupsaccept
 -rwxr-xr-x	root/root	usr/sbin/cupsctl
@@ -115,7 +120,6 @@ drwxr-xr-x	root/root	usr/share/cups/doc/help/
 -rw-r--r--	root/root	usr/share/cups/doc/help/api-admin.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/api-filter.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/api-ppd.html
--rw-r--r--	root/root	usr/share/cups/doc/help/api-raster.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/cgi.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/cupspm.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/encryption.html
@@ -183,22 +187,15 @@ drwxr-xr-x	root/root	usr/share/cups/doc/help/
 -rw-r--r--	root/root	usr/share/cups/doc/help/spec-stp.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/translation.html
 drwxr-xr-x	root/root	usr/share/cups/doc/images/
--rw-r--r--	root/root	usr/share/cups/doc/images/color-wheel.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/cups-block-diagram.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/cups-command-chain.png
--rw-r--r--	root/root	usr/share/cups/doc/images/cups-icon.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/cups-postscript-chain.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/cups-raster-chain.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/cups.png
--rw-r--r--	root/root	usr/share/cups/doc/images/generic.png
--rw-r--r--	root/root	usr/share/cups/doc/images/left.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/raster-organization.png
 -rw-r--r--	root/root	usr/share/cups/doc/images/raster.png
--rw-r--r--	root/root	usr/share/cups/doc/images/right.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/sample-image.png
--rw-r--r--	root/root	usr/share/cups/doc/images/sel.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/smiley.jpg
--rw-r--r--	root/root	usr/share/cups/doc/images/unsel.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/wait.gif
 -rw-r--r--	root/root	usr/share/cups/doc/index.html
 -rw-r--r--	root/root	usr/share/cups/doc/robots.txt
@@ -273,6 +270,7 @@ drwxr-xr-x	root/root	usr/share/cups/ipptool/
 -rw-r--r--	root/root	usr/share/cups/ipptool/print-job-letter.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/print-job-manual.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/print-job-media-col.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/print-job-media-needed.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/print-job-password.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/print-job.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/print-uri.test
diff --git a/cups/.signature b/cups/.signature
index 35c7a5d06..c2763b52d 100644
--- a/cups/.signature
+++ b/cups/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/XvMV+Mzxo/TfmbpkS9BtGFkU9YM4terGoLOI7yqJBkCpp4/6zunkqor8euHds1d/jppBF3N8NbLgv5exeCRtAM=
-SHA256 (Pkgfile) = 0b4d0adf3b8fb36c8c3241a10619b7ffed0bc0b19daa5cbbbdb1692d1bd701c5
-SHA256 (.footprint) = 675bb897e7269a0518f11329a16a9683e2d54332c8e62f7b89ccf48e537d012e
-SHA256 (cups-2.3.3-source.tar.gz) = 261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee
+RWSE3ohX2g5d/f3RqDWVal0L40DP+/fSYQmKA7Wx6i8TZ+ZtD+/8JU5RtPND7kYhPINmMCF5hsLjZBQN52AOkS/5LV+eT2XZagU=
+SHA256 (Pkgfile) = 8f99336763acd3bfa9337c86736c5147f84b85c7583dd7969ee481f7adae9311
+SHA256 (.footprint) = 2848a128992f7a6176a9c38c9e1b75f6e53cd86ff87774a07cb3c5d32114fef1
+SHA256 (cups-2.4.0-source.tar.gz) = 9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de
 SHA256 (cups.rc) = 61a1deceebcee0437e5c3f987621abf24642b6517961336ed4f26384ddab5639
 SHA256 (cups.pam) = 46b6b6e42e77c82435c0680405a45c66a37ec3d727af6aa6f036dd1d60215479
diff --git a/cups/Pkgfile b/cups/Pkgfile
index d1e27c6cf..e197af17e 100644
--- a/cups/Pkgfile
+++ b/cups/Pkgfile
@@ -1,48 +1,49 @@
 # Description: CUPS - Common UNIX Printing System
-# URL:         https://www.cups.org
-# Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  acl libusb zlib linux-pam
+# URL: https://openprinting.github.io/cups/
+# Maintainer: Juergen Daubert, jue at crux dot nu
+# Depends on: acl libusb zlib linux-pam
 
 name=cups
-version=2.3.3
+version=2.4.0
 release=1
-source=(https://github.com/apple/cups/releases/download/v$version/$name-$version-source.tar.gz
-        cups.rc cups.pam)
-
-build () {
-    cd $name-$version
-
-    CC=cc CXX=c++ \
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --libdir=/usr/lib \
-                --localstatedir=/var \
-                --with-docdir=/usr/share/cups/doc \
-                --with-logdir=/var/log/cups \
-                --with-cups-user=daemon \
-                --with-cups-group=lp \
-                --with-languages="" \
-                --without-rcdir \
-                --with-optim="$CFLAGS" \
-                --enable-acl \
-                --disable-{gnutls,gssapi,systemd}
-
-    make
-    make BUILDROOT=$PKG install
-
-    # conflict with cups-filters
-    rm -r $PKG/usr/share/cups/{banners,data}
-    
-    # cleanup
-    rm -rf $PKG/usr/share/{applications,icons}
-    chmod 0755 $PKG/var/{cache,spool}   
-    chmod -R +w $PKG
-
-    # start script and pam module
-    install -D -m 755 $SRC/cups.rc $PKG/etc/rc.d/cups
-    install -D -m 644 $SRC/cups.pam $PKG/etc/pam.d/cups
-
-    # blacklist usblp kernel module
-    install -d $PKG/etc/modprobe.d
-    echo 'blacklist usblp' > $PKG/etc/modprobe.d/cups.conf
+source=(https://github.com/OpenPrinting/cups/releases/download/v$version/$name-$version-source.tar.gz
+	cups.rc cups.pam)
+
+build() {
+	cd $name-$version
+
+	CC=cc CXX=c++ \
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--libdir=/usr/lib \
+		--localstatedir=/var \
+		--with-docdir=/usr/share/cups/doc \
+		--with-logdir=/var/log/cups \
+		--with-cups-user=daemon \
+		--with-cups-group=lp \
+		--with-languages="" \
+		--without-rcdir \
+		--with-optim="$CFLAGS" \
+		--enable-acl \
+		--disable-{gnutls,gssapi,systemd}
+
+	make
+	make BUILDROOT=$PKG install
+
+	# conflict with cups-filters
+	rm -r $PKG/usr/share/cups/{banners,data}
+
+	# cleanup
+	rm -rf $PKG/usr/share/{applications,icons}
+	chmod 0755 $PKG/var/{cache,spool}   
+	chmod -R +w $PKG
+
+	# start script and pam module
+	install -D -m 755 $SRC/cups.rc $PKG/etc/rc.d/cups
+	install -D -m 644 $SRC/cups.pam $PKG/etc/pam.d/cups
+
+	# blacklist usblp kernel module
+	install -d $PKG/etc/modprobe.d
+	echo 'blacklist usblp' > $PKG/etc/modprobe.d/cups.conf
 }