Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6963984D13 for ; Fri, 16 Jun 2023 21:12:13 +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 4nCmo4GXhwsn for ; Fri, 16 Jun 2023 21:12:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id CB76984D01 for ; Fri, 16 Jun 2023 21:12:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B9F87FA89; Fri, 16 Jun 2023 21:12:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168694993191880" MIME-Version: 1.0 Date: Fri, 16 Jun 2023 21:12:11 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/print To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230616211211.B9F87FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168694993191880 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Fri Jun 16 21:12:11 UTC 2023 Modified Files: pkgsrc/print/cups: Makefile Makefile.common pkgsrc/print/cups-base: Makefile distinfo pkgsrc/print/cups-base/patches: patch-config-scripts_cups-gssapi.m4 Added Files: pkgsrc/print/cups-base/patches: patch-man_cups-files.conf.5 Removed Files: pkgsrc/print/cups-base/patches: patch-cups_string.c patch-man-cups-files.conf.man.in Log Message: cups*: update to 2.4.4 Changes in CUPS v2.4.4 - 2023-06-06 ----------------------------------- - Fix segfault in `cupsGetNamedDest()` when trying to get default printer, but the default printer is not set (Issue #719) Changes in CUPS v2.4.3 (2023-06-01) ----------------------------------- - Added a title with device uri for found network printers (Issues #402, #393) - Added new media sizes defined by IANA (Issues #501) - Added quirk for GoDEX label printers (Issue #440) - Fixed `--enable-libtool-unsupported` (Issue #394) - Fixed configuration on RISC-V machines (Issue #404) - Fixed the `device_uri` invalid pointer for driverless printers with `.local` hostname (Issue #419) - Fixed an OpenSSL crash bug (Issue #409) - Fixed a potential SNMP OID value overflow issue (Issue #431) - Fixed an OpenSSL certificate loading issue (Issue #465) - Fixed Brazilian Portuguese translations (Issue #288) - Fixed `cupsd` default keychain location when building with OpenSSL (Issue #529) - Fixed default color settings for CMYK printers as well (Issue #500) - Fixed duplicate PPD2IPP media-type names (Issue #688) - Fixed possible heap buffer overflow in `_cups_strlcpy()` (fixes CVE-2023-32324) - Fixed InputSlot heuristic for photo sizes smaller than 5x7" if there is no media-source in the request (Issue #569) - Fixed invalid memory access during generating IPP Everywhere queue (Issue #466) - Fixed lprm if no destination is provided (Issue #457) - Fixed memory leaks in `create_local_bg_thread()` (Issue #466) - Fixed media size tolerance in `ippeveprinter` (Issue #487) - Fixed passing command name without path into `ippeveprinter` (Issue #629) - Fixed saving strings file path in `printers.conf` (Issue #710) - Fixed TLS certificate generation bugs (Issue #652) - `ippDeleteValues` would not delete the last value (Issue #556) - Ignore some of IPP defaults if the application sends its PPD alternative (Issue #484) - Make `Letter` the default size in `ippevepcl` (Issue #543) - Now accessing Admin page in Web UI requires authentication (Issue #518) - Now look for default printer on network if needed (Issue #452) - Now we poll `media-col-database` separately if we fail at first (Issue #599) - Now report fax attributes and values as needed (Issue #459) - Now localize HTTP responses using the Content-Language value (Issue #426) - Raised file size limit for importing PPD via Web UI (Issue #433) - Raised maximum listen backlog size to INT MAX (Issue #626) - Update print-color-mode if the printer is modified via ColorModel PPD option (Issue #451) - Use localhost when printing via printer application (Issue #353) - Write defaults into /etc/cups/lpoptions if we're root (Issue #456) To generate a diff of this commit: cvs rdiff -u -r1.280 -r1.281 pkgsrc/print/cups/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/print/cups/Makefile.common cvs rdiff -u -r1.57 -r1.58 pkgsrc/print/cups-base/Makefile cvs rdiff -u -r1.33 -r1.34 pkgsrc/print/cups-base/distinfo cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 cvs rdiff -u -r1.1 -r0 pkgsrc/print/cups-base/patches/patch-cups_string.c cvs rdiff -u -r1.4 -r0 \ pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in cvs rdiff -u -r0 -r1.1 \ pkgsrc/print/cups-base/patches/patch-man_cups-files.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168694993191880 Content-Disposition: inline Content-Length: 7469 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.280 pkgsrc/print/cups/Makefile:1.281 --- pkgsrc/print/cups/Makefile:1.280 Wed Apr 19 08:11:17 2023 +++ pkgsrc/print/cups/Makefile Fri Jun 16 21:12:11 2023 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.280 2023/04/19 08:11:17 adam Exp $ +# $NetBSD: Makefile,v 1.281 2023/06/16 21:12:11 wiz Exp $ -PKGREVISION= 3 .include "../../print/cups/Makefile.common" PKGNAME= cups-${CUPS_VERS} Index: pkgsrc/print/cups/Makefile.common diff -u pkgsrc/print/cups/Makefile.common:1.16 pkgsrc/print/cups/Makefile.common:1.17 --- pkgsrc/print/cups/Makefile.common:1.16 Sun Jul 3 10:26:55 2022 +++ pkgsrc/print/cups/Makefile.common Fri Jun 16 21:12:11 2023 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.16 2022/07/03 10:26:55 wiz Exp $ +# $NetBSD: Makefile.common,v 1.17 2023/06/16 21:12:11 wiz Exp $ # # used by print/cups/Makefile # used by print/cups-base/Makefile # used by print/libcups/Makefile -CUPS_VERS= 2.4.2 +CUPS_VERS= 2.4.4 DISTNAME= cups-${CUPS_VERS}-source CATEGORIES= print Index: pkgsrc/print/cups-base/Makefile diff -u pkgsrc/print/cups-base/Makefile:1.57 pkgsrc/print/cups-base/Makefile:1.58 --- pkgsrc/print/cups-base/Makefile:1.57 Thu Jun 1 11:39:33 2023 +++ pkgsrc/print/cups-base/Makefile Fri Jun 16 21:12:11 2023 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.57 2023/06/01 11:39:33 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2023/06/16 21:12:11 wiz Exp $ .include "../../print/cups/Makefile.common" PKGNAME= cups-base-${CUPS_VERS} -PKGREVISION= 9 MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/} MAINTAINER= sbd@NetBSD.org Index: pkgsrc/print/cups-base/distinfo diff -u pkgsrc/print/cups-base/distinfo:1.33 pkgsrc/print/cups-base/distinfo:1.34 --- pkgsrc/print/cups-base/distinfo:1.33 Thu Jun 1 11:39:33 2023 +++ pkgsrc/print/cups-base/distinfo Fri Jun 16 21:12:11 2023 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.33 2023/06/01 11:39:33 wiz Exp $ +$NetBSD: distinfo,v 1.34 2023/06/16 21:12:11 wiz Exp $ -BLAKE2s (cups-2.4.2-source.tar.gz) = e9da26d5d208e4620074abc6e394cd66777a853e6e4c57e04cfd3645d85a2177 -SHA512 (cups-2.4.2-source.tar.gz) = 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f -Size (cups-2.4.2-source.tar.gz) = 8128785 bytes +BLAKE2s (cups-2.4.4-source.tar.gz) = 7cb3d822e48fa1b751b984d7eceb751d5503e23f1f6dc7d62a4abe2fd81a12e8 +SHA512 (cups-2.4.4-source.tar.gz) = 861b7d8e92b5ff2c2f693464f417ce1c22da74508acbfb2cb6a889154d4673f4b3f4dd87c53f8539a01b603d66546ebc6c121b88d483746e2f180d587ff3c675 +Size (cups-2.4.4-source.tar.gz) = 8135056 bytes SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881 SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2 SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393 @@ -10,13 +10,12 @@ SHA1 (patch-conf-cups-files.conf.in) = b SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e SHA1 (patch-config-scripts_cups-compiler.m4) = 5446340c9b4976b0814a72e680025f5cab5da54a SHA1 (patch-config-scripts_cups-directories.m4) = 272a10e2ae70c589a65d73fe788f62fcbb2392b0 -SHA1 (patch-config-scripts_cups-gssapi.m4) = 8ccde86c99ad5ce96c38ec0c2f76a99dc7f29331 +SHA1 (patch-config-scripts_cups-gssapi.m4) = 79de7d8c7bb8b2071817f505412d23fa8df5f68f SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df SHA1 (patch-cups_http-addrlist.c) = b8558e6c9a646299e16d7d47ab43bc79f1a0baa0 -SHA1 (patch-cups_string.c) = 2c8d7f488785c731e0c0d95caf85a6737691bf8a SHA1 (patch-cups_thread.c) = 453f8bd9e13b7b824cc7add75ea9ef49b8e0c991 SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 -SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821 +SHA1 (patch-man_cups-files.conf.5) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821 SHA1 (patch-scheduler-conf.c) = 3e8dda2dc04c31a58a902c70161724a57bdc3e43 SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e Index: pkgsrc/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 diff -u pkgsrc/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4:1.3 pkgsrc/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4:1.4 --- pkgsrc/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4:1.3 Tue May 10 20:47:37 2022 +++ pkgsrc/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 Fri Jun 16 21:12:11 2023 @@ -1,15 +1,15 @@ -$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.3 2022/05/10 20:47:37 markd Exp $ +$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.4 2023/06/16 21:12:11 wiz Exp $ builtin krb5-config in platforms such as solaris do not support the gssapi option, and need an explicit -lgss ---- config-scripts/cups-gssapi.m4.orig 2022-01-27 11:11:42.000000000 +0000 +--- config-scripts/cups-gssapi.m4.orig 2023-06-06 12:55:36.000000000 +0000 +++ config-scripts/cups-gssapi.m4 @@ -30,31 +30,22 @@ AS_IF([test x$enable_gssapi = xyes], [ ], [ AC_MSG_RESULT([no]) ]) -- ], [sunos*], [ +- ], [sunos* | solaris*], [ - # Solaris has a non-standard krb5-config, don't use it! - SAVELIBS="$LIBS" - AC_CHECK_LIB([gss], [gss_display_status], [ @@ -34,16 +34,16 @@ the gssapi option, and need an explicit - CFLAGS="$($KRB5CONFIG --cflags gssapi) $CFLAGS" - CPPFLAGS="$($KRB5CONFIG --cflags gssapi) $CPPFLAGS" - LIBGSSAPI="$($KRB5CONFIG --libs gssapi)" -+ # make sure krb5-config supports gssapi option -+ AS_IF([$KRB5CONFIG --cflags gssapi 2>&1 | grep "Unknown option" > /dev/null], [ -+ CFLAGS="$($KRB5CONFIG --cflags) $CFLAGS" -+ CPPFLAGS="$($KRB5CONFIG --cflags) $CPPFLAGS" -+ LIBGSSAPI="-lgss $($KRB5CONFIG --libs)" -+ ], [ -+ CFLAGS="$($KRB5CONFIG --cflags gssapi) $CFLAGS" -+ CPPFLAGS="$($KRB5CONFIG --cflags gssapi) $CPPFLAGS" -+ LIBGSSAPI="$($KRB5CONFIG --libs gssapi)" -+ ]) ++ # make sure krb5-config supports gssapi option ++ AS_IF([$KRB5CONFIG --cflags gssapi 2>&1 | grep "Unknown option" > /dev/null], [ ++ CFLAGS="$($KRB5CONFIG --cflags) $CFLAGS" ++ CPPFLAGS="$($KRB5CONFIG --cflags) $CPPFLAGS" ++ LIBGSSAPI="-lgss $($KRB5CONFIG --libs)" ++ ], [ ++ CFLAGS="$($KRB5CONFIG --cflags gssapi) $CFLAGS" ++ CPPFLAGS="$($KRB5CONFIG --cflags gssapi) $CPPFLAGS" ++ LIBGSSAPI="$($KRB5CONFIG --libs gssapi)" ++ ]) ]) ]) Added files: Index: pkgsrc/print/cups-base/patches/patch-man_cups-files.conf.5 diff -u /dev/null pkgsrc/print/cups-base/patches/patch-man_cups-files.conf.5:1.1 --- /dev/null Fri Jun 16 21:12:11 2023 +++ pkgsrc/print/cups-base/patches/patch-man_cups-files.conf.5 Fri Jun 16 21:12:11 2023 @@ -0,0 +1,19 @@ +$NetBSD: patch-man_cups-files.conf.5,v 1.1 2023/06/16 21:12:11 wiz Exp $ + +Add a PidFile configuration directive to write a PID file. + +--- man/cups-files.conf.5.orig 2018-06-05 16:06:54.000000000 +0000 ++++ man/cups-files.conf.5 +@@ -154,6 +154,12 @@ The server name may be included in filen + + .fi + The default is "/var/log/cups/page_log". ++.\"#PidFile ++.TP 5 ++\fBPidFile \fIpath\fR ++Specifies the file the CUPS scheduler writes its PID to ++(set to an empty value to disable the PID file). ++The default is usually "/var/run/cups/cupsd.pid". + .\"#PassEnv + .TP 5 + \fBPassEnv \fIvariable \fR[ ... \fIvariable \fR] --_----------=_168694993191880--