Received: by mail.netbsd.org (Postfix, from userid 605) id C989584DF8; Sat, 10 Nov 2018 19:51:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CA54B84D71 for ; Sat, 10 Nov 2018 19:51:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jPAv6ukjfVJX for ; Sat, 10 Nov 2018 19:51:13 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2FFB184C81 for ; Sat, 10 Nov 2018 19:51:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2D101FB1F; Sat, 10 Nov 2018 19:51:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154187947321900" MIME-Version: 1.0 Date: Sat, 10 Nov 2018 19:51:13 +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: <20181110195113.2D101FB1F@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. --_----------=_154187947321900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Sat Nov 10 19:51:13 UTC 2018 Modified Files: pkgsrc/print/cups: Makefile.common pkgsrc/print/cups-base: Makefile PLIST distinfo pkgsrc/print/cups-base/patches: patch-doc-help-man-cups-files.conf.html patch-test_ippfind.c Removed Files: pkgsrc/print/cups-base/patches: patch-cups_ipp.c patch-ppdc_Makefile Log Message: cups{,-base}: Update print/cups{,-base} to 2.2.9 pkgsrc changes: - Remove patches/patch-cups_ipp.c, no more needed (applied) - Remove patches/patch-ppdc_Makefile, libcupsppdc.la is no more installed (also libcupscgi.la, libcupsmime.la are no longer installed, unfortunately no rationale seems present in the changelog about that) Changes: 2.2.9 ----- - Localization changes (Issue #5348, Issue #5362, Issue #5408) - Documentation updates (Issue #5369) - The lpadmin command would create a non-working printer in some error cases (Issue #5305) - The scheduler would crash if an empty `AccessLog` directive was specified (Issue #5309) - Fixed a regression in the changes to ippValidateAttribute (Issue #5322, Issue #5330) - Fixed a crash bug in the Epson dot matrix driver (Issue #5323) - Automatic debug logging of job errors did not work with systemd (Issue #5337) - The web interface did not list the IPP Everywhere "driver" (Issue #5338) - The IPP Everywhere "driver" now properly supports face-up printers (Issue #5345) - Fixed some typos in the label printer drivers (Issue #5350) - Multi-file jobs could get stuck if the backend failed (Issue #5359, Issue #5413) - The IPP Everywhere "driver" no longer does local filtering when printing to a shared CUPS printer (Issue #5361) - The lpadmin command now correctly reports IPP errors when configuring an IPP Everywhere printer (Issue #5370) - Fixed some memory leaks discovered by Coverity (Issue #5375) - The PPD compiler incorrectly terminated JCL options (Issue #5379) - The cupstestppd utility did not generate errors for missing/mismatched CloseUI/JCLCloseUI keywords (Issue #5381) - The scheduler now reports the actual location of the log file (Issue #5398) - Added a USB quirk rule (Issue #5420) - The scheduler was being backgrounded on macOS, causing applications to spin (rdar://40436080) - The scheduler did not validate that required initial request attributes were in the operation group (rdar://41098178) - Authentication in the web interface did not work on macOS (rdar://41444473) - Fixed an issue with HTTP Digest authentication (rdar://41709086) - The scheduler could crash when job history was purged (rdar://42198057) - Dropped non-working RSS subscriptions UI from web interface templates. - Fixed a memory leak for some IPP (extension) syntaxes. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/cups/Makefile.common cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/cups-base/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/cups-base/PLIST cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/cups-base/distinfo cvs rdiff -u -r1.2 -r0 pkgsrc/print/cups-base/patches/patch-cups_ipp.c cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html \ pkgsrc/print/cups-base/patches/patch-test_ippfind.c cvs rdiff -u -r1.1 -r0 pkgsrc/print/cups-base/patches/patch-ppdc_Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154187947321900 Content-Disposition: inline Content-Length: 7158 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.4 pkgsrc/print/cups/Makefile.common:1.5 --- pkgsrc/print/cups/Makefile.common:1.4 Mon Jun 11 10:04:24 2018 +++ pkgsrc/print/cups/Makefile.common Sat Nov 10 19:51:12 2018 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.4 2018/06/11 10:04:24 adam Exp $ +# $NetBSD: Makefile.common,v 1.5 2018/11/10 19:51:12 leot Exp $ # # used by print/cups/Makefile # used by print/cups-base/Makefile -CUPS_VERS= 2.2.8 +CUPS_VERS= 2.2.9 DISTNAME= cups-${CUPS_VERS}-source CATEGORIES= print Index: pkgsrc/print/cups-base/Makefile diff -u pkgsrc/print/cups-base/Makefile:1.14 pkgsrc/print/cups-base/Makefile:1.15 --- pkgsrc/print/cups-base/Makefile:1.14 Wed Aug 22 09:46:12 2018 +++ pkgsrc/print/cups-base/Makefile Sat Nov 10 19:51:12 2018 @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2018/08/22 09:46:12 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2018/11/10 19:51:12 leot Exp $ .include "../../print/cups/Makefile.common" DISTNAME= cups-${CUPS_VERS}-source PKGNAME= cups-base-${CUPS_VERS} -PKGREVISION= 3 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} Index: pkgsrc/print/cups-base/PLIST diff -u pkgsrc/print/cups-base/PLIST:1.2 pkgsrc/print/cups-base/PLIST:1.3 --- pkgsrc/print/cups-base/PLIST:1.2 Sun Jun 24 10:17:42 2018 +++ pkgsrc/print/cups-base/PLIST Sat Nov 10 19:51:12 2018 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2018/06/24 10:17:42 bouyer Exp $ +@comment $NetBSD: PLIST,v 1.3 2018/11/10 19:51:12 leot Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -32,10 +32,7 @@ include/cups/sidechannel.h include/cups/transcode.h include/cups/versioning.h lib/libcups.la -lib/libcupscgi.la lib/libcupsimage.la -lib/libcupsmime.la -lib/libcupsppdc.la ${PLIST.apple}libexec/cups/apple/http ${PLIST.apple}libexec/cups/apple/https ${PLIST.apple}libexec/cups/apple/ipp Index: pkgsrc/print/cups-base/distinfo diff -u pkgsrc/print/cups-base/distinfo:1.10 pkgsrc/print/cups-base/distinfo:1.11 --- pkgsrc/print/cups-base/distinfo:1.10 Fri Sep 7 20:21:20 2018 +++ pkgsrc/print/cups-base/distinfo Sat Nov 10 19:51:12 2018 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2018/09/07 20:21:20 wiz Exp $ +$NetBSD: distinfo,v 1.11 2018/11/10 19:51:12 leot Exp $ -SHA1 (cups-2.2.8-source.tar.gz) = f8c572d5b2405091e3be6836523a6abdda645f60 -RMD160 (cups-2.2.8-source.tar.gz) = 79bc052e3f70408a698bfbe2556b53d2f0140b2c -SHA512 (cups-2.2.8-source.tar.gz) = 6ed44c5e6f1c46c85b06691713ce476330c93834243720ad2c04fa983e20cde9f6ebfc2eb2ba8bb3700f11320471b99856d6402d3641038da690f89c49fbd261 -Size (cups-2.2.8-source.tar.gz) = 10374921 bytes +SHA1 (cups-2.2.9-source.tar.gz) = 918a9dd5585a9bcd626f46377b26f041b6be9fc8 +RMD160 (cups-2.2.9-source.tar.gz) = cc8581c620020d44e9fb8da927025fc1d0446496 +SHA512 (cups-2.2.9-source.tar.gz) = 423d2a215a115d5f78ce73118e8a2e566662e5d7f8acbffea39e1bfefb2f48f94841c8b85d731b0786b682dc579df8dfb5508570225b5205a182fbb2cd6dd2a5 +Size (cups-2.2.9-source.tar.gz) = 10402885 bytes SHA1 (patch-ae) = f34ec899f4816bdcf96ff315e001e3ac5a960200 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 @@ -21,14 +21,12 @@ SHA1 (patch-config-scripts_cups-libtool. 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_ipp.c) = 139e6596ba22c62c3d2b16852b2da0d0e677151a SHA1 (patch-cups_thread.c) = e625a2b81f3d831d2a0c02bc0fa9a9d31c1097a7 -SHA1 (patch-doc-help-man-cups-files.conf.html) = fcd3d06c00b0a85b6c0790235ccb68685252ea68 +SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 SHA1 (patch-man-cups-files.conf.man.in) = 820da58aa3f854018a48b68256d0cf0dc75b986e -SHA1 (patch-ppdc_Makefile) = cdeb0ef9a68f9dd85453ef3076a0120ad9983698 SHA1 (patch-scheduler-conf.c) = 179964f8d251be3c21f4cfc7b67f3196beda29dc 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) = 6db56b9b1b9a26d5c40336af4dc6cde98abd9c19 +SHA1 (patch-test_ippfind.c) = 70403f5e7d5bd56772616f64fc2dff1482994b79 Index: pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html diff -u pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html:1.1 pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html:1.2 --- pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html:1.1 Sun Nov 12 14:10:15 2017 +++ pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html Sat Nov 10 19:51:12 2018 @@ -1,13 +1,13 @@ -$NetBSD: patch-doc-help-man-cups-files.conf.html,v 1.1 2017/11/12 14:10:15 khorben Exp $ +$NetBSD: patch-doc-help-man-cups-files.conf.html,v 1.2 2018/11/10 19:51:12 leot Exp $ Add a PidFile configuration directive to write a PID file. ---- doc/help/man-cups-files.conf.html.orig 2017-03-28 20:26:53.000000000 +0200 -+++ doc/help/man-cups-files.conf.html 2017-07-17 17:25:02.000000000 +0200 -@@ -116,6 +116,10 @@ - - - The default is "/var/log/cups/page_log". +--- doc/help/man-cups-files.conf.html.orig 2018-11-08 13:49:36.000000000 +0000 ++++ doc/help/man-cups-files.conf.html +@@ -118,6 +118,10 @@ The default is "/var/log/cups/page_log". +
PassEnv variable [ ... variable ] +
Passes the specified environment variable(s) to child processes. + Note: the standard CUPS filter and backend environment variables cannot be overridden using this directive. +
PidFile path +
Specifies the file the CUPS scheduler writes its PID to +(set to an ampty value to disable the PID file). Index: pkgsrc/print/cups-base/patches/patch-test_ippfind.c diff -u pkgsrc/print/cups-base/patches/patch-test_ippfind.c:1.1 pkgsrc/print/cups-base/patches/patch-test_ippfind.c:1.2 --- pkgsrc/print/cups-base/patches/patch-test_ippfind.c:1.1 Sun Nov 12 14:10:15 2017 +++ pkgsrc/print/cups-base/patches/patch-test_ippfind.c Sat Nov 10 19:51:12 2018 @@ -1,16 +1,16 @@ -$NetBSD: patch-test_ippfind.c,v 1.1 2017/11/12 14:10:15 khorben Exp $ +$NetBSD: patch-test_ippfind.c,v 1.2 2018/11/10 19:51:12 leot Exp $ ---- test/ippfind.c.orig 2015-05-19 02:36:15.000000000 +0000 +--- test/ippfind.c.orig 2018-11-08 13:49:36.000000000 +0000 +++ test/ippfind.c -@@ -1719,11 +1719,6 @@ dnssd_error_string(int error) /* I - Er +@@ -1765,11 +1765,6 @@ dnssd_error_string(int error) /* I - Er case kDNSServiceErr_PollingMode : return ("Service polling mode error."); - --#ifndef WIN32 +-#ifndef _WIN32 - case kDNSServiceErr_Timeout : - return ("Service timeout."); --#endif /* !WIN32 */ +-#endif /* !_WIN32 */ } # elif defined(HAVE_AVAHI) --_----------=_154187947321900--