CVS commit: pkgsrc/print

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov 30 13:58:06 UTC 2025

Modified Files:
        pkgsrc/print/cups: Makefile Makefile.common
        pkgsrc/print/cups-base: Makefile distinfo
        pkgsrc/print/cups-base/patches: patch-doc-help-man-cups-files.conf.html
            patch-scheduler_auth.c
        pkgsrc/print/libcups: Makefile

Log Message:
*cups*: update to 2.4.15

Changes in CUPS v2.4.15 (2025-11-27)
------------------------------------

- Fix various cupsd issues which cause local DoS (CVE-2025-61915)
- Fix unresponsive cupsd process caused by slow client (CVE-2025-58436)
- Fixed potential crash in `cups-driverd` when there are duplicate PPDs
  (Issue #1355)
- Fixed error recovery when scanning for PPDs in `cups-driverd` (Issue #1416)


To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 pkgsrc/print/cups/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/cups/Makefile.common
cvs rdiff -u -r1.79 -r1.80 pkgsrc/print/cups-base/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/print/cups-base/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/print/cups-base/patches/patch-scheduler_auth.c
cvs rdiff -u -r1.45 -r1.46 pkgsrc/print/libcups/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/cups/Makefile
diff -u pkgsrc/print/cups/Makefile:1.298 pkgsrc/print/cups/Makefile:1.299
--- pkgsrc/print/cups/Makefile:1.298    Thu Oct 23 20:38:58 2025
+++ pkgsrc/print/cups/Makefile  Sun Nov 30 13:58:06 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.298 2025/10/23 20:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.299 2025/11/30 13:58:06 wiz Exp $
 
-PKGREVISION= 1
 .include "../../print/cups/Makefile.common"
 
 PKGNAME=       cups-${CUPS_VERS}

Index: pkgsrc/print/cups/Makefile.common
diff -u pkgsrc/print/cups/Makefile.common:1.24 pkgsrc/print/cups/Makefile.common:1.25
--- pkgsrc/print/cups/Makefile.common:1.24      Sun Sep 21 18:27:11 2025
+++ pkgsrc/print/cups/Makefile.common   Sun Nov 30 13:58:06 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.24 2025/09/21 18:27:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.25 2025/11/30 13:58:06 wiz Exp $
 #
 # used by print/cups/Makefile
 # used by print/cups-base/Makefile
 # used by print/libcups/Makefile
 
-CUPS_VERS=     2.4.14
+CUPS_VERS=     2.4.15
 DISTNAME=      cups-${CUPS_VERS}-source
 CATEGORIES=    print
 

Index: pkgsrc/print/cups-base/Makefile
diff -u pkgsrc/print/cups-base/Makefile:1.79 pkgsrc/print/cups-base/Makefile:1.80
--- pkgsrc/print/cups-base/Makefile:1.79        Tue Nov 18 17:38:35 2025
+++ pkgsrc/print/cups-base/Makefile     Sun Nov 30 13:58:06 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.79 2025/11/18 17:38:35 nia Exp $
+# $NetBSD: Makefile,v 1.80 2025/11/30 13:58:06 wiz Exp $
 
-PKGREVISION= 1
 .include "../../print/cups/Makefile.common"
 
 PKGNAME=       cups-base-${CUPS_VERS}

Index: pkgsrc/print/cups-base/distinfo
diff -u pkgsrc/print/cups-base/distinfo:1.45 pkgsrc/print/cups-base/distinfo:1.46
--- pkgsrc/print/cups-base/distinfo:1.45        Tue Nov 18 17:38:35 2025
+++ pkgsrc/print/cups-base/distinfo     Sun Nov 30 13:58:06 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2025/11/18 17:38:35 nia Exp $
+$NetBSD: distinfo,v 1.46 2025/11/30 13:58:06 wiz Exp $
 
-BLAKE2s (cups-2.4.14-source.tar.gz) = 2ca241d55570f440fce3de4740b4f197300603989945f89d3b024aefcfc724b3
-SHA512 (cups-2.4.14-source.tar.gz) = c6d46b737e2fdf37a429947bc5cc3d752785187aa339bd6de94733576aead29929ae510f960c9842cb7ddc86697d7841e5aa6b9d9c9dece907a2b8f468d038a0
-Size (cups-2.4.14-source.tar.gz) = 8157729 bytes
+BLAKE2s (cups-2.4.15-source.tar.gz) = f3e77da1c0780a445a872119f185d6fb4679d9c461b2c8060059621d42f812cf
+SHA512 (cups-2.4.15-source.tar.gz) = 93bd679645e9cd0c8096f92ec6344268ad4e1536f4c011419b401124e513d458287b30faa42da90dfab87eb7cf18767af2eb71e316fd307e35ec85ec796d4c89
+Size (cups-2.4.15-source.tar.gz) = 8158215 bytes
 SHA1 (patch-ae) = 7f12aa886208f9e634d5c3fd3bc1fd4a385f22a6
 SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2
 SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393
@@ -14,11 +14,11 @@ SHA1 (patch-config-scripts_cups-director
 SHA1 (patch-config-scripts_cups-gssapi.m4) = 79de7d8c7bb8b2071817f505412d23fa8df5f68f
 SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df
 SHA1 (patch-cups_thread.c) = 453f8bd9e13b7b824cc7add75ea9ef49b8e0c991
-SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
+SHA1 (patch-doc-help-man-cups-files.conf.html) = 1af4ff8b768d3c2fc5e5b5b11a77ca61804c962f
 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) = 347df789f10b77e4594a3e1a6d586a4c5e7d3749
-SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d
+SHA1 (patch-scheduler_auth.c) = 63309d001f541f309ff1111abd54fc6b6527e6e1
 SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc
 SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367

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.2 pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html:1.3
--- pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html:1.2  Sat Nov 10 19:51:12 2018
+++ pkgsrc/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html      Sun Nov 30 13:58:06 2025
@@ -1,17 +1,17 @@
-$NetBSD: patch-doc-help-man-cups-files.conf.html,v 1.2 2018/11/10 19:51:12 leot Exp $
+$NetBSD: patch-doc-help-man-cups-files.conf.html,v 1.3 2025/11/30 13:58:06 wiz Exp $
 
 Add a PidFile configuration directive to write a PID file.
 
---- doc/help/man-cups-files.conf.html.orig     2018-11-08 13:49:36.000000000 +0000
+--- doc/help/man-cups-files.conf.html.orig     2025-11-27 15:21:54.000000000 +0000
 +++ doc/help/man-cups-files.conf.html
-@@ -118,6 +118,10 @@ The default is "/var/log/cups/page_log".
+@@ -118,6 +118,10 @@ The server name may be included in filen
+ The default is "/var/log/cups/page_log".
  <dt><a name="PassEnv"></a><b>PassEnv </b><i>variable </i>[ ... <i>variable </i>]
  <dd style="margin-left: 5.0em">Passes the specified environment variable(s) to child processes.
- Note: the standard CUPS filter and backend environment variables cannot be overridden using this directive.
 +<dt><a name="PidFile"></a><b>PidFile </b><i>path</i>
 +<dd style="margin-left: 5.0em">Specifies the file the CUPS scheduler writes its PID to
 +(set to an ampty value to disable the PID file).
 +The default is usually "/var/run/cups/cupsd.pid".
- <dt><a name="RemoteRoot"></a><b>RemoteRoot </b><i>username</i>
- <dd style="margin-left: 5.0em">Specifies the username that is associated with unauthenticated accesses by clients claiming to be the root user.
- The default is "remroot".
+ Note: the standard CUPS filter and backend environment variables cannot be overridden using this directive.
+ <dt><a name="PeerCred"></a><b>PeerCred off</b>
+ <dd style="margin-left: 5.0em"><dt><b>PeerCred on</b>

Index: pkgsrc/print/cups-base/patches/patch-scheduler_auth.c
diff -u pkgsrc/print/cups-base/patches/patch-scheduler_auth.c:1.4 pkgsrc/print/cups-base/patches/patch-scheduler_auth.c:1.5
--- pkgsrc/print/cups-base/patches/patch-scheduler_auth.c:1.4   Tue May 26 08:36:56 2020
+++ pkgsrc/print/cups-base/patches/patch-scheduler_auth.c       Sun Nov 30 13:58:06 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-scheduler_auth.c,v 1.4 2020/05/26 08:36:56 triaxx Exp $
+$NetBSD: patch-scheduler_auth.c,v 1.5 2025/11/30 13:58:06 wiz Exp $
 
 - Don't pull in sys/ucred.h on Solaris as it results in procfs.h being
   included and conflicts between _FILE_OFFSET_BITS=64 and 32-bit procfs.
 - OpenBSD defines SO_PEERCRED, but it is different from Linux's one.
 
---- scheduler/auth.c.orig      2018-06-05 16:06:54.000000000 +0000
+--- scheduler/auth.c.orig      2025-11-27 15:21:54.000000000 +0000
 +++ scheduler/auth.c
-@@ -39,7 +39,7 @@ extern const char *cssmErrorString(int e
+@@ -40,7 +40,7 @@
  #ifdef HAVE_SYS_PARAM_H
  #  include <sys/param.h>
  #endif /* HAVE_SYS_PARAM_H */
@@ -15,16 +15,16 @@ $NetBSD: patch-scheduler_auth.c,v 1.4 20
  #  include <sys/ucred.h>
  typedef struct xucred cupsd_ucred_t;
  #  define CUPSD_UCRED_UID(c) (c).cr_uid
-@@ -389,7 +389,7 @@ cupsdAuthorize(cupsd_client_t *con)        /* I
+@@ -397,7 +397,7 @@ cupsdAuthorize(cupsd_client_t *con)        /* I
      con->type = CUPSD_AUTH_BASIC;
    }
  #endif /* HAVE_AUTHORIZATION_H */
 -#if defined(SO_PEERCRED) && defined(AF_LOCAL)
 +#if defined(SO_PEERCRED) && defined(AF_LOCAL) && !defined(__OpenBSD__)
-   else if (!strncmp(authorization, "PeerCred ", 9) &&
+   else if (PeerCred != CUPSD_PEERCRED_OFF && !strncmp(authorization, "PeerCred ", 9) &&
             con->http->hostaddr->addr.sa_family == AF_LOCAL && con->best)
    {
-@@ -826,7 +826,7 @@ cupsdAuthorize(cupsd_client_t *con)        /* I
+@@ -852,7 +852,7 @@ cupsdAuthorize(cupsd_client_t *con)        /* I
  
      gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
  

Index: pkgsrc/print/libcups/Makefile
diff -u pkgsrc/print/libcups/Makefile:1.45 pkgsrc/print/libcups/Makefile:1.46
--- pkgsrc/print/libcups/Makefile:1.45  Thu Oct 23 20:39:00 2025
+++ pkgsrc/print/libcups/Makefile       Sun Nov 30 13:58:06 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.45 2025/10/23 20:39:00 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2025/11/30 13:58:06 wiz Exp $
 
-PKGREVISION= 1
 .include "../../print/cups/Makefile.common"
 
 PKGNAME=       libcups-${CUPS_VERS}