[crux-commits] ports/opt (3.5): cups: update to 2.3

27 Aug 2019

commit 7d8625c80c49e6681153a5d12c7132f7d8749791
Author: Juergen Daubert <jue@jue.li>
Date:   Tue Aug 27 13:26:44 2019 +0200

    cups: update to 2.3

diff --git a/cups/.footprint b/cups/.footprint
index 7e4a6bca7..134cd4c8e 100644
--- a/cups/.footprint
+++ b/cups/.footprint
@@ -18,8 +18,8 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cancel
 -rwxr-xr-x	root/root	usr/bin/cups-config
--rwxr-xr-x	root/root	usr/bin/cupstestdsc
 -rwxr-xr-x	root/root	usr/bin/cupstestppd
+-rwxr-xr-x	root/root	usr/bin/ippeveprinter
 -rwxr-xr-x	root/root	usr/bin/ipptool
 -rwxr-xr-x	root/root	usr/bin/lp
 -rwxr-xr-x	root/root	usr/bin/lpoptions
@@ -64,6 +64,9 @@ drwxr-xr-x	root/root	usr/lib/cups/cgi-bin/
 -rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/help.cgi
 -rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/jobs.cgi
 -rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/printers.cgi
+drwxr-xr-x	root/root	usr/lib/cups/command/
+-rwxr-xr-x	root/root	usr/lib/cups/command/ippevepcl
+-rwxr-xr-x	root/root	usr/lib/cups/command/ippeveps
 drwxr-xr-x	root/root	usr/lib/cups/daemon/
 -rwxr-xr-x	root/root	usr/lib/cups/daemon/cups-deviced
 -rwxr-xr-x	root/root	usr/lib/cups/daemon/cups-driverd
@@ -74,7 +77,6 @@ drwxr-xr-x	root/root	usr/lib/cups/filter/
 -rwxr-xr-x	root/root	usr/lib/cups/filter/commandtops
 -rwxr-xr-x	root/root	usr/lib/cups/filter/gziptoany
 -rwxr-xr-x	root/root	usr/lib/cups/filter/pstops
-lrwxrwxrwx	root/root	usr/lib/cups/filter/rastertodymo -> rastertolabel
 -rwxr-xr-x	root/root	usr/lib/cups/filter/rastertoepson
 -rwxr-xr-x	root/root	usr/lib/cups/filter/rastertohp
 -rwxr-xr-x	root/root	usr/lib/cups/filter/rastertolabel
@@ -90,9 +92,7 @@ lrwxrwxrwx	root/root	usr/lib/libcups.so -> 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/sbin/
-lrwxrwxrwx	root/root	usr/sbin/accept -> cupsaccept
 -rwxr-xr-x	root/root	usr/sbin/cupsaccept
--rwxr-xr-x	root/root	usr/sbin/cupsaddsmb
 -rwxr-xr-x	root/root	usr/sbin/cupsctl
 -rwx------	root/root	usr/sbin/cupsd
 lrwxrwxrwx	root/root	usr/sbin/cupsdisable -> cupsaccept
@@ -103,7 +103,6 @@ lrwxrwxrwx	root/root	usr/sbin/cupsreject -> cupsaccept
 -rwxr-xr-x	root/root	usr/sbin/lpc
 -rwxr-xr-x	root/root	usr/sbin/lpinfo
 -rwxr-xr-x	root/root	usr/sbin/lpmove
-lrwxrwxrwx	root/root	usr/sbin/reject -> cupsaccept
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/cups/
 drwxr-xr-x	root/root	usr/share/cups/doc/
@@ -112,6 +111,7 @@ drwxr-xr-x	root/root	usr/share/cups/doc/
 -rw-r--r--	root/root	usr/share/cups/doc/cups.css
 drwxr-xr-x	root/root	usr/share/cups/doc/help/
 -rw-r--r--	root/root	usr/share/cups/doc/help/accounting.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/admin.html
 -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
@@ -119,6 +119,7 @@ drwxr-xr-x	root/root	usr/share/cups/doc/help/
 -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
+-rw-r--r--	root/root	usr/share/cups/doc/help/firewalls.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/glossary.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/kerberos.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/license.html
@@ -132,15 +133,15 @@ drwxr-xr-x	root/root	usr/share/cups/doc/help/
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-cups-snmp.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-cups.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsaccept.html
--rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsaddsmb.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsd-helper.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsd-logs.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsd.conf.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsd.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsenable.html
--rw-r--r--	root/root	usr/share/cups/doc/help/man-cupstestdsc.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-cupstestppd.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-filter.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-ippevepcl.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-ippeveprinter.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-ipptool.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-ipptoolfile.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/man-lp.html
@@ -177,8 +178,6 @@ drwxr-xr-x	root/root	usr/share/cups/doc/help/
 -rw-r--r--	root/root	usr/share/cups/doc/help/spec-command.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/spec-design.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/spec-ipp.html
--rw-r--r--	root/root	usr/share/cups/doc/help/spec-pdf.html
--rw-r--r--	root/root	usr/share/cups/doc/help/spec-postscript.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/spec-ppd.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/spec-raster.html
 -rw-r--r--	root/root	usr/share/cups/doc/help/spec-stp.html
@@ -218,30 +217,66 @@ drwxr-xr-x	root/root	usr/share/cups/examples/
 -rw-r--r--	root/root	usr/share/cups/examples/r300-colorman.drv
 -rw-r--r--	root/root	usr/share/cups/examples/r300-remote.drv
 drwxr-xr-x	root/root	usr/share/cups/ipptool/
+-rw-r--r--	root/root	usr/share/cups/ipptool/cancel-current-job.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/color.jpg
+-rw-r--r--	root/root	usr/share/cups/ipptool/create-job-format.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/create-job-sheets.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/create-job-timeout.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/create-job.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/create-printer-subscription.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/cups-create-local-printer.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/document-a4.pdf
 -rw-r--r--	root/root	usr/share/cups/ipptool/document-a4.ps
 -rw-r--r--	root/root	usr/share/cups/ipptool/document-letter.pdf
 -rw-r--r--	root/root	usr/share/cups/ipptool/document-letter.ps
+-rw-r--r--	root/root	usr/share/cups/ipptool/fax-job.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/get-completed-jobs.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-devices.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-job-attributes.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-job-attributes2.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-job-template-attributes.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/get-jobs.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/get-notifications.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-ppd-printer.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-ppd.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-ppds-drv-only.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-ppds-language.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-ppds-make-and-model.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-ppds-make.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-ppds-product.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-ppds-psversion.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-ppds.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-printer-attributes-suite.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/get-printer-attributes.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-printer-description-attributes.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-printers-printer-id.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/get-printers.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/get-subscriptions.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/gray.jpg
+-rw-r--r--	root/root	usr/share/cups/ipptool/identify-printer-display.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/identify-printer-multiple.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/identify-printer.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/ipp-1.1.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/ipp-2.0.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/ipp-2.1.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/ipp-2.2.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/ipp-backend.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/ipp-everywhere.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/onepage-a4.pdf
 -rw-r--r--	root/root	usr/share/cups/ipptool/onepage-a4.ps
 -rw-r--r--	root/root	usr/share/cups/ipptool/onepage-letter.pdf
 -rw-r--r--	root/root	usr/share/cups/ipptool/onepage-letter.ps
+-rw-r--r--	root/root	usr/share/cups/ipptool/print-job-and-wait.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/print-job-deflate.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/print-job-gzip.test
+-rw-r--r--	root/root	usr/share/cups/ipptool/print-job-hold.test
+-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-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
+-rw-r--r--	root/root	usr/share/cups/ipptool/set-attrs-hold.test
 -rw-r--r--	root/root	usr/share/cups/ipptool/testfile.jpg
 -rw-r--r--	root/root	usr/share/cups/ipptool/testfile.pcl
 -rw-r--r--	root/root	usr/share/cups/ipptool/testfile.pdf
@@ -263,7 +298,6 @@ drwxr-xr-x	root/root	usr/share/cups/profiles/
 drwxr-xr-x	root/root	usr/share/cups/templates/
 -rw-r--r--	root/root	usr/share/cups/templates/add-class.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/add-printer.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/add-rss-subscription.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/admin.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/choose-device.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/choose-make.tmpl
@@ -321,13 +355,9 @@ drwxr-xr-x	root/root	usr/share/cups/templates/
 -rw-r--r--	root/root	usr/share/cups/templates/printers-header.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printers.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/restart.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/samba-export.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/samba-exported.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/search.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/set-printer-options-header.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/set-printer-options-trailer.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/subscription-added.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/subscription-canceled.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/test-page.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/trailer.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/users.tmpl
@@ -338,8 +368,8 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/cancel.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/cups-config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/cups.1.gz
--rw-r--r--	root/root	usr/share/man/man1/cupstestdsc.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/cupstestppd.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/ippeveprinter.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ipptool.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/lp.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/lpoptions.1.gz
@@ -369,16 +399,16 @@ drwxr-xr-x	root/root	usr/share/man/man5/
 drwxr-xr-x	root/root	usr/share/man/man7/
 -rw-r--r--	root/root	usr/share/man/man7/backend.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/filter.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/ippevepcl.7.gz
+lrwxrwxrwx	root/root	usr/share/man/man7/ippeveps.7.gz -> ippevepcl.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/notifier.7.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
-lrwxrwxrwx	root/root	usr/share/man/man8/accept.8.gz -> cupsaccept.8.gz
 lrwxrwxrwx	root/root	usr/share/man/man8/cups-deviced.8.gz -> cupsd-helper.8.gz
 lrwxrwxrwx	root/root	usr/share/man/man8/cups-driverd.8.gz -> cupsd-helper.8.gz
 lrwxrwxrwx	root/root	usr/share/man/man8/cups-exec.8.gz -> cupsd-helper.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/cups-lpd.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/cups-snmp.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/cupsaccept.8.gz
--rw-r--r--	root/root	usr/share/man/man8/cupsaddsmb.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/cupsctl.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/cupsd-helper.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/cupsd.8.gz
@@ -390,7 +420,6 @@ lrwxrwxrwx	root/root	usr/share/man/man8/cupsreject.8.gz -> cupsaccept.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/lpc.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/lpinfo.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/lpmove.8.gz
-lrwxrwxrwx	root/root	usr/share/man/man8/reject.8.gz -> cupsaccept.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/cache/
 drwxrwx---	root/lp	var/cache/cups/
diff --git a/cups/.signature b/cups/.signature
index d121a5858..d22068791 100644
--- a/cups/.signature
+++ b/cups/.signature
@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Zlek9OlR5SWavNBBh86AAEzYwfOeDzXjElNk7ChQQ7l6CMznx+ujYBVPdiSGW8X4mpSAmI00zIQmPuefs1D8gU=
-SHA256 (Pkgfile) = 4e785be5f9037a6c4ed488f2e687c5838bef5a97c2c5d66dc0825ed5751943d3
-SHA256 (.footprint) = 224cbe9e794cb3ac8d8e64969714d059f5ac24399e8f07d3bd7157a4e1da528f
-SHA256 (cups-2.2.12-source.tar.gz) = 0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8
-SHA256 (cups) = 61a1deceebcee0437e5c3f987621abf24642b6517961336ed4f26384ddab5639
+RWSE3ohX2g5d/SO2GEM6RosAeH0mCS4ZEsqaZTujJK6wdGi5ixHLq0q7RICcK9kfpCD6lhcKfGases2w6spCntjSG2P4TkZnkAM=
+SHA256 (Pkgfile) = a8d50fccd341f1d34eb14cd8e38df4258bc54d7bef9afd9a69817b555d9a2173
+SHA256 (.footprint) = 675bb897e7269a0518f11329a16a9683e2d54332c8e62f7b89ccf48e537d012e
+SHA256 (cups-2.3.0-source.tar.gz) = acaf0229cf008ea8f06353ffd1bbd62d71dbe88990dd3330650ef87edb95a1a5
+SHA256 (cups.rc) = 61a1deceebcee0437e5c3f987621abf24642b6517961336ed4f26384ddab5639
+SHA256 (cups.pam) = 46b6b6e42e77c82435c0680405a45c66a37ec3d727af6aa6f036dd1d60215479
diff --git a/cups/Pkgfile b/cups/Pkgfile
index d4c5a29c6..d4431b36e 100644
--- a/cups/Pkgfile
+++ b/cups/Pkgfile
@@ -4,10 +4,10 @@
 # Depends on:  acl libusb zlib linux-pam
 
 name=cups
-version=2.2.12
+version=2.3.0
 release=1
 source=(https://github.com/apple/cups/releases/download/v$version/$name-$version-sou...
-        cups)
+        cups.rc cups.pam)
 
 build () {
     cd $name-$version
@@ -22,7 +22,6 @@ build () {
                 --with-cups-user=daemon \
                 --with-cups-group=lp \
                 --with-languages="" \
-                --without-{java,perl,php,python} \
                 --without-rcdir \
                 --with-optim="$CFLAGS" \
                 --enable-acl \
@@ -39,8 +38,9 @@ build () {
     chmod 0755 $PKG/var/{cache,spool}   
     chmod -R +w $PKG
 
-    # start script
-    install -D -m 755 $SRC/cups $PKG/etc/rc.d/cups
+    # 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
diff --git a/cups/cups.pam b/cups/cups.pam
new file mode 100644
index 000000000..523f9e6af
--- /dev/null
+++ b/cups/cups.pam
@@ -0,0 +1,8 @@
+#
+# /etc/pam.d/cups - cups service module configuration
+#
+
+auth    include common-auth
+account include common-account
+session include common-session
+
diff --git a/cups/cups b/cups/cups.rc
similarity index 100%
rename from cups/cups
rename to cups/cups.rc

    

[crux-commits] ports/opt (3.5): cups: update to 2.3

crux＠crux.nu