Thu Jun 8 19:02:48 2023 UTC ()
Pullup ticket #6761 - requested by bsiegert
print/cups-base: security fix

Revisions pulled up:
- print/cups-base/Makefile                                      1.57
- print/cups-base/distinfo                                      1.33
- print/cups-base/patches/patch-cups_string.c                   1.1

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Thu Jun  1 11:39:33 UTC 2023

   Modified Files:
           pkgsrc/print/cups-base: Makefile distinfo
   Added Files:
           pkgsrc/print/cups-base/patches: patch-cups_string.c

   Log Message:
   cups-base: fix security problem.

   Bump PKGREVISION.

   To generate a diff of this commit:
   cvs rdiff -u -r1.56 -r1.57 pkgsrc/print/cups-base/Makefile
   cvs rdiff -u -r1.32 -r1.33 pkgsrc/print/cups-base/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/print/cups-base/patches/patch-cups_string.c


(spz)
diff -r1.54 -r1.54.2.1 pkgsrc/print/cups-base/Makefile
diff -r1.32 -r1.32.6.1 pkgsrc/print/cups-base/distinfo
diff -r0 -r1.1.2.2 pkgsrc/print/cups-base/patches/patch-cups_string.c
cvs diff -r1.54 -r1.54.2.1 pkgsrc/print/cups-base/Makefile (switch to unified diff)

