Date: Wed, 03 Dec 2025 11:37:01 +0000 From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 1939d7959279 - 2025Q4 - print/cups: Fix regressions Message-ID: <693020dd.3dc3d.59594317@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2025Q4 has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=1939d7959279e17e854ab07146b645c3f1899f83 commit 1939d7959279e17e854ab07146b645c3f1899f83 Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2025-12-03 10:41:47 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2025-12-03 11:19:18 +0000 print/cups: Fix regressions - Apply upstream patch to unblock GTK+ print dialogs. - Apply upstream patch for out-of-bounds read in cupsUTF8ToCharset(). - Make cupsd ignore IdleExitTimeout in cupsd.conf. Reported by: christos (cherry picked from commit 773bd2e7b1a41da404618d926804350768223e7f) --- print/cups/Makefile | 5 +++++ print/cups/distinfo | 6 +++++- print/cups/files/patch-conf_cupsd.conf.in | 12 ------------ print/cups/files/patch-conf_mime.convs.in | 2 +- print/cups/files/patch-scheduler_conf.c | 22 ++++++++++++++++++++++ print/cups/files/patch-scheduler_conf.h | 13 +++++++++++++ 6 files changed, 46 insertions(+), 14 deletions(-) diff --git a/print/cups/Makefile b/print/cups/Makefile index 8c81a816af22..69fb7f7582b6 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,9 +1,14 @@ PORTNAME= cups DISTVERSION= 2.4.15 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= https://github.com/OpenPrinting/${PORTNAME}/releases/download/v${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-source +PATCH_SITES= https://github.com/OpenPrinting/cups/commit/ +PATCHFILES= 93c39a4beae637bc1648409e23c03cb53b92a2b9.patch:-p1 \ + 6efa179b8446a7999b9149c5101fb11580ea8998.patch:-p1 + MAINTAINER= tijl@FreeBSD.org COMMENT= Common UNIX Printing System WWW= https://github.com/OpenPrinting/cups diff --git a/print/cups/distinfo b/print/cups/distinfo index c0227fd8028e..324a8eba46cc 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1764416209 +TIMESTAMP = 1764759903 SHA256 (cups-2.4.15-source.tar.gz) = eff0bbd48ff1abcbb8e46e28e85aefaffa391a1d9c4d8dc92ab3822a13008d7f SIZE (cups-2.4.15-source.tar.gz) = 8158215 +SHA256 (93c39a4beae637bc1648409e23c03cb53b92a2b9.patch) = 9e5e5033105dd9f2b504fa9965f2eec084c38c10513f769d008e8f6b7c2fff40 +SIZE (93c39a4beae637bc1648409e23c03cb53b92a2b9.patch) = 1735 +SHA256 (6efa179b8446a7999b9149c5101fb11580ea8998.patch) = 9e68c747a42ff981e390726e486606e01a327f073578227158c7cf1cf3afe39d +SIZE (6efa179b8446a7999b9149c5101fb11580ea8998.patch) = 1711 diff --git a/print/cups/files/patch-conf_cupsd.conf.in b/print/cups/files/patch-conf_cupsd.conf.in deleted file mode 100644 index 3085809210f4..000000000000 --- a/print/cups/files/patch-conf_cupsd.conf.in +++ /dev/null @@ -1,12 +0,0 @@ ---- conf/cupsd.conf.in.orig 2025-11-27 15:21:54 UTC -+++ conf/cupsd.conf.in -@@ -28,9 +28,6 @@ WebInterface @CUPS_WEBIF@ - # Web interface setting... - WebInterface @CUPS_WEBIF@ - --# Timeout after cupsd exits if idle (applied only if cupsd runs on-demand - with -l) --IdleExitTimeout @EXIT_TIMEOUT@ -- - # Restrict access to the server... - <Location /> - Order allow,deny diff --git a/print/cups/files/patch-conf_mime.convs.in b/print/cups/files/patch-conf_mime.convs.in index b460d92b0424..735459f22de1 100644 --- a/print/cups/files/patch-conf_mime.convs.in +++ b/print/cups/files/patch-conf_mime.convs.in @@ -1,6 +1,6 @@ Lower PostScript-to-PostScript cost such that PostScript files are sent to PostScript printers directly without intermediate conversion to PDF, see -http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format +https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format --- conf/mime.convs.in.orig 2013-06-07 01:00:33 UTC +++ conf/mime.convs.in diff --git a/print/cups/files/patch-scheduler_conf.c b/print/cups/files/patch-scheduler_conf.c new file mode 100644 index 000000000000..56f728b40a7c --- /dev/null +++ b/print/cups/files/patch-scheduler_conf.c @@ -0,0 +1,22 @@ +--- scheduler/conf.c.orig 2025-11-27 15:21:54 UTC ++++ scheduler/conf.c +@@ -91,9 +91,7 @@ static const cupsd_var_t cupsd_vars[] = + #ifdef HAVE_GSSAPI + { "GSSServiceName", &GSSServiceName, CUPSD_VARTYPE_STRING }, + #endif /* HAVE_GSSAPI */ +-#ifdef HAVE_ONDEMAND + { "IdleExitTimeout", &IdleExitTimeout, CUPSD_VARTYPE_TIME }, +-#endif /* HAVE_ONDEMAND */ + { "JobKillDelay", &JobKillDelay, CUPSD_VARTYPE_TIME }, + { "JobRetryLimit", &JobRetryLimit, CUPSD_VARTYPE_INTEGER }, + { "JobRetryInterval", &JobRetryInterval, CUPSD_VARTYPE_TIME }, +@@ -788,9 +786,7 @@ cupsdReadConfiguration(void) + DefaultLeaseDuration = 86400; + MaxLeaseDuration = 0; + +-#ifdef HAVE_ONDEMAND + IdleExitTimeout = 60; +-#endif /* HAVE_ONDEMAND */ + + if (!strcmp(CUPS_DEFAULT_PEER_CRED, "off")) + PeerCred = CUPSD_PEERCRED_OFF; diff --git a/print/cups/files/patch-scheduler_conf.h b/print/cups/files/patch-scheduler_conf.h new file mode 100644 index 000000000000..4e4311c2670e --- /dev/null +++ b/print/cups/files/patch-scheduler_conf.h @@ -0,0 +1,13 @@ +--- scheduler/conf.h.orig 2025-11-27 15:21:54 UTC ++++ scheduler/conf.h +@@ -244,10 +244,8 @@ VAR char *ServerKeychain VALUE(NULL); + /* Keychain holding cert + key */ + #endif /* HAVE_TLS */ + +-#ifdef HAVE_ONDEMAND + VAR int IdleExitTimeout VALUE(60); + /* Time after which an idle cupsd will exit */ +-#endif /* HAVE_ONDEMAND */ + + #ifdef HAVE_AUTHORIZATION_H + VAR char *SystemGroupAuthKey VALUE(NULL);help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?693020dd.3dc3d.59594317>