Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id ED2A07A1B1 for ; Fri, 30 Sep 2016 14:10:57 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5ED3C85E83; Fri, 30 Sep 2016 14:10:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E4CB585E78 for ; Fri, 30 Sep 2016 14:10:56 +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 Whl5mTZ7J1fe for ; Fri, 30 Sep 2016 14:10:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CFB3B84CEF for ; Fri, 30 Sep 2016 14:10:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CA74FFBD2; Fri, 30 Sep 2016 14:10:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1475244655255200" MIME-Version: 1.0 Date: Fri, 30 Sep 2016 14:10:55 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/print/cups To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20160930141055.CA74FFBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1475244655255200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Fri Sep 30 14:10:55 UTC 2016 Modified Files: pkgsrc/print/cups: Makefile PLIST distinfo pkgsrc/print/cups/patches: patch-config-scripts_cups-directories.m4 patch-config-scripts_cups-manpages.m4 Log Message: Updated cups to 2.2.0. CHANGES.txt - 2.2.0 - 2016-09-13 -------------------------------- CHANGES IN CUPS V2.2.0 - Normalized the TLS certificate validation code and added additional error messages to aid troubleshooting. - http*Connect did not work on Linux when cupsd was not running (Issue #4870) - The --no-remote-any option of cupsctl had no effect (Issue #4866) - http*Connect did not return early when all addresses failed (Issue #4870) CHANGES IN CUPS V2.2rc1 - Updated the list of supported IPP Everywhere media types. - The IPP backend did not validate TLS credentials properly. - The printer-state-message attribute was not cleared after a print job with no errors (Issue #4851) - The CUPS-Add-Modify-Class and CUPS-Add-Modify-Printer operations did not always return an error for failed adds (Issue #4854) - PPD files with names longer than 127 bytes did not work (Issue #4860) - Updated localizations (Issue #4846, PR #4858) CHANGES IN CUPS V2.2b2 - Added Upstart support (PR #4825) - CUPS now supports Let's Encrypt certificates on Linux. CHANGES IN CUPS V2.2b1 - All CUPS commands now support POSIX options (Issue #4813) - The scheduler now restarts faster (Issue #4760) - Improved performance of web interface with large numbers of jobs (Issue #3819) - Encrypted printing can now be limited to only trusted printers and servers () - The scheduler now advertises PWG Raster attributes for IPP Everywhere clients (Issue #4428) - The scheduler now logs informational messages for jobs at LogLevel "info" (Issue #4815) - The scheduler now uses the getgrouplist function when available (Issue #4611) - The IPP backend no longer enables compression by default except for certain raster formats that generally benefit from it () - The scheduler did not handle out-of-disk situations gracefully (Issue #4742) - The LPD mini-daemon now detects invalid UTF-8 sequences in job, document, and user names (Issue #4748) - The IPP backend now continues on to the next job when the remote server/printer puts the job on hold () - The scheduler did not cancel multi-document jobs immediately () - The scheduler did not return non-shared printers to local clients unless they connected to the domain socket () - The scheduler now reads the spool directory if one or more job cache entries point to deleted jobs () - Added support for disc media sizes () - The httpAddrConnect and httpConnect* APIs now try connecting to multiple addresses in parallel () - The cupsd domain socket is no longer world-accessible on macOS () - Interface scripts are no longer supported for security reasons () - Added a new cupsHashData API and support for hashed job passwords () - Localization fixes (, , Issue #4041, Issue #4796) - Documentation changes (Issue #4624, Issue #4781) - Packaging fixes (PR #4832) To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.233 pkgsrc/print/cups/Makefile cvs rdiff -u -r1.55 -r1.56 pkgsrc/print/cups/PLIST cvs rdiff -u -r1.117 -r1.118 pkgsrc/print/cups/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/print/cups/patches/patch-config-scripts_cups-directories.m4 \ pkgsrc/print/cups/patches/patch-config-scripts_cups-manpages.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1475244655255200 Content-Disposition: inline Content-Length: 10949 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/cups/Makefile diff -u pkgsrc/print/cups/Makefile:1.232 pkgsrc/print/cups/Makefile:1.233 --- pkgsrc/print/cups/Makefile:1.232 Tue Sep 20 11:07:35 2016 +++ pkgsrc/print/cups/Makefile Fri Sep 30 14:10:55 2016 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.232 2016/09/20 11:07:35 wiz Exp $ +# $NetBSD: Makefile,v 1.233 2016/09/30 14:10:55 wiz Exp $ -DISTNAME= cups-2.1.4-source +DISTNAME= cups-2.2.0-source PKGNAME= ${DISTNAME:S/-source//} -PKGREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} -GITHUB_RELEASE= release-${PKGVERSION_NOREV} +GITHUB_RELEASE= v${PKGVERSION_NOREV} MAINTAINER= sbd@NetBSD.org HOMEPAGE= http://www.cups.org/ Index: pkgsrc/print/cups/PLIST diff -u pkgsrc/print/cups/PLIST:1.55 pkgsrc/print/cups/PLIST:1.56 --- pkgsrc/print/cups/PLIST:1.55 Tue Sep 20 11:07:35 2016 +++ pkgsrc/print/cups/PLIST Fri Sep 30 14:10:55 2016 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.55 2016/09/20 11:07:35 wiz Exp $ +@comment $NetBSD: PLIST,v 1.56 2016/09/30 14:10:55 wiz Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -18,17 +18,13 @@ bin/ppdpo include/cups/adminutil.h include/cups/array.h include/cups/backend.h -include/cups/cgi.h include/cups/cups.h include/cups/dir.h include/cups/file.h -include/cups/help-index.h include/cups/http.h include/cups/ipp.h include/cups/language.h -include/cups/mime.h include/cups/ppd.h -include/cups/ppdc.h include/cups/pwg.h include/cups/raster.h include/cups/sidechannel.h @@ -480,6 +476,8 @@ share/cups/templates/pt_BR/error-op.tmpl share/cups/templates/pt_BR/error.tmpl share/cups/templates/pt_BR/header.tmpl share/cups/templates/pt_BR/help-header.tmpl +share/cups/templates/pt_BR/help-printable.tmpl +share/cups/templates/pt_BR/help-trailer.tmpl share/cups/templates/pt_BR/job-cancel.tmpl share/cups/templates/pt_BR/job-hold.tmpl share/cups/templates/pt_BR/job-move.tmpl @@ -501,6 +499,7 @@ share/cups/templates/pt_BR/option-traile share/cups/templates/pt_BR/pager.tmpl share/cups/templates/pt_BR/printer-accept.tmpl share/cups/templates/pt_BR/printer-added.tmpl +share/cups/templates/pt_BR/printer-cancel-jobs.tmpl share/cups/templates/pt_BR/printer-configured.tmpl share/cups/templates/pt_BR/printer-confirm.tmpl share/cups/templates/pt_BR/printer-default.tmpl @@ -614,17 +613,14 @@ 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/api-admin.html share/doc/cups/help/api-array.html -share/doc/cups/help/api-cgi.html share/doc/cups/help/api-cups.html -share/doc/cups/help/api-driver.html share/doc/cups/help/api-filedir.html share/doc/cups/help/api-filter.html share/doc/cups/help/api-httpipp.html -share/doc/cups/help/api-mime.html share/doc/cups/help/api-overview.html share/doc/cups/help/api-ppd.html -share/doc/cups/help/api-ppdc.html share/doc/cups/help/api-raster.html share/doc/cups/help/cgi.html share/doc/cups/help/glossary.html @@ -682,7 +678,6 @@ share/doc/cups/help/ref-ppdcfile.html share/doc/cups/help/security.html share/doc/cups/help/sharing.html share/doc/cups/help/spec-banner.html -share/doc/cups/help/spec-cmp.html share/doc/cups/help/spec-command.html share/doc/cups/help/spec-design.html share/doc/cups/help/spec-ipp.html Index: pkgsrc/print/cups/distinfo diff -u pkgsrc/print/cups/distinfo:1.117 pkgsrc/print/cups/distinfo:1.118 --- pkgsrc/print/cups/distinfo:1.117 Sat Jun 18 20:36:38 2016 +++ pkgsrc/print/cups/distinfo Fri Sep 30 14:10:55 2016 @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.117 2016/06/18 20:36:38 leot Exp $ +$NetBSD: distinfo,v 1.118 2016/09/30 14:10:55 wiz Exp $ -SHA1 (cups-2.1.4-source.tar.gz) = 5d935d763169e45cc352472cb27e24893b60b7bb -RMD160 (cups-2.1.4-source.tar.gz) = b84a62416736033e7ecd3dfcaaec9c82bbd987b3 -SHA512 (cups-2.1.4-source.tar.gz) = ba06f593a54bfed972a8423df430ad842b8ef1290f16bfac3a8e1a69a27208b9fd28a9d527cb690a1b63d03be9a3ba5b7de91acf883ae83006989ad6a009609d -Size (cups-2.1.4-source.tar.gz) = 9557631 bytes +SHA1 (cups-2.2.0-source.tar.gz) = 6d6f2f5d8b8fbadfd6b834c181e8388d2d36deed +RMD160 (cups-2.2.0-source.tar.gz) = fd5a3d4001b1f13f9eec287b355963cd5e269825 +SHA512 (cups-2.2.0-source.tar.gz) = 4de6a32295655918767b64d8b3e86cbf803a54b23b933cc8da0ef55e994013d5dc4d013f6c1a2b4044a28b82664d3b39d7ca7ed7c48eb9baac5d972f7f1a6dcd +Size (cups-2.2.0-source.tar.gz) = 9481862 bytes SHA1 (patch-ae) = 04f314bbbb05538b67a0f68adc241a09e836a4e2 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0 SHA1 (patch-config-scripts_cups-compiler.m4) = 5984c94c154ac732d97c0af26fc4099a7889096f -SHA1 (patch-config-scripts_cups-directories.m4) = 3750c110eb6599870ce68a34586a442f630a11c7 +SHA1 (patch-config-scripts_cups-directories.m4) = 1daa2b6237d3675665f273678271b7b522905c8d SHA1 (patch-config-scripts_cups-gssapi.m4) = 0f7e4c35473e6117d2fe103750eda820b6fade55 -SHA1 (patch-config-scripts_cups-manpages.m4) = 58148287a64e52007ace5d9659912261aa3ea611 +SHA1 (patch-config-scripts_cups-manpages.m4) = 4393d94dc208ddde12b055cbe0550a0ff5e8e61b SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 5b95da8f91de0aaab8b3f826ce0a2662cee3f63a SHA1 (patch-configure.ac) = 0e48669372badc477db7d6f26c8180062f4e78de SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511 Index: pkgsrc/print/cups/patches/patch-config-scripts_cups-directories.m4 diff -u pkgsrc/print/cups/patches/patch-config-scripts_cups-directories.m4:1.2 pkgsrc/print/cups/patches/patch-config-scripts_cups-directories.m4:1.3 --- pkgsrc/print/cups/patches/patch-config-scripts_cups-directories.m4:1.2 Wed Dec 2 21:14:16 2015 +++ pkgsrc/print/cups/patches/patch-config-scripts_cups-directories.m4 Fri Sep 30 14:10:55 2016 @@ -1,4 +1,4 @@ -$NetBSD: patch-config-scripts_cups-directories.m4,v 1.2 2015/12/02 21:14:16 leot Exp $ +$NetBSD: patch-config-scripts_cups-directories.m4,v 1.3 2016/09/30 14:10:55 wiz Exp $ The '$' while loops expand the variables as long as possible so that no references to other variables occur. This is necessary because fontpath @@ -9,9 +9,9 @@ loop. I'm also sure that this is not the Right Way to fix it, but at least it works. ---- config-scripts/cups-directories.m4.orig 2014-03-21 16:42:53.000000000 +0000 +--- config-scripts/cups-directories.m4.orig 2016-09-13 23:39:47.000000000 +0000 +++ config-scripts/cups-directories.m4 -@@ -103,7 +103,7 @@ dnl Fix "libdir" variable... +@@ -101,7 +101,7 @@ dnl Fix "libdir" variable... if test "$libdir" = "\${exec_prefix}/lib"; then case "$uname" in Linux*) @@ -20,7 +20,7 @@ works. libdir="$exec_prefix/lib64" fi ;; -@@ -180,7 +180,15 @@ AC_SUBST(CUPS_CACHEDIR) +@@ -178,7 +178,15 @@ AC_SUBST(CUPS_CACHEDIR) # Data files CUPS_DATADIR="$datadir/cups" @@ -37,7 +37,7 @@ works. AC_SUBST(CUPS_DATADIR) # Icon directory -@@ -189,7 +197,11 @@ AC_ARG_WITH(icondir, [ --with-icondir +@@ -187,7 +195,11 @@ AC_ARG_WITH(icondir, [ --with-icondir if test "x$icondir" = x -a -d /usr/share/icons; then ICONDIR="/usr/share/icons" else @@ -50,7 +50,7 @@ works. fi AC_SUBST(ICONDIR) -@@ -200,7 +212,11 @@ AC_ARG_WITH(menudir, [ --with-menudir +@@ -198,7 +210,11 @@ AC_ARG_WITH(menudir, [ --with-menudir if test "x$menudir" = x -a -d /usr/share/applications; then MENUDIR="/usr/share/applications" else @@ -63,7 +63,7 @@ works. fi AC_SUBST(MENUDIR) -@@ -215,7 +231,15 @@ else +@@ -213,7 +229,15 @@ else CUPS_DOCROOT="$docdir" fi @@ -80,7 +80,7 @@ works. AC_SUBST(CUPS_DOCROOT) # Fonts -@@ -227,8 +251,16 @@ else +@@ -225,8 +249,16 @@ else CUPS_FONTPATH="$fontpath" fi @@ -98,7 +98,7 @@ works. # Locale data if test "$localedir" = "\${datarootdir}/locale"; then -@@ -246,6 +278,14 @@ else +@@ -244,6 +276,14 @@ else CUPS_LOCALEDIR="$localedir" fi @@ -113,7 +113,7 @@ works. AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR") AC_SUBST(CUPS_LOCALEDIR) -@@ -254,7 +294,6 @@ AC_ARG_WITH(logdir, [ --with-logdir +@@ -252,7 +292,6 @@ AC_ARG_WITH(logdir, [ --with-logdir if test x$logdir = x; then CUPS_LOGDIR="$localstatedir/log/cups" @@ -121,7 +121,7 @@ works. else CUPS_LOGDIR="$logdir" fi -@@ -263,10 +302,13 @@ AC_SUBST(CUPS_LOGDIR) +@@ -261,10 +300,13 @@ AC_SUBST(CUPS_LOGDIR) # Longer-term spool data CUPS_REQUESTS="$localstatedir/spool/cups" @@ -135,8 +135,8 @@ works. +if test x$serverbindir = x; then case "$uname" in *BSD* | Darwin*) - # *BSD and Darwin (MacOS X) -@@ -279,6 +321,10 @@ case "$uname" in + # *BSD and Darwin (macOS) +@@ -277,6 +319,10 @@ case "$uname" in CUPS_SERVERBIN="$exec_prefix/lib/cups" ;; esac @@ -147,7 +147,7 @@ works. AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") AC_SUBST(CUPS_SERVERBIN) -@@ -286,7 +332,7 @@ AC_SUBST(INSTALL_SYSV) +@@ -284,7 +330,7 @@ AC_SUBST(INSTALL_SYSV) # Configuration files CUPS_SERVERROOT="$sysconfdir/cups" Index: pkgsrc/print/cups/patches/patch-config-scripts_cups-manpages.m4 diff -u pkgsrc/print/cups/patches/patch-config-scripts_cups-manpages.m4:1.2 pkgsrc/print/cups/patches/patch-config-scripts_cups-manpages.m4:1.3 --- pkgsrc/print/cups/patches/patch-config-scripts_cups-manpages.m4:1.2 Wed Dec 2 21:14:16 2015 +++ pkgsrc/print/cups/patches/patch-config-scripts_cups-manpages.m4 Fri Sep 30 14:10:55 2016 @@ -1,10 +1,10 @@ -$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.2 2015/12/02 21:14:16 leot Exp $ +$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.3 2016/09/30 14:10:55 wiz Exp $ Add '--with-manext' configure option. ---- config-scripts/cups-manpages.m4.orig 2013-10-18 20:36:01.000000000 +0000 +--- config-scripts/cups-manpages.m4.orig 2016-09-13 23:39:47.000000000 +0000 +++ config-scripts/cups-manpages.m4 -@@ -13,6 +13,8 @@ dnl which should have been included with +@@ -11,6 +11,8 @@ dnl which should have been included with dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl @@ -13,7 +13,7 @@ Add '--with-manext' configure option. dnl Fix "mandir" variable... if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then # New GNU "standards" break previous ones, so make sure we use -@@ -44,7 +46,27 @@ AC_SUBST(AMANDIR) +@@ -42,7 +44,27 @@ AC_SUBST(AMANDIR) AC_SUBST(PMANDIR) dnl Setup manpage extensions... @@ -42,16 +42,16 @@ Add '--with-manext' configure option. SunOS*) # Solaris MAN1EXT=1 -@@ -53,7 +75,7 @@ case "$uname" in +@@ -51,7 +73,7 @@ case "$uname" in MAN8EXT=1m MAN8DIR=1m ;; - Linux* | GNU* | Darwin*) + linux) - # Linux, GNU Hurd, and OS X + # Linux, GNU Hurd, and macOS MAN1EXT=1.gz MAN5EXT=5.gz -@@ -61,7 +83,7 @@ case "$uname" in +@@ -59,7 +81,7 @@ case "$uname" in MAN8EXT=8.gz MAN8DIR=8 ;; --_----------=_1475244655255200--