--- pkgsrc/print/cups-base/Makefile 2023/01/03 17:36:30 1.54
+++ pkgsrc/print/cups-base/Makefile 2023/06/08 19:02:47 1.54.2.1
@@ -1,163 +1,163 @@ @@ -1,163 +1,163 @@
1# $NetBSD: Makefile,v 1.54 2023/01/03 17:36:30 wiz Exp $ 1# $NetBSD: Makefile,v 1.54.2.1 2023/06/08 19:02:47 spz Exp $
2 2
3.include "../../print/cups/Makefile.common" 3.include "../../print/cups/Makefile.common"
4 4
5PKGNAME= cups-base-${CUPS_VERS} 5PKGNAME= cups-base-${CUPS_VERS}
6PKGREVISION= 6 6PKGREVISION= 7
7MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/}
8 8
9MAINTAINER= sbd@NetBSD.org 9MAINTAINER= sbd@NetBSD.org
10COMMENT= Common UNIX Printing System 10COMMENT= Common UNIX Printing System
11 11
12GITHUB_PROJECT= cups 12GITHUB_PROJECT= cups
13GITHUB_RELEASE= v${PKGVERSION_NOREV} 13GITHUB_RELEASE= v${PKGVERSION_NOREV}
14 14
15CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 15CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
16 16
17WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 17WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
18UNLIMIT_RESOURCES= datasize memorysize 18UNLIMIT_RESOURCES= datasize memorysize
19USE_LANGUAGES= c c++ # pdftops is a C++ application 19USE_LANGUAGES= c c++ # pdftops is a C++ application
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
22USE_TOOLS+= aclocal autoconf automake gmake pkg-config 22USE_TOOLS+= aclocal autoconf automake gmake pkg-config
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 24CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
26CONFIGURE_ARGS+= --localstatedir=${VARBASE} 26CONFIGURE_ARGS+= --localstatedir=${VARBASE}
27CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 27CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
28CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 28CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
29CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 29CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
30CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} 30CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER}
31CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} 31CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP}
32CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} 32CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
33CONFIGURE_ARGS+= --with-exe-file-perm=0755 33CONFIGURE_ARGS+= --with-exe-file-perm=0755
34CONFIGURE_ARGS+= --enable-libpaper 34CONFIGURE_ARGS+= --enable-libpaper
35CONFIGURE_ARGS+= --without-bundledir 35CONFIGURE_ARGS+= --without-bundledir
36CONFIGURE_ARGS+= --without-icondir 36CONFIGURE_ARGS+= --without-icondir
37CONFIGURE_ARGS+= --without-menudir 37CONFIGURE_ARGS+= --without-menudir
38CONFIGURE_ARGS+= --with-tls=gnutls 38CONFIGURE_ARGS+= --with-tls=gnutls
39 39
40CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 40CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
41 41
42.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
43.include "options.mk" 43.include "options.mk"
44 44
45# Explicitly disable epoll on illumos, it is provided for Linux compat only. 45# Explicitly disable epoll on illumos, it is provided for Linux compat only.
46CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no 46CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no
47 47
48CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS 48CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
49 49
50LIBS+= ${BUILDLINK_LDADD.iconv} 50LIBS+= ${BUILDLINK_LDADD.iconv}
51 51
52# Avoid the following error when compiling with clang. 52# Avoid the following error when compiling with clang.
53# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC' 53# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
54# can not be used when making a shared object; recompile with -fPIC 54# can not be used when making a shared object; recompile with -fPIC
55BUILDLINK_TRANSFORM.FreeBSD+= rm:-Wl,-pie 55BUILDLINK_TRANSFORM.FreeBSD+= rm:-Wl,-pie
56 56
57FILES_SUBST+= CUPS_USER=${CUPS_USER} 57FILES_SUBST+= CUPS_USER=${CUPS_USER}
58FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} 58FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
59FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q} 59FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
60 60
61PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS 61PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS
62PKG_USERS_VARS= CUPS_USER 62PKG_USERS_VARS= CUPS_USER
63 63
64BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE 64BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE
65 65
66DOCDIR= ${PREFIX}/share/doc/cups 66DOCDIR= ${PREFIX}/share/doc/cups
67EGDIR= ${PREFIX}/share/examples/cups 67EGDIR= ${PREFIX}/share/examples/cups
68MIMEDIR= ${PREFIX}/share/cups/mime 68MIMEDIR= ${PREFIX}/share/cups/mime
69PKG_SYSCONFSUBDIR= cups 69PKG_SYSCONFSUBDIR= cups
70CUPS_CONFDIR= ${PKG_SYSCONFDIR} 70CUPS_CONFDIR= ${PKG_SYSCONFDIR}
71CUPS_LOGDIR= ${VARBASE}/log/cups 71CUPS_LOGDIR= ${VARBASE}/log/cups
72CUPS_REQUESTS= ${VARBASE}/spool/cups 72CUPS_REQUESTS= ${VARBASE}/spool/cups
73CUPS_CACHE= ${VARBASE}/cache/cups 73CUPS_CACHE= ${VARBASE}/cache/cups
74CUPS_STATEDIR= ${VARBASE}/run/cups 74CUPS_STATEDIR= ${VARBASE}/run/cups
75 75
76PKG_GROUPS= ${CUPS_GROUP} 76PKG_GROUPS= ${CUPS_GROUP}
77PKG_USERS= ${CUPS_USER}:${CUPS_GROUP} 77PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}
78PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user 78PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user
79PKG_SHELL.${CUPS_USER}= ${SH} 79PKG_SHELL.${CUPS_USER}= ${SH}
80 80
81CONF_FILES+= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf 81CONF_FILES+= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
82CONF_FILES+= ${EGDIR}/cups-files.conf ${CUPS_CONFDIR}/cups-files.conf 82CONF_FILES+= ${EGDIR}/cups-files.conf ${CUPS_CONFDIR}/cups-files.conf
83CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf 83CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf
84RCD_SCRIPTS= cupsd 84RCD_SCRIPTS= cupsd
85 85
86OWN_DIRS= ${CUPS_CONFDIR} 86OWN_DIRS= ${CUPS_CONFDIR}
87OWN_DIRS+= ${CUPS_CONFDIR}/interfaces 87OWN_DIRS+= ${CUPS_CONFDIR}/interfaces
88OWN_DIRS+= ${CUPS_CONFDIR}/ppd 88OWN_DIRS+= ${CUPS_CONFDIR}/ppd
89OWN_DIRS+= ${PREFIX}/libexec/cups/driver 89OWN_DIRS+= ${PREFIX}/libexec/cups/driver
90OWN_DIRS+= ${CUPS_LOGDIR} 90OWN_DIRS+= ${CUPS_LOGDIR}
91OWN_DIRS+= ${CUPS_STATEDIR} 91OWN_DIRS+= ${CUPS_STATEDIR}
92OWN_DIRS_PERMS= ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711 92OWN_DIRS_PERMS= ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711
93OWN_DIRS_PERMS+= ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700 93OWN_DIRS_PERMS+= ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700
94OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710 94OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710
95OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770 95OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770
96OWN_DIRS_PERMS+= ${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 96OWN_DIRS_PERMS+= ${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
97OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 97OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
98 98
99SUBST_CLASSES+= paths 99SUBST_CLASSES+= paths
100SUBST_FILES.paths= ${WRKDIR}/cups.pam 100SUBST_FILES.paths= ${WRKDIR}/cups.pam
101SUBST_VARS.paths= LOCALBASE 101SUBST_VARS.paths= LOCALBASE
102SUBST_STAGE.paths= pre-configure 102SUBST_STAGE.paths= pre-configure
103 103
104SUBST_CLASSES+= rpathfix 104SUBST_CLASSES+= rpathfix
105SUBST_FILES.rpathfix= cups-config.in 105SUBST_FILES.rpathfix= cups-config.in
106SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. 106SUBST_MESSAGE.rpathfix= Adding rpath to cups-config.
107SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' 107SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
108SUBST_STAGE.rpathfix= pre-configure 108SUBST_STAGE.rpathfix= pre-configure
109 109
110.if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == powerpc 110.if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == powerpc
111SUBST_CLASSES+= piefix 111SUBST_CLASSES+= piefix
112SUBST_FILES.piefix= Makedefs.in 112SUBST_FILES.piefix= Makedefs.in
113SUBST_MESSAGE.piefix= Removing PIE flags 113SUBST_MESSAGE.piefix= Removing PIE flags
114SUBST_SED.piefix= -e 's|@PIEFLAGS@||g' 114SUBST_SED.piefix= -e 's|@PIEFLAGS@||g'
115SUBST_STAGE.piefix= pre-configure 115SUBST_STAGE.piefix= pre-configure
116.endif 116.endif
117 117
118INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} 118INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR}
119 119
120pre-configure: 120pre-configure:
121.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) 121.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
122 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" 122 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP"
123 exit 1 123 exit 1
124.endif 124.endif
125 cd ${WRKSRC} && aclocal && autoconf 125 cd ${WRKSRC} && aclocal && autoconf
126 126
127post-extract: 127post-extract:
128 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam 128 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
129 129
130post-install: 130post-install:
131 # Delete files installed by libcups 131 # Delete files installed by libcups
132 ${RM} ${DESTDIR}${PREFIX}/bin/cups-config 132 ${RM} ${DESTDIR}${PREFIX}/bin/cups-config
133 ${RM} -rf ${DESTDIR}${PREFIX}/lib 133 ${RM} -rf ${DESTDIR}${PREFIX}/lib
134 ${RM} -rf ${DESTDIR}${PREFIX}/include/cups 134 ${RM} -rf ${DESTDIR}${PREFIX}/include/cups
135 ${RM} -rf ${DESTDIR}${PREFIX}/share/locale 135 ${RM} -rf ${DESTDIR}${PREFIX}/share/locale
136 set -e; for file in LICENSE README.md; do \ 136 set -e; for file in LICENSE README.md; do \
137 ${INSTALL_DATA} ${WRKSRC}/$${file} \ 137 ${INSTALL_DATA} ${WRKSRC}/$${file} \
138 ${DESTDIR}${DOCDIR}/$${file}; \ 138 ${DESTDIR}${DOCDIR}/$${file}; \
139 done 139 done
140 ${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do \ 140 ${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do \
141 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \ 141 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \
142 ${DESTDIR}${EGDIR}/$${file}; \ 142 ${DESTDIR}${EGDIR}/$${file}; \
143 done 143 done
144 ${CHMOD} g-w ${DESTDIR}${PREFIX}/libexec/cups/cgi-bin 144 ${CHMOD} g-w ${DESTDIR}${PREFIX}/libexec/cups/cgi-bin
145.if !empty(PKG_OPTIONS:Mpam) 145.if !empty(PKG_OPTIONS:Mpam)
146 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} 146 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
147.endif 147.endif
148.if !empty(PKG_OPTIONS:Mdnssd) 148.if !empty(PKG_OPTIONS:Mdnssd)
149 ${LN} -sf ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns 149 ${LN} -sf ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
150.endif 150.endif
151 151
152.include "../../converters/libiconv/buildlink3.mk" 152.include "../../converters/libiconv/buildlink3.mk"
153.include "../../devel/zlib/buildlink3.mk" 153.include "../../devel/zlib/buildlink3.mk"
154.include "../../graphics/png/buildlink3.mk" 154.include "../../graphics/png/buildlink3.mk"
155.include "../../graphics/tiff/buildlink3.mk" 155.include "../../graphics/tiff/buildlink3.mk"
156.include "../../print/libcups/buildlink3.mk" 156.include "../../print/libcups/buildlink3.mk"
157.include "../../print/libpaper/buildlink3.mk" 157.include "../../print/libpaper/buildlink3.mk"
158.include "../../security/gnutls/buildlink3.mk" 158.include "../../security/gnutls/buildlink3.mk"
159.include "../../textproc/libunistring/buildlink3.mk" 159.include "../../textproc/libunistring/buildlink3.mk"
160.include "../../mk/curses.buildlink3.mk" 160.include "../../mk/curses.buildlink3.mk"
161.include "../../mk/jpeg.buildlink3.mk" 161.include "../../mk/jpeg.buildlink3.mk"
162.include "../../mk/pthread.buildlink3.mk" 162.include "../../mk/pthread.buildlink3.mk"
163.include "../../mk/bsd.pkg.mk" 163.include "../../mk/bsd.pkg.mk"
cvs diff -r1.32 -r1.32.6.1 pkgsrc/print/cups-base/distinfo (switch to unified diff)

--- pkgsrc/print/cups-base/distinfo 2022/07/03 10:26:55 1.32
+++ pkgsrc/print/cups-base/distinfo 2023/06/08 19:02:47 1.32.6.1
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: distinfo,v 1.32 2022/07/03 10:26:55 wiz Exp $ 1$NetBSD: distinfo,v 1.32.6.1 2023/06/08 19:02:47 spz Exp $
2 2
3BLAKE2s (cups-2.4.2-source.tar.gz) = e9da26d5d208e4620074abc6e394cd66777a853e6e4c57e04cfd3645d85a2177 3BLAKE2s (cups-2.4.2-source.tar.gz) = e9da26d5d208e4620074abc6e394cd66777a853e6e4c57e04cfd3645d85a2177
4SHA512 (cups-2.4.2-source.tar.gz) = 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f 4SHA512 (cups-2.4.2-source.tar.gz) = 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f
5Size (cups-2.4.2-source.tar.gz) = 8128785 bytes 5Size (cups-2.4.2-source.tar.gz) = 8128785 bytes
6SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881 6SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
7SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2 7SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2
8SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393 8SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393
9SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a 9SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
10SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e 10SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e
11SHA1 (patch-config-scripts_cups-compiler.m4) = 5446340c9b4976b0814a72e680025f5cab5da54a 11SHA1 (patch-config-scripts_cups-compiler.m4) = 5446340c9b4976b0814a72e680025f5cab5da54a
12SHA1 (patch-config-scripts_cups-directories.m4) = 272a10e2ae70c589a65d73fe788f62fcbb2392b0 12SHA1 (patch-config-scripts_cups-directories.m4) = 272a10e2ae70c589a65d73fe788f62fcbb2392b0
13SHA1 (patch-config-scripts_cups-gssapi.m4) = 8ccde86c99ad5ce96c38ec0c2f76a99dc7f29331 13SHA1 (patch-config-scripts_cups-gssapi.m4) = 8ccde86c99ad5ce96c38ec0c2f76a99dc7f29331
14SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df 14SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df
15SHA1 (patch-cups_http-addrlist.c) = b8558e6c9a646299e16d7d47ab43bc79f1a0baa0 15SHA1 (patch-cups_http-addrlist.c) = b8558e6c9a646299e16d7d47ab43bc79f1a0baa0
 16SHA1 (patch-cups_string.c) = 2c8d7f488785c731e0c0d95caf85a6737691bf8a
16SHA1 (patch-cups_thread.c) = 453f8bd9e13b7b824cc7add75ea9ef49b8e0c991 17SHA1 (patch-cups_thread.c) = 453f8bd9e13b7b824cc7add75ea9ef49b8e0c991
17SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 18SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
18SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821 19SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821
19SHA1 (patch-scheduler-conf.c) = 3e8dda2dc04c31a58a902c70161724a57bdc3e43 20SHA1 (patch-scheduler-conf.c) = 3e8dda2dc04c31a58a902c70161724a57bdc3e43
20SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a 21SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a
21SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e 22SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e
22SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d 23SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d
23SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc 24SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc
24SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367 25SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367
File Added: pkgsrc/print/cups-base/patches/Attic/patch-cups_string.c
$NetBSD: patch-cups_string.c,v 1.1.2.2 2023/06/08 19:02:48 spz 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...