diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index a23fc4a28bbf..c18a72610860 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -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 diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo index dfecf680fe87..ccae03507ec2 100644 --- a/print/cups-base/distinfo +++ b/print/cups-base/distinfo @@ -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) = b2eccf54e108d8c9e70094acfd9618a66779a84a 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 diff --git a/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 b/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 index c96e6e17abab..391a15e2e84a 100644 --- a/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 +++ b/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 @@ -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 -lgss - 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)" ++ ]) ]) ]) diff --git a/print/cups-base/patches/patch-cups_string.c b/print/cups-base/patches/patch-cups_string.c deleted file mode 100644 index c343c7371ec5..000000000000 --- a/print/cups-base/patches/patch-cups_string.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cups_string.c,v 1.1 2023/06/01 11:39:33 wiz Exp $ - -Fix denial-of-service using patch from Michael R Sweet. -https://www.openwall.com/lists/oss-security/2023/06/01/1 - ---- cups/string.c.orig 2022-05-26 06:17:21.000000000 +0000 -+++ cups/string.c -@@ -729,6 +729,8 @@ _cups_strlcpy(char *dst, /* O - D - { - size_t srclen; /* Length of source string */ - -+ if (size == 0) -+ return (0); - - /* - * Figure out how much room is needed... diff --git a/print/cups-base/patches/patch-man-cups-files.conf.man.in b/print/cups-base/patches/patch-man_cups-files.conf.5 similarity index 86% rename from print/cups-base/patches/patch-man-cups-files.conf.man.in rename to print/cups-base/patches/patch-man_cups-files.conf.5 index 0ee0e0c3f6b8..992ad285e0c0 100644 --- a/print/cups-base/patches/patch-man-cups-files.conf.man.in +++ b/print/cups-base/patches/patch-man_cups-files.conf.5 @@ -1,4 +1,4 @@ -$NetBSD: patch-man-cups-files.conf.man.in,v 1.4 2020/05/26 08:36:56 triaxx Exp $ +$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. diff --git a/print/cups/Makefile b/print/cups/Makefile index 03c0a223e79a..bb24d8e0db73 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -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} diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common index a2f394045d23..bed63f530d1f 100644 --- a/print/cups/Makefile.common +++ b/print/cups/Makefile.common @@ -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