Received: by mail.netbsd.org (Postfix, from userid 605) id 889DC84D67; Sun, 17 Nov 2019 21:22:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 11F9D84D65 for ; Sun, 17 Nov 2019 21:22:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id oRNacMB9ozSW for ; Sun, 17 Nov 2019 21:22:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1F69384CE8 for ; Sun, 17 Nov 2019 21:22:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 18974FA97; Sun, 17 Nov 2019 21:22:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157402572483610" MIME-Version: 1.0 Date: Sun, 17 Nov 2019 21:22:04 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/print To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20191117212204.18974FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157402572483610 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Sun Nov 17 21:22:03 UTC 2019 Modified Files: pkgsrc/print/cups: Makefile.common pkgsrc/print/cups-base: Makefile PLIST distinfo pkgsrc/print/cups-base/patches: patch-ae patch-airprint-scheduler_conf.c patch-airprint-scheduler_printers.c patch-man-cups-files.conf.man.in patch-scheduler-conf.c Removed Files: pkgsrc/print/cups-base/patches: patch-config-scripts_cups-manpages.m4 patch-config-scripts_cups-opsys.m4 patch-test_ippfind.c Log Message: 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`. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/cups/Makefile.common cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/cups-base/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/cups-base/PLIST cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/cups-base/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/cups-base/patches/patch-ae \ pkgsrc/print/cups-base/patches/patch-airprint-scheduler_conf.c \ pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c \ pkgsrc/print/cups-base/patches/patch-scheduler-conf.c cvs rdiff -u -r1.1 -r0 \ pkgsrc/print/cups-base/patches/patch-config-scripts_cups-manpages.m4 cvs rdiff -u -r1.2 -r0 \ pkgsrc/print/cups-base/patches/patch-config-scripts_cups-opsys.m4 \ pkgsrc/print/cups-base/patches/patch-test_ippfind.c cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157402572483610 Content-Disposition: inline Content-Length: 26793 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/cups/Makefile.common diff -u pkgsrc/print/cups/Makefile.common:1.8 pkgsrc/print/cups/Makefile.common:1.9 --- pkgsrc/print/cups/Makefile.common:1.8 Fri Aug 16 21:19:30 2019 +++ pkgsrc/print/cups/Makefile.common Sun Nov 17 21:22:03 2019 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.8 2019/08/16 21:19:30 leot Exp $ +# $NetBSD: Makefile.common,v 1.9 2019/11/17 21:22:03 leot Exp $ # # used by print/cups/Makefile # used by print/cups-base/Makefile -CUPS_VERS= 2.2.12 +CUPS_VERS= 2.3.0 DISTNAME= cups-${CUPS_VERS}-source CATEGORIES= print Index: pkgsrc/print/cups-base/Makefile diff -u pkgsrc/print/cups-base/Makefile:1.25 pkgsrc/print/cups-base/Makefile:1.26 --- pkgsrc/print/cups-base/Makefile:1.25 Mon Aug 26 21:57:43 2019 +++ pkgsrc/print/cups-base/Makefile Sun Nov 17 21:22:03 2019 @@ -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-system-groups=${ 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 @@ SUBST_STAGE.piefix= pre-configure .endif INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} -INSTALL_ENV+= DSTROOT=${DESTDIR} pre-configure: .if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) @@ -143,7 +141,7 @@ post-extract: ${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 Index: pkgsrc/print/cups-base/PLIST diff -u pkgsrc/print/cups-base/PLIST:1.3 pkgsrc/print/cups-base/PLIST:1.4 --- pkgsrc/print/cups-base/PLIST:1.3 Sat Nov 10 19:51:12 2018 +++ pkgsrc/print/cups-base/PLIST Sun Nov 17 21:22:03 2019 @@ -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/classes.cgi 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/daemon/cups-lpd 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 @@ libexec/cups/notifier/rss 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/printers.conf.5 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/lpadmin.8 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/lpadmin 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/postscript.drv 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/media.defs 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/classes.tmpl 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/printer.tmpl 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-op.tmpl 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/printer.tmpl 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/printer.tmpl 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-printable.tmpl 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/printer.tmpl 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-header.tmp 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/printer.tmpl 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 share/cups/templates/ru/choose-device.tmpl share/cups/templates/ru/choose-make.tmpl @@ -657,28 +663,20 @@ share/cups/templates/ru/printer.tmpl share/cups/templates/ru/printers-header.tmpl share/cups/templates/ru/printers.tmpl share/cups/templates/ru/restart.tmpl -share/cups/templates/ru/samba-export.tmpl -share/cups/templates/ru/samba-exported.tmpl share/cups/templates/ru/search.tmpl share/cups/templates/ru/set-printer-options-header.tmpl share/cups/templates/ru/set-printer-options-trailer.tmpl -share/cups/templates/ru/subscription-added.tmpl -share/cups/templates/ru/subscription-canceled.tmpl share/cups/templates/ru/test-page.tmpl share/cups/templates/ru/trailer.tmpl share/cups/templates/ru/users.tmpl -share/cups/templates/samba-export.tmpl -share/cups/templates/samba-exported.tmpl share/cups/templates/search.tmpl share/cups/templates/set-printer-options-header.tmpl share/cups/templates/set-printer-options-trailer.tmpl -share/cups/templates/subscription-added.tmpl -share/cups/templates/subscription-canceled.tmpl share/cups/templates/test-page.tmpl share/cups/templates/trailer.tmpl share/cups/templates/users.tmpl ${PLIST.libusb}share/cups/usb/org.cups.usb-quirks -share/doc/cups/LICENSE.txt +share/doc/cups/LICENSE share/doc/cups/README.md share/doc/cups/apple-touch-icon.png share/doc/cups/cups-printable.css @@ -686,6 +684,7 @@ share/doc/cups/cups.css share/doc/cups/de/index.html share/doc/cups/es/index.html share/doc/cups/help/accounting.html +share/doc/cups/help/admin.html share/doc/cups/help/api-admin.html share/doc/cups/help/api-filter.html share/doc/cups/help/api-ppd.html @@ -693,6 +692,7 @@ share/doc/cups/help/api-raster.html share/doc/cups/help/cgi.html share/doc/cups/help/cupspm.html share/doc/cups/help/encryption.html +share/doc/cups/help/firewalls.html share/doc/cups/help/glossary.html share/doc/cups/help/kerberos.html share/doc/cups/help/license.html @@ -706,15 +706,15 @@ share/doc/cups/help/man-cups-lpd.html share/doc/cups/help/man-cups-snmp.html share/doc/cups/help/man-cups.html share/doc/cups/help/man-cupsaccept.html -share/doc/cups/help/man-cupsaddsmb.html share/doc/cups/help/man-cupsd-helper.html share/doc/cups/help/man-cupsd-logs.html share/doc/cups/help/man-cupsd.conf.html share/doc/cups/help/man-cupsd.html share/doc/cups/help/man-cupsenable.html -share/doc/cups/help/man-cupstestdsc.html share/doc/cups/help/man-cupstestppd.html share/doc/cups/help/man-filter.html +share/doc/cups/help/man-ippevepcl.html +share/doc/cups/help/man-ippeveprinter.html share/doc/cups/help/man-ipptool.html share/doc/cups/help/man-ipptoolfile.html share/doc/cups/help/man-lp.html @@ -751,8 +751,6 @@ share/doc/cups/help/spec-banner.html share/doc/cups/help/spec-command.html share/doc/cups/help/spec-design.html share/doc/cups/help/spec-ipp.html -share/doc/cups/help/spec-pdf.html -share/doc/cups/help/spec-postscript.html share/doc/cups/help/spec-ppd.html share/doc/cups/help/spec-raster.html share/doc/cups/help/spec-stp.html @@ -786,6 +784,7 @@ share/examples/cups/snmp.conf share/locale/ca/cups_ca.po share/locale/cs/cups_cs.po share/locale/de/cups_de.po +share/locale/en/cups_en.po share/locale/es/cups_es.po share/locale/fr/cups_fr.po share/locale/it/cups_it.po Index: pkgsrc/print/cups-base/distinfo diff -u pkgsrc/print/cups-base/distinfo:1.15 pkgsrc/print/cups-base/distinfo:1.16 --- pkgsrc/print/cups-base/distinfo:1.15 Fri Aug 16 21:19:30 2019 +++ pkgsrc/print/cups-base/distinfo Sun Nov 17 21:22:03 2019 @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.15 2019/08/16 21:19:30 leot Exp $ +$NetBSD: distinfo,v 1.16 2019/11/17 21:22:03 leot Exp $ -SHA1 (cups-2.2.12-source.tar.gz) = a6a89bd1dd3b7122913651698a89d795e3bfea80 -RMD160 (cups-2.2.12-source.tar.gz) = e9bcc54ad693f77f482c1fcef63d5c2fa538a722 -SHA512 (cups-2.2.12-source.tar.gz) = b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6 -Size (cups-2.2.12-source.tar.gz) = 10409313 bytes -SHA1 (patch-ae) = f34ec899f4816bdcf96ff315e001e3ac5a960200 +SHA1 (cups-2.3.0-source.tar.gz) = ccdce595a90d768968b1e908684594738eba3a91 +RMD160 (cups-2.3.0-source.tar.gz) = d7a0cd359441d1b30095c04986f500010aae4c9c +SHA512 (cups-2.3.0-source.tar.gz) = c51f173b5fbae1554a3f4a3786fb3b5566e50d9f775473788ee3553922ac7e02e4785492c87c93fd46f159f50d97cc10ff6feafb3397cd9c1840840f3a9cdfae +Size (cups-2.3.0-source.tar.gz) = 8129049 bytes +SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 SHA1 (patch-airprint-conf_mime.convs.in) = 413a5ef448ab42858db804cfbfc1b8ff5b6bbf77 -SHA1 (patch-airprint-scheduler_conf.c) = f54ba16cc32dc09cd5bd8e864e1510ed2a84d6ed +SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4 SHA1 (patch-airprint-scheduler_dirsvc.c) = bef4ea8e898dffc67c4866baa701e12570eb6fca -SHA1 (patch-airprint-scheduler_printers.c) = 7fc0157f990a6e4dfa04c0b2c5684422229af725 +SHA1 (patch-airprint-scheduler_printers.c) = 1794cd3ea6a32ce6376aa86e89f945de036036eb SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0 @@ -18,15 +18,12 @@ SHA1 (patch-config-scripts_cups-compiler SHA1 (patch-config-scripts_cups-directories.m4) = 8a6c2f962dafdde20f913fac2e172ae9f8760c3e SHA1 (patch-config-scripts_cups-gssapi.m4) = ac2df3e82bc844630af8462a461c7efe1da4b354 SHA1 (patch-config-scripts_cups-libtool.m4) = a6139fbbbee7038d11654c0a2387af21f48b7412 -SHA1 (patch-config-scripts_cups-manpages.m4) = 5cc943738df29f11fc366557938b82c1e9162344 -SHA1 (patch-config-scripts_cups-opsys.m4) = 2bbacc401d4d8dbc157889b6a6cf66684c52357b SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511 SHA1 (patch-cups_thread.c) = e625a2b81f3d831d2a0c02bc0fa9a9d31c1097a7 SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 -SHA1 (patch-man-cups-files.conf.man.in) = 820da58aa3f854018a48b68256d0cf0dc75b986e -SHA1 (patch-scheduler-conf.c) = 179964f8d251be3c21f4cfc7b67f3196beda29dc +SHA1 (patch-man-cups-files.conf.man.in) = 08c0322fd233c724b7df238df01988500130d1c6 +SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57 SHA1 (patch-scheduler-conf.h) = d11f3b789af096dcaca13a38f6484727ff895bee SHA1 (patch-scheduler-main.c) = cb31fa7427b497108ce7724bbfee1b784b9330ab SHA1 (patch-scheduler_auth.c) = 8c9a5338c9eb84336db0d487008795227fa9e7f0 SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf -SHA1 (patch-test_ippfind.c) = 70403f5e7d5bd56772616f64fc2dff1482994b79 Index: pkgsrc/print/cups-base/patches/patch-ae diff -u pkgsrc/print/cups-base/patches/patch-ae:1.1 pkgsrc/print/cups-base/patches/patch-ae:1.2 --- pkgsrc/print/cups-base/patches/patch-ae:1.1 Sun Nov 12 14:10:15 2017 +++ pkgsrc/print/cups-base/patches/patch-ae Sun Nov 17 21:22:03 2019 @@ -1,11 +1,11 @@ -$NetBSD: patch-ae,v 1.1 2017/11/12 14:10:15 khorben Exp $ +$NetBSD: patch-ae,v 1.2 2019/11/17 21:22:03 leot Exp $ - Do not pass `-z' option to install(1) - Honor optimization flags. ---- Makedefs.in.orig 2017-10-13 18:22:26.000000000 +0000 +--- Makedefs.in.orig 2019-08-23 15:19:38.000000000 +0000 +++ Makedefs.in -@@ -49,7 +49,7 @@ SHELL = /bin/sh +@@ -46,7 +46,7 @@ SHELL = /bin/sh # INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ @@ -14,12 +14,12 @@ $NetBSD: patch-ae,v 1.1 2017/11/12 14:10 INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ INSTALL_DATA = $(INSTALL) -c -m 444 INSTALL_DIR = $(INSTALL) -d -@@ -151,7 +151,7 @@ CXXLIBS = @CXXLIBS@ +@@ -167,7 +167,7 @@ CXXLIBS = @CXXLIBS@ DBUS_NOTIFIER = @DBUS_NOTIFIER@ DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ DNSSD_BACKEND = @DNSSD_BACKEND@ --DSOFLAGS = -L../cups @DSOFLAGS@ +-DSOFLAGS = @DSOFLAGS@ +DSOFLAGS = -L../cups @DSOFLAGS@ $(OPTIM) - DSOLIBS = @DSOLIBS@ $(COMMONLIBS) DNSSDLIBS = @DNSSDLIBS@ IPPFIND_BIN = @IPPFIND_BIN@ + IPPFIND_MAN = @IPPFIND_MAN@ Index: pkgsrc/print/cups-base/patches/patch-airprint-scheduler_conf.c diff -u pkgsrc/print/cups-base/patches/patch-airprint-scheduler_conf.c:1.1 pkgsrc/print/cups-base/patches/patch-airprint-scheduler_conf.c:1.2 --- pkgsrc/print/cups-base/patches/patch-airprint-scheduler_conf.c:1.1 Tue Jul 24 12:19:21 2018 +++ pkgsrc/print/cups-base/patches/patch-airprint-scheduler_conf.c Sun Nov 17 21:22:03 2019 @@ -1,4 +1,4 @@ -$NetBSD: patch-airprint-scheduler_conf.c,v 1.1 2018/07/24 12:19:21 bouyer Exp $ +$NetBSD: patch-airprint-scheduler_conf.c,v 1.2 2019/11/17 21:22:03 leot Exp $ From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001 From: Till Kamppeter @@ -31,6 +31,6 @@ index 9c1be7089..52f2a6d35 100644 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cupsdSetString(&DNSSDSubTypes, "_cups,_print"); + cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal"); + cupsdClearString(&DNSSDHostName); #endif /* HAVE_DNSSD || HAVE_AVAHI */ - cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE); Index: pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c diff -u pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c:1.1 pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c:1.2 --- pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c:1.1 Tue Jul 24 12:19:21 2018 +++ pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c Sun Nov 17 21:22:03 2019 @@ -1,4 +1,4 @@ -$NetBSD: patch-airprint-scheduler_printers.c,v 1.1 2018/07/24 12:19:21 bouyer Exp $ +$NetBSD: patch-airprint-scheduler_printers.c,v 1.2 2019/11/17 21:22:03 leot Exp $ From debian: From 7147c814439aafb26ff0262a7d6b8ef56d20969f Mon Sep 17 00:00:00 2001 @@ -18,9 +18,9 @@ Patch-Name: pwg-raster-attributes.patch diff --git a/scheduler/printers.c b/scheduler/printers.c index bb99907ad..a0ebcbd3e 100644 ---- scheduler/printers.c.orig +--- scheduler/printers.c.orig 2019-11-17 12:21:47.966025953 +0000 +++ scheduler/printers.c -@@ -2199,9 +2199,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ +@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) cupsd_location_t *auth; /* Pointer to authentication element */ const char *auth_supported; /* Authentication supported */ ipp_t *oldattrs; /* Old printer attributes */ @@ -31,10 +31,10 @@ index bb99907ad..a0ebcbd3e 100644 + mime_type_t *type; - DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, -@@ -2538,6 +2539,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ - DEBUG_printf(("cupsdSetPrinterAttrs: leaving name = %s, type = %x\n", p->name, - p->type)); + /* +@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) + + add_printer_formats(p); + /* + * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input @@ -113,33 +113,7 @@ index bb99907ad..a0ebcbd3e 100644 /* * Add name-default attributes... */ - -From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -Date: Tue, 9 Aug 2016 18:11:29 +0200 -Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod - Touch to a CUPS server) - -Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495 -Bug-Debian: http://bugs.debian.org/700961 -Bug: https://cups.org/str.php?L4341 -Last-Update: 2015-02-10 - -Patch-Name: airprint-support.patch ---- - conf/mime.convs.in | 3 +++ - conf/mime.types | 3 +++ - scheduler/conf.c | 2 +- - scheduler/dirsvc.c | 6 ++++++ - scheduler/printers.c | 4 +++- - 5 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/scheduler/printers.c b/scheduler/printers.c -index a0ebcbd3e..b5fe9e031 100644 ---- scheduler/printers.c.orig -+++ scheduler/printers.c -@@ -3765,7 +3765,9 @@ add_printer_formats(cupsd_printer_t *p) /* I - Printer */ +@@ -3731,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p) } else if (!_cups_strcasecmp(type->super, "image")) { Index: pkgsrc/print/cups-base/patches/patch-scheduler-conf.c diff -u pkgsrc/print/cups-base/patches/patch-scheduler-conf.c:1.1 pkgsrc/print/cups-base/patches/patch-scheduler-conf.c:1.2 --- pkgsrc/print/cups-base/patches/patch-scheduler-conf.c:1.1 Sun Nov 12 14:10:15 2017 +++ pkgsrc/print/cups-base/patches/patch-scheduler-conf.c Sun Nov 17 21:22:03 2019 @@ -1,9 +1,9 @@ -$NetBSD: patch-scheduler-conf.c,v 1.1 2017/11/12 14:10:15 khorben Exp $ +$NetBSD: patch-scheduler-conf.c,v 1.2 2019/11/17 21:22:03 leot Exp $ Add a PidFile configuration directive to write a PID file. ---- scheduler/conf.c.orig 2017-03-28 20:26:53.000000000 +0200 -+++ scheduler/conf.c 2017-07-17 18:04:23.000000000 +0200 +--- scheduler/conf.c.orig 2019-11-17 12:21:47.927540703 +0000 ++++ scheduler/conf.c @@ -142,6 +142,7 @@ static const cupsd_var_t cupsfiles_vars[ { "CreateSelfSignedCerts", &CreateSelfSignedCerts, CUPSD_VARTYPE_BOOLEAN }, #endif /* HAVE_SSL */ @@ -20,7 +20,7 @@ Add a PidFile configuration directive to cupsdSetString(&DocumentRoot, CUPS_DOCROOT); cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log"); cupsdClearString(&ErrorLog); -@@ -3402,6 +3404,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - +@@ -3375,6 +3377,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - !_cups_strcasecmp(line, "CacheDir") || !_cups_strcasecmp(line, "ConfigFilePerm") || !_cups_strcasecmp(line, "DataDir") || Index: pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in diff -u pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in:1.2 pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in:1.3 --- pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in:1.2 Mon Jun 11 10:04:25 2018 +++ pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in Sun Nov 17 21:22:03 2019 @@ -1,9 +1,9 @@ -$NetBSD: patch-man-cups-files.conf.man.in,v 1.2 2018/06/11 10:04:25 adam Exp $ +$NetBSD: patch-man-cups-files.conf.man.in,v 1.3 2019/11/17 21:22:03 leot Exp $ Add a PidFile configuration directive to write a PID file. ---- man/cups-files.conf.man.in.orig 2018-06-05 16:06:54.000000000 +0000 -+++ man/cups-files.conf.man.in +--- man/cups-files.conf.5.orig 2018-06-05 16:06:54.000000000 +0000 ++++ man/cups-files.conf.5 @@ -157,6 +157,12 @@ The server name may be included in filen .fi --_----------=_157402572483610--