[pkgsrc/trunk]: pkgsrc/print cups{,-base}: Update to 2.3.0

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/30b893d598e9
branches:  trunk
changeset: 417904:30b893d598e9
user:      leot <leot%pkgsrc.org@localhost>
date:      Sun Nov 17 21:22:03 2019 +0000

description:
cups{,-base}: Update to 2.3.0

Changes:
2.3.0
-----
 - CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows
   (rdar://51685251)
 - Added a GPL2/LGPL2 exception to the new CUPS license terms.
 - Documentation updates (Issue #5604)
 - Localization updates (Issue #5637)
 - Fixed a bug in the scheduler job cleanup code (Issue #5588)
 - Fixed builds when there is no TLS library (Issue #5590)
 - Eliminated some new GCC compiler warnings (Issue #5591)
 - Removed dead code from the scheduler (Issue #5593)
 - "make" failed with GZIP options (Issue #5595)
 - Fixed potential excess logging from the scheduler when removing job files
   (Issue #5597)
 - Fixed a NULL pointer dereference bug in `httpGetSubField2` (Issue #5598)
 - Added FIPS-140 workarounds for GNU TLS (Issue #5601, Issue #5622)
 - The scheduler no longer provides a default value for the description
   (Issue #5603)
 - The scheduler now logs jobs held for authentication using the error level so
   it is clear what happened (Issue #5604)
 - The `lpadmin` command did not always update the PPD file for changes to the
   `cupsIPPSupplies` and `cupsSNMPSupplies` keywords (Issue #5610)
 - The scheduler now uses both the group's membership list as well as the
   various OS-specific membership functions to determine whether a user belongs
   to a named group (Issue #5613)
 - Added USB quirks rule for HP LaserJet 1015 (Issue #5617)
 - Fixed some PPD parser issues (Issue #5623, Issue #5624)
 - The IPP parser no longer allows invalid member attributes in collections
   (Issue #5630)
 - The configure script now treats the "wheel" group as a potential system
   group (Issue #5638)
 - Fixed a USB printing issue on macOS (rdar://31433931)
 - Fixed IPP buffer overflow (rdar://50035411)
 - Fixed memory disclosure issue in the scheduler (rdar://51373853)
 - Fixed DoS issues in the scheduler (rdar://51373929)
 - Fixed an issue with unsupported "sides" values in the IPP backend
   (rdar://51775322)
 - The scheduler would restart continuously when idle and printers were not
   shared (rdar://52561199)
 - Fixed an issue with `EXPECT !name WITH-VALUE ...` tests.
 - Fixed a command ordering issue in the Zebra ZPL driver.
 - Fixed a memory leak in `ppdOpen`.

diffstat:

 print/cups-base/Makefile                                      |   6 +-
 print/cups-base/PLIST                                         |  99 +++++-----
 print/cups-base/distinfo                                      |  23 +-
 print/cups-base/patches/patch-ae                              |  12 +-
 print/cups-base/patches/patch-airprint-scheduler_conf.c       |   4 +-
 print/cups-base/patches/patch-airprint-scheduler_printers.c   |  42 +---
 print/cups-base/patches/patch-config-scripts_cups-manpages.m4 |  62 ------
 print/cups-base/patches/patch-config-scripts_cups-opsys.m4    |  16 -
 print/cups-base/patches/patch-man-cups-files.conf.man.in      |   6 +-
 print/cups-base/patches/patch-scheduler-conf.c                |   8 +-
 print/cups-base/patches/patch-test_ippfind.c                  |  16 -
 print/cups/Makefile.common                                    |   4 +-
 12 files changed, 86 insertions(+), 212 deletions(-)

diffs (truncated from 713 to 300 lines):

diff -r a2c065277013 -r 30b893d598e9 print/cups-base/Makefile
--- a/print/cups-base/Makefile  Sun Nov 17 19:22:01 2019 +0000
+++ b/print/cups-base/Makefile  Sun Nov 17 21:22:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/08/26 21:57:43 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/17 21:22:03 leot Exp $
 
 .include "../../print/cups/Makefile.common"
 
@@ -36,7 +36,6 @@
 CONFIGURE_ARGS+=       --with-exe-file-perm=0755
 CONFIGURE_ARGS+=       --enable-libpaper
 CONFIGURE_ARGS+=       --enable-ssl
-CONFIGURE_ARGS+=       --with-manext=bsd
 CONFIGURE_ARGS+=       --without-bundledir
 CONFIGURE_ARGS+=       --without-icondir
 CONFIGURE_ARGS+=       --without-menudir
@@ -130,7 +129,6 @@
 .endif
 
 INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR}
-INSTALL_ENV+=          DSTROOT=${DESTDIR}
 
 pre-configure:
 .if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
@@ -143,7 +141,7 @@
        ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
 
 post-install:
-       set -e; for file in LICENSE.txt README.md; do                   \
+       set -e; for file in LICENSE README.md; do                       \
                ${INSTALL_DATA} ${WRKSRC}/$${file}                      \
                     ${DESTDIR}${DOCDIR}/$${file}; \
        done
diff -r a2c065277013 -r 30b893d598e9 print/cups-base/PLIST
--- a/print/cups-base/PLIST     Sun Nov 17 19:22:01 2019 +0000
+++ b/print/cups-base/PLIST     Sun Nov 17 21:22:03 2019 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2018/11/10 19:51:12 leot Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/11/17 21:22:03 leot Exp $
 bin/cancel
 bin/cups-config
-bin/cupstestdsc
 bin/cupstestppd
+bin/ippeveprinter
 ${PLIST.ippfind}bin/ippfind
 bin/ipptool
 bin/lp
@@ -52,6 +52,8 @@
 libexec/cups/cgi-bin/help.cgi
 libexec/cups/cgi-bin/jobs.cgi
 libexec/cups/cgi-bin/printers.cgi
+libexec/cups/command/ippevepcl
+libexec/cups/command/ippeveps
 libexec/cups/daemon/cups-deviced
 libexec/cups/daemon/cups-driverd
 libexec/cups/daemon/cups-exec
@@ -59,7 +61,6 @@
 libexec/cups/filter/commandtops
 libexec/cups/filter/gziptoany
 libexec/cups/filter/pstops
-libexec/cups/filter/rastertodymo
 libexec/cups/filter/rastertoepson
 libexec/cups/filter/rastertohp
 libexec/cups/filter/rastertolabel
@@ -72,8 +73,8 @@
 man/man1/cancel.1
 man/man1/cups-config.1
 man/man1/cups.1
-man/man1/cupstestdsc.1
 man/man1/cupstestppd.1
+man/man1/ippeveprinter.1
 ${PLIST.ippfind}man/man1/ippfind.1
 man/man1/ipptool.1
 man/man1/lp.1
@@ -102,15 +103,15 @@
 man/man5/subscriptions.conf.5
 man/man7/backend.7
 man/man7/filter.7
+man/man7/ippevepcl.7
+man/man7/ippeveps.7
 man/man7/notifier.7
-man/man8/accept.8
 man/man8/cups-deviced.8
 man/man8/cups-driverd.8
 man/man8/cups-exec.8
 man/man8/cups-lpd.8
 man/man8/cups-snmp.8
 man/man8/cupsaccept.8
-man/man8/cupsaddsmb.8
 man/man8/cupsctl.8
 man/man8/cupsd-helper.8
 man/man8/cupsd.8
@@ -122,10 +123,7 @@
 man/man8/lpc.8
 man/man8/lpinfo.8
 man/man8/lpmove.8
-man/man8/reject.8
-sbin/accept
 sbin/cupsaccept
-sbin/cupsaddsmb
 sbin/cupsctl
 sbin/cupsd
 sbin/cupsdisable
@@ -136,7 +134,6 @@
 sbin/lpc
 sbin/lpinfo
 sbin/lpmove
-sbin/reject
 share/cups/drv/sample.drv
 share/cups/examples/color.drv
 share/cups/examples/constraint.drv
@@ -149,30 +146,66 @@
 share/cups/examples/r300-basic.drv
 share/cups/examples/r300-colorman.drv
 share/cups/examples/r300-remote.drv
+share/cups/ipptool/cancel-current-job.test
 share/cups/ipptool/color.jpg
+share/cups/ipptool/create-job-format.test
+share/cups/ipptool/create-job-sheets.test
+share/cups/ipptool/create-job-timeout.test
+share/cups/ipptool/create-job.test
 share/cups/ipptool/create-printer-subscription.test
+share/cups/ipptool/cups-create-local-printer.test
 share/cups/ipptool/document-a4.pdf
 share/cups/ipptool/document-a4.ps
 share/cups/ipptool/document-letter.pdf
 share/cups/ipptool/document-letter.ps
+share/cups/ipptool/fax-job.test
 share/cups/ipptool/get-completed-jobs.test
+share/cups/ipptool/get-devices.test
+share/cups/ipptool/get-job-attributes.test
+share/cups/ipptool/get-job-attributes2.test
+share/cups/ipptool/get-job-template-attributes.test
 share/cups/ipptool/get-jobs.test
 share/cups/ipptool/get-notifications.test
+share/cups/ipptool/get-ppd-printer.test
+share/cups/ipptool/get-ppd.test
+share/cups/ipptool/get-ppds-drv-only.test
+share/cups/ipptool/get-ppds-language.test
+share/cups/ipptool/get-ppds-make-and-model.test
+share/cups/ipptool/get-ppds-make.test
+share/cups/ipptool/get-ppds-product.test
+share/cups/ipptool/get-ppds-psversion.test
+share/cups/ipptool/get-ppds.test
+share/cups/ipptool/get-printer-attributes-suite.test
 share/cups/ipptool/get-printer-attributes.test
+share/cups/ipptool/get-printer-description-attributes.test
+share/cups/ipptool/get-printers-printer-id.test
+share/cups/ipptool/get-printers.test
 share/cups/ipptool/get-subscriptions.test
 share/cups/ipptool/gray.jpg
+share/cups/ipptool/identify-printer-display.test
+share/cups/ipptool/identify-printer-multiple.test
+share/cups/ipptool/identify-printer.test
 share/cups/ipptool/ipp-1.1.test
 share/cups/ipptool/ipp-2.0.test
 share/cups/ipptool/ipp-2.1.test
 share/cups/ipptool/ipp-2.2.test
+share/cups/ipptool/ipp-backend.test
 share/cups/ipptool/ipp-everywhere.test
 share/cups/ipptool/onepage-a4.pdf
 share/cups/ipptool/onepage-a4.ps
 share/cups/ipptool/onepage-letter.pdf
 share/cups/ipptool/onepage-letter.ps
+share/cups/ipptool/print-job-and-wait.test
 share/cups/ipptool/print-job-deflate.test
 share/cups/ipptool/print-job-gzip.test
+share/cups/ipptool/print-job-hold.test
+share/cups/ipptool/print-job-letter.test
+share/cups/ipptool/print-job-manual.test
+share/cups/ipptool/print-job-media-col.test
+share/cups/ipptool/print-job-password.test
 share/cups/ipptool/print-job.test
+share/cups/ipptool/print-uri.test
+share/cups/ipptool/set-attrs-hold.test
 share/cups/ipptool/testfile.jpg
 share/cups/ipptool/testfile.pcl
 share/cups/ipptool/testfile.pdf
@@ -189,7 +222,6 @@
 share/cups/ppdc/raster.defs
 share/cups/templates/add-class.tmpl
 share/cups/templates/add-printer.tmpl
-share/cups/templates/add-rss-subscription.tmpl
 share/cups/templates/admin.tmpl
 share/cups/templates/choose-device.tmpl
 share/cups/templates/choose-make.tmpl
@@ -207,7 +239,6 @@
 share/cups/templates/command.tmpl
 share/cups/templates/de/add-class.tmpl
 share/cups/templates/de/add-printer.tmpl
-share/cups/templates/de/add-rss-subscription.tmpl
 share/cups/templates/de/admin.tmpl
 share/cups/templates/de/choose-device.tmpl
 share/cups/templates/de/choose-make.tmpl
@@ -265,13 +296,9 @@
 share/cups/templates/de/printers-header.tmpl
 share/cups/templates/de/printers.tmpl
 share/cups/templates/de/restart.tmpl
-share/cups/templates/de/samba-export.tmpl
-share/cups/templates/de/samba-exported.tmpl
 share/cups/templates/de/search.tmpl
 share/cups/templates/de/set-printer-options-header.tmpl
 share/cups/templates/de/set-printer-options-trailer.tmpl
-share/cups/templates/de/subscription-added.tmpl
-share/cups/templates/de/subscription-canceled.tmpl
 share/cups/templates/de/test-page.tmpl
 share/cups/templates/de/trailer.tmpl
 share/cups/templates/de/users.tmpl
@@ -280,7 +307,6 @@
 share/cups/templates/error.tmpl
 share/cups/templates/es/add-class.tmpl
 share/cups/templates/es/add-printer.tmpl
-share/cups/templates/es/add-rss-subscription.tmpl
 share/cups/templates/es/admin.tmpl
 share/cups/templates/es/choose-device.tmpl
 share/cups/templates/es/choose-make.tmpl
@@ -338,19 +364,14 @@
 share/cups/templates/es/printers-header.tmpl
 share/cups/templates/es/printers.tmpl
 share/cups/templates/es/restart.tmpl
-share/cups/templates/es/samba-export.tmpl
-share/cups/templates/es/samba-exported.tmpl
 share/cups/templates/es/search.tmpl
 share/cups/templates/es/set-printer-options-header.tmpl
 share/cups/templates/es/set-printer-options-trailer.tmpl
-share/cups/templates/es/subscription-added.tmpl
-share/cups/templates/es/subscription-canceled.tmpl
 share/cups/templates/es/test-page.tmpl
 share/cups/templates/es/trailer.tmpl
 share/cups/templates/es/users.tmpl
 share/cups/templates/fr/add-class.tmpl
 share/cups/templates/fr/add-printer.tmpl
-share/cups/templates/fr/add-rss-subscription.tmpl
 share/cups/templates/fr/admin.tmpl
 share/cups/templates/fr/choose-device.tmpl
 share/cups/templates/fr/choose-make.tmpl
@@ -408,13 +429,9 @@
 share/cups/templates/fr/printers-header.tmpl
 share/cups/templates/fr/printers.tmpl
 share/cups/templates/fr/restart.tmpl
-share/cups/templates/fr/samba-export.tmpl
-share/cups/templates/fr/samba-exported.tmpl
 share/cups/templates/fr/search.tmpl
 share/cups/templates/fr/set-printer-options-header.tmpl
 share/cups/templates/fr/set-printer-options-trailer.tmpl
-share/cups/templates/fr/subscription-added.tmpl
-share/cups/templates/fr/subscription-canceled.tmpl
 share/cups/templates/fr/test-page.tmpl
 share/cups/templates/fr/trailer.tmpl
 share/cups/templates/fr/users.tmpl
@@ -424,7 +441,6 @@
 share/cups/templates/help-trailer.tmpl
 share/cups/templates/ja/add-class.tmpl
 share/cups/templates/ja/add-printer.tmpl
-share/cups/templates/ja/add-rss-subscription.tmpl
 share/cups/templates/ja/admin.tmpl
 share/cups/templates/ja/choose-device.tmpl
 share/cups/templates/ja/choose-make.tmpl
@@ -482,13 +498,9 @@
 share/cups/templates/ja/printers-header.tmpl
 share/cups/templates/ja/printers.tmpl
 share/cups/templates/ja/restart.tmpl
-share/cups/templates/ja/samba-export.tmpl
-share/cups/templates/ja/samba-exported.tmpl
 share/cups/templates/ja/search.tmpl
 share/cups/templates/ja/set-printer-options-header.tmpl
 share/cups/templates/ja/set-printer-options-trailer.tmpl
-share/cups/templates/ja/subscription-added.tmpl
-share/cups/templates/ja/subscription-canceled.tmpl
 share/cups/templates/ja/test-page.tmpl
 share/cups/templates/ja/trailer.tmpl
 share/cups/templates/ja/users.tmpl
@@ -528,7 +540,6 @@
 share/cups/templates/printers.tmpl
 share/cups/templates/pt_BR/add-class.tmpl
 share/cups/templates/pt_BR/add-printer.tmpl
-share/cups/templates/pt_BR/add-rss-subscription.tmpl
 share/cups/templates/pt_BR/admin.tmpl
 share/cups/templates/pt_BR/choose-device.tmpl
 share/cups/templates/pt_BR/choose-make.tmpl
@@ -586,20 +597,15 @@
 share/cups/templates/pt_BR/printers-header.tmpl
 share/cups/templates/pt_BR/printers.tmpl
 share/cups/templates/pt_BR/restart.tmpl
-share/cups/templates/pt_BR/samba-export.tmpl
-share/cups/templates/pt_BR/samba-exported.tmpl
 share/cups/templates/pt_BR/search.tmpl
 share/cups/templates/pt_BR/set-printer-options-header.tmpl
 share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
-share/cups/templates/pt_BR/subscription-added.tmpl
-share/cups/templates/pt_BR/subscription-canceled.tmpl
 share/cups/templates/pt_BR/test-page.tmpl
 share/cups/templates/pt_BR/trailer.tmpl
 share/cups/templates/pt_BR/users.tmpl
 share/cups/templates/restart.tmpl
 share/cups/templates/ru/add-class.tmpl
 share/cups/templates/ru/add-printer.tmpl
-share/cups/templates/ru/add-rss-subscription.tmpl
 share/cups/templates/ru/admin.tmpl