diff --git a/.cups.metadata b/.cups.metadata deleted file mode 100644 index 8869656..0000000 --- a/.cups.metadata +++ /dev/null @@ -1,2 +0,0 @@ -b5e3389fb9450bfed377c95c0230c029c053acc4 SOURCES/cups-2.2.6-source.tar.gz -79ee155bed4c18088be472a6e364f37ad6e410a6 SOURCES/cupsprinter.png diff --git a/.gitignore b/.gitignore index c5e2c0a..d8653e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/cups-2.2.6-source.tar.gz -SOURCES/cupsprinter.png +cups-2.4.10-source.tar.gz +cupsprinter.png diff --git a/0001-Add-NoSystem-SSLOptions-value.patch b/0001-Add-NoSystem-SSLOptions-value.patch new file mode 100644 index 0000000..879ce15 --- /dev/null +++ b/0001-Add-NoSystem-SSLOptions-value.patch @@ -0,0 +1,183 @@ +From 40e62848ab3aa94b98dfaf1334e1c478c266bc73 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Tue, 7 Jan 2025 15:12:15 +0100 +Subject: [PATCH] Add `NoSystem` SSLOptions value + +In case using system crypto policy breaks communication with device +irreversibly (f.e. if device does not support better key exchange +algorithm), the new option value gives a way how to opt-out from crypto +policy if user do not want to change default system crypto policy for +the whole machine. +--- + CHANGES.md | 1 + + cups/http-private.h | 3 ++- + cups/tls-gnutls.c | 7 ++++++- + cups/usersys.c | 2 ++ + doc/help/man-client.conf.html | 3 ++- + doc/help/man-cupsd.conf.html | 5 +++-- + man/client.conf.5 | 3 ++- + man/cupsd.conf.5 | 3 ++- + scheduler/conf.c | 2 ++ + 9 files changed, 22 insertions(+), 7 deletions(-) + +diff --git a/cups/http-private.h b/cups/http-private.h +index 5f77b8ef0..f248bbb8d 100644 +--- a/cups/http-private.h ++++ b/cups/http-private.h +@@ -131,7 +131,8 @@ extern "C" { + # define _HTTP_TLS_ALLOW_RC4 1 /* Allow RC4 cipher suites */ + # define _HTTP_TLS_ALLOW_DH 2 /* Allow DH/DHE key negotiation */ + # define _HTTP_TLS_DENY_CBC 4 /* Deny CBC cipher suites */ +-# define _HTTP_TLS_SET_DEFAULT 128 /* Setting the default TLS options */ ++# define _HTTP_TLS_NO_SYSTEM 8 /* No system crypto policy */ ++# define _HTTP_TLS_SET_DEFAULT 128 /* Setting the default TLS options */ + + # define _HTTP_TLS_SSL3 0 /* Min/max version is SSL/3.0 */ + # define _HTTP_TLS_1_0 1 /* Min/max version is TLS/1.0 */ +diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c +index 719161da7..e8224b217 100644 +--- a/cups/tls-gnutls.c ++++ b/cups/tls-gnutls.c +@@ -1285,6 +1285,8 @@ _httpTLSStart(http_t *http) /* I - Connection to server */ + + DEBUG_printf(("3_httpTLSStart(http=%p)", http)); + ++ priority_string[0] = '\0'; ++ + if (tls_options < 0) + { + DEBUG_puts("4_httpTLSStart: Setting defaults."); +@@ -1504,7 +1506,10 @@ _httpTLSStart(http_t *http) /* I - Connection to server */ + return (-1); + } + +- strlcpy(priority_string, "@SYSTEM,NORMAL", sizeof(priority_string)); ++ if (!(tls_options & _HTTP_TLS_NO_SYSTEM)) ++ strlcpy(priority_string, "@SYSTEM,", sizeof(priority_string)); ++ ++ strlcat(priority_string, "NORMAL", sizeof(priority_string)); + + if (tls_max_version < _HTTP_TLS_MAX) + { +diff --git a/cups/usersys.c b/cups/usersys.c +index f752159b0..607587307 100644 +--- a/cups/usersys.c ++++ b/cups/usersys.c +@@ -1608,6 +1608,8 @@ cups_set_ssl_options( + min_version = _HTTP_TLS_1_3; + else if (!_cups_strcasecmp(start, "None")) + options = _HTTP_TLS_NONE; ++ else if (!_cups_strcasecmp(start, "NoSystem")) ++ options |= _HTTP_TLS_NO_SYSTEM; + } + + cc->ssl_options = options; +diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html +index 81cd73a1a..9194481bb 100644 +--- a/doc/help/man-client.conf.html ++++ b/doc/help/man-client.conf.html +@@ -44,7 +44,7 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n + Note: This directive is not supported on macOS 10.7 or later. +
ServerName hostname-or-ip-address[:port]/version=1.1 +
Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier. +-
SSLOptions [AllowDH] [AllowRC4] [AllowSSL3] [DenyCBC] [DenyTLS1.0] [MaxTLS1.0] [MaxTLS1.1] [MaxTLS1.2] [MaxTLS1.3] [MinTLS1.0] [MinTLS1.1] [MinTLS1.2] [MinTLS1.3] ++
SSLOptions [AllowDH] [AllowRC4] [AllowSSL3] [DenyCBC] [DenyTLS1.0] [MaxTLS1.0] [MaxTLS1.1] [MaxTLS1.2] [MaxTLS1.3] [MinTLS1.0] [MinTLS1.1] [MinTLS1.2] [MinTLS1.3] [NoSystem] +
SSLOptions None +
Sets encryption options (only in /etc/cups/client.conf). + By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. +@@ -57,6 +57,7 @@ The DenyCBC option disables all CBC cipher suites. + The DenyTLS1.0 option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. + The MinTLS options set the minimum TLS version to support. + The MaxTLS options set the maximum TLS version to support. ++The NoSystem option disables applying system cryptographic policy. + Not all operating systems support TLS 1.3 at this time. +
TrustOnFirstUse Yes +
TrustOnFirstUse No +diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html +index 4fd42f314..4a5395387 100644 +--- a/doc/help/man-cupsd.conf.html ++++ b/doc/help/man-cupsd.conf.html +@@ -285,7 +285,7 @@ The default is "Minimal". +
SSLListen [ipv6-address]:port +
SSLListen *:port +
Listens on the specified address and port for encrypted connections. +-
SSLOptions [AllowDH] [AllowRC4] [AllowSSL3] [DenyCBC] [DenyTLS1.0] [MaxTLS1.0] [MaxTLS1.1] [MaxTLS1.2] [MaxTLS1.3] [MinTLS1.0] [MinTLS1.1] [MinTLS1.2] [MinTLS1.3] ++
SSLOptions [AllowDH] [AllowRC4] [AllowSSL3] [DenyCBC] [DenyTLS1.0] [MaxTLS1.0] [MaxTLS1.1] [MaxTLS1.2] [MaxTLS1.3] [MinTLS1.0] [MinTLS1.1] [MinTLS1.2] [MinTLS1.3] [NoSystem] +
SSLOptions None +
Sets encryption options (only in /etc/cups/client.conf). + By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. +@@ -298,6 +298,7 @@ The DenyCBC option disables all CBC cipher suites. + The DenyTLS1.0 option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. + The MinTLS options set the minimum TLS version to support. + The MaxTLS options set the maximum TLS version to support. ++The NoSystem option disables applying system cryptographic policy. + Not all operating systems support TLS 1.3 at this time. +
SSLPort port +
Listens on the specified port for encrypted connections. +@@ -632,7 +633,7 @@ Require authentication for accesses from outside the 10. network: + subscriptions.conf(5), + CUPS Online Help (http://localhost:631/help) +

Copyright

+-Copyright © 2020-2023 by OpenPrinting. ++Copyright © 2020-2024 by OpenPrinting. + + + +diff --git a/man/client.conf.5 b/man/client.conf.5 +index 54808c09f..56d6ec3ec 100644 +--- a/man/client.conf.5 ++++ b/man/client.conf.5 +@@ -67,7 +67,7 @@ Specifies the address and optionally the port to use when connecting to the serv + Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier. + .\"#SSLOptions + .TP 5 +-\fBSSLOptions \fR[\fIAllowDH\fR] [\fIAllowRC4\fR] [\fIAllowSSL3\fR] [\fIDenyCBC\fR] [\fIDenyTLS1.0\fR] [\fIMaxTLS1.0\fR] [\fIMaxTLS1.1\fR] [\fIMaxTLS1.2\fR] [\fIMaxTLS1.3\fR] [\fIMinTLS1.0\fR] [\fIMinTLS1.1\fR] [\fIMinTLS1.2\fR] [\fIMinTLS1.3\fR] ++\fBSSLOptions \fR[\fIAllowDH\fR] [\fIAllowRC4\fR] [\fIAllowSSL3\fR] [\fIDenyCBC\fR] [\fIDenyTLS1.0\fR] [\fIMaxTLS1.0\fR] [\fIMaxTLS1.1\fR] [\fIMaxTLS1.2\fR] [\fIMaxTLS1.3\fR] [\fIMinTLS1.0\fR] [\fIMinTLS1.1\fR] [\fIMinTLS1.2\fR] [\fIMinTLS1.3\fR] [\fINoSystem\fR] + .TP 5 + \fBSSLOptions None\fR + Sets encryption options (only in /etc/cups/client.conf). +@@ -81,6 +81,7 @@ The \fIDenyCBC\fR option disables all CBC cipher suites. + The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. + The \fIMinTLS\fR options set the minimum TLS version to support. + The \fIMaxTLS\fR options set the maximum TLS version to support. ++The \fINoSystem\fR option disables applying system cryptographic policy. + Not all operating systems support TLS 1.3 at this time. + .\"#TrustOnFirstUse + .TP 5 +diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5 +index fd5762dfd..4e1a7ca81 100644 +--- a/man/cupsd.conf.5 ++++ b/man/cupsd.conf.5 +@@ -447,7 +447,7 @@ Listens on the specified address and port for encrypted connections. + .\"#SSLOptions + .TP 5 + .TP 5 +-\fBSSLOptions \fR[\fIAllowDH\fR] [\fIAllowRC4\fR] [\fIAllowSSL3\fR] [\fIDenyCBC\fR] [\fIDenyTLS1.0\fR] [\fIMaxTLS1.0\fR] [\fIMaxTLS1.1\fR] [\fIMaxTLS1.2\fR] [\fIMaxTLS1.3\fR] [\fIMinTLS1.0\fR] [\fIMinTLS1.1\fR] [\fIMinTLS1.2\fR] [\fIMinTLS1.3\fR] ++\fBSSLOptions \fR[\fIAllowDH\fR] [\fIAllowRC4\fR] [\fIAllowSSL3\fR] [\fIDenyCBC\fR] [\fIDenyTLS1.0\fR] [\fIMaxTLS1.0\fR] [\fIMaxTLS1.1\fR] [\fIMaxTLS1.2\fR] [\fIMaxTLS1.3\fR] [\fIMinTLS1.0\fR] [\fIMinTLS1.1\fR] [\fIMinTLS1.2\fR] [\fIMinTLS1.3\fR] [\fINoSystem\fR] + .TP 5 + \fBSSLOptions None\fR + Sets encryption options (only in /etc/cups/client.conf). +@@ -461,6 +461,7 @@ The \fIDenyCBC\fR option disables all CBC cipher suites. + The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. + The \fIMinTLS\fR options set the minimum TLS version to support. + The \fIMaxTLS\fR options set the maximum TLS version to support. ++The \fINoSystem\fR option disables applying system cryptographic policy. + Not all operating systems support TLS 1.3 at this time. + .\"#SSLPort + .TP 5 +diff --git a/scheduler/conf.c b/scheduler/conf.c +index 3184d72f0..3bf176479 100644 +--- a/scheduler/conf.c ++++ b/scheduler/conf.c +@@ -3054,6 +3054,8 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ + min_version = _HTTP_TLS_1_3; + else if (!_cups_strcasecmp(start, "None")) + options = _HTTP_TLS_NONE; ++ else if (!_cups_strcasecmp(start, "NoSystem")) ++ options |= _HTTP_TLS_NO_SYSTEM; + else if (_cups_strcasecmp(start, "NoEmptyFragments")) + cupsdLogMessage(CUPSD_LOG_WARN, "Unknown SSL option %s at line %d.", start, linenum); + } +-- +2.47.1 + diff --git a/0001-Fix-Coverity-discovered-issues.patch b/0001-Fix-Coverity-discovered-issues.patch new file mode 100644 index 0000000..bd40965 --- /dev/null +++ b/0001-Fix-Coverity-discovered-issues.patch @@ -0,0 +1,28 @@ +From 08d2576b02fced09b94bcc205cfa7d08300abac3 Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Wed, 13 Sep 2023 13:47:55 -0400 +Subject: [PATCH] Fix Coverity-discovered issues. + +--- + cups/raster-stream.c | 2 +- + scheduler/ipp.c | 13 +++++-------- + scheduler/job.c | 2 -- + tools/ipptool.c | 15 +++++++++------ + 4 files changed, 15 insertions(+), 17 deletions(-) + +diff --git a/scheduler/job.c b/scheduler/job.c +index 278bfb501..6b5ae84ec 100644 +--- a/scheduler/job.c ++++ b/scheduler/job.c +@@ -767,8 +767,6 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ + cupsdLogJob(job, CUPSD_LOG_DEBUG, + "Unable to add decompression filter - %s", strerror(errno)); + +- cupsArrayDelete(filters); +- + abort_message = "Stopping job because the scheduler ran out of memory."; + + goto abort_job; +-- +2.47.0 + diff --git a/0001-Fix-IPP-everywhere-printer-setup-Issue-1033.patch b/0001-Fix-IPP-everywhere-printer-setup-Issue-1033.patch new file mode 100644 index 0000000..7fe1a35 --- /dev/null +++ b/0001-Fix-IPP-everywhere-printer-setup-Issue-1033.patch @@ -0,0 +1,44 @@ +From 313c388dbc023bbcb75d1efed800d0cfc992a6cc Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Wed, 14 Aug 2024 21:18:54 -0400 +Subject: [PATCH] Fix IPP everywhere printer setup (Issue #1033) + +--- + CHANGES.md | 1 + + scheduler/ipp.c | 6 +++--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/scheduler/ipp.c b/scheduler/ipp.c +index 37623c54e..d334f70cf 100644 +--- a/scheduler/ipp.c ++++ b/scheduler/ipp.c +@@ -5346,7 +5346,7 @@ create_local_bg_thread( + + request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); + ippSetVersion(request, 2, 0); +- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printer->device_uri); ++ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, device_uri); + ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs); + + response = cupsDoRequest(http, request, resource); +@@ -5367,7 +5367,7 @@ create_local_bg_thread( + + request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); + ippSetVersion(request, 1, 1); +- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printer->device_uri); ++ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, device_uri); + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", NULL, "all"); + + response = cupsDoRequest(http, request, resource); +@@ -5390,7 +5390,7 @@ create_local_bg_thread( + request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); + ippSetVersion(request, 2, 0); + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, +- "printer-uri", NULL, uri); ++ "printer-uri", NULL, device_uri); + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, + "requested-attributes", NULL, "media-col-database"); + response2 = cupsDoRequest(http, request, resource); +-- +2.46.0 + diff --git a/SOURCES/0001-Fix-make-and-model-whitespace-trimming-Issue-1096.patch b/0001-Fix-make-and-model-whitespace-trimming-Issue-1096.patch similarity index 100% rename from SOURCES/0001-Fix-make-and-model-whitespace-trimming-Issue-1096.patch rename to 0001-Fix-make-and-model-whitespace-trimming-Issue-1096.patch diff --git a/0001-cgi-Fix-checkbox-support-fixes-1008.patch b/0001-cgi-Fix-checkbox-support-fixes-1008.patch new file mode 100644 index 0000000..4614c75 --- /dev/null +++ b/0001-cgi-Fix-checkbox-support-fixes-1008.patch @@ -0,0 +1,759 @@ +From f37d3eb8a091addda1b34d6d264e8a4ac25cec25 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Mon, 22 Jul 2024 12:32:32 +0200 +Subject: [PATCH] cgi: Fix checkbox support (fixes #1008) + +There was a change in CGI script regarding checkboxes, however it did +not propagate into templates. Based on the change, the only valid check +was if the variable value was checkbox, but some browsers (at least +Firefox) send on as a default value for input form of type checkbox. + +Additionally, the value checkbox looks like typo, because we use checked +as value for checkboxes in admin CGI program, so I updated +cgiGetCheckbox() as well. + +To fix the behavior, we have to set VALUE="CHECKED" into every tag in +every templates for all checkboxes - this value will be sent in the +input form, so it will properly match with cgiGetCheckbox() logic now. + +In the end, I have found out "Preserve Job History" checkbox from +template was handled as text field, which did not look correct. + +Fixes #1008 +--- + cgi-bin/admin.c | 12 +++++++----- + cgi-bin/var.c | 2 +- + templates/add-printer.tmpl | 2 +- + templates/admin.tmpl | 30 ++++++++++++++--------------- + templates/da/add-printer.tmpl | 2 +- + templates/da/admin.tmpl | 30 ++++++++++++++--------------- + templates/da/modify-printer.tmpl | 2 +- + templates/de/add-printer.tmpl | 2 +- + templates/de/admin.tmpl | 30 ++++++++++++++--------------- + templates/de/modify-printer.tmpl | 2 +- + templates/es/add-printer.tmpl | 2 +- + templates/es/admin.tmpl | 30 ++++++++++++++--------------- + templates/es/modify-printer.tmpl | 2 +- + templates/fr/add-printer.tmpl | 2 +- + templates/fr/admin.tmpl | 30 ++++++++++++++--------------- + templates/fr/modify-printer.tmpl | 2 +- + templates/ja/add-printer.tmpl | 2 +- + templates/ja/admin.tmpl | 30 ++++++++++++++--------------- + templates/ja/modify-printer.tmpl | 2 +- + templates/modify-printer.tmpl | 2 +- + templates/pl/add-printer.tmpl | 2 +- + templates/pl/admin.tmpl | 30 ++++++++++++++--------------- + templates/pl/modify-printer.tmpl | 2 +- + templates/pt_BR/add-printer.tmpl | 2 +- + templates/pt_BR/admin.tmpl | 30 ++++++++++++++--------------- + templates/pt_BR/modify-printer.tmpl | 2 +- + templates/ru/add-printer.tmpl | 2 +- + templates/ru/admin.tmpl | 30 ++++++++++++++--------------- + templates/ru/modify-printer.tmpl | 2 +- + 29 files changed, 161 insertions(+), 159 deletions(-) + +diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c +index 107700e46..62e1c8fd0 100644 +--- a/cgi-bin/admin.c ++++ b/cgi-bin/admin.c +@@ -1314,9 +1314,9 @@ do_config_server(http_t *http) /* I - HTTP connection */ + browse_web_if = cgiGetCheckbox("BROWSE_WEB_IF") ? "Yes" : "No"; + max_clients = cgiGetTextfield("MAX_CLIENTS"); + max_log_size = cgiGetTextfield("MAX_LOG_SIZE"); +- preserve_jobs = cgiGetTextfield("PRESERVE_JOBS"); ++ preserve_jobs = cgiGetCheckbox("PRESERVE_JOBS") ? "1" : "0"; + +- if (preserve_jobs) ++ if (atoi(preserve_jobs)) + { + max_jobs = cgiGetTextfield("MAX_JOBS"); + preserve_job_history = cgiGetTextfield("PRESERVE_JOB_HISTORY"); +@@ -1325,10 +1325,12 @@ do_config_server(http_t *http) /* I - HTTP connection */ + if (!max_jobs || atoi(max_jobs) < 0) + max_jobs = "500"; + +- if (!preserve_job_history) +- preserve_job_history = "On"; ++ if (!preserve_job_history || !preserve_job_history[0] || ++ (strcasecmp(preserve_job_history, "yes") && strcasecmp(preserve_job_history, "no") && !atoi(preserve_job_history))) ++ preserve_job_history = "Yes"; + +- if (!preserve_job_files) ++ if (!preserve_job_files || !preserve_job_files[0] || ++ (strcasecmp(preserve_job_files, "yes") && strcasecmp(preserve_job_files, "no") && !atoi(preserve_job_files))) + preserve_job_files = "1d"; + } + else +diff --git a/cgi-bin/var.c b/cgi-bin/var.c +index 822f8b93c..e97d2a8fc 100644 +--- a/cgi-bin/var.c ++++ b/cgi-bin/var.c +@@ -191,7 +191,7 @@ cgiGetCheckbox(const char *name) /* I - Name of form field */ + int ret; /* Return value */ + + +- ret = value && !_cups_strcasecmp(value, "checkbox"); ++ ret = value && !_cups_strcasecmp(value, "checked"); + + if (!ret && value) + { +diff --git a/templates/add-printer.tmpl b/templates/add-printer.tmpl +index 339fe662f..7e4f559aa 100644 +--- a/templates/add-printer.tmpl ++++ b/templates/add-printer.tmpl +@@ -32,7 +32,7 @@ + + + Sharing: +- ++ + + + +diff --git a/templates/admin.tmpl b/templates/admin.tmpl +index b8f528737..a954f2b7f 100644 +--- a/templates/admin.tmpl ++++ b/templates/admin.tmpl +@@ -38,23 +38,23 @@ + +

Advanced ▼
+ +- +-
++ ++
+         Max clients\: +
+-         
+-         
+-
+- {have_gssapi?
:} +-
+-
++         
++         
++
++ {have_gssapi?
:} ++
++
+         Maximum jobs (0 for no limit)\: +
+         Retain Metadata\: +
+         Retain Documents\: +
+-
++
+         Max log file size\: +

+ +@@ -62,12 +62,12 @@ + +

Advanced ▶
+ +-
+-         
+-
+- {have_gssapi?
:} +-
+-

++
++         
++
++ {have_gssapi?
:} ++
++

+ + } +

+diff --git a/templates/da/add-printer.tmpl b/templates/da/add-printer.tmpl +index ed206678b..ed34c33f2 100644 +--- a/templates/da/add-printer.tmpl ++++ b/templates/da/add-printer.tmpl +@@ -32,7 +32,7 @@ + + + Deling: +- ++ + + + +diff --git a/templates/da/admin.tmpl b/templates/da/admin.tmpl +index 87f83e0ef..de33275f3 100644 +--- a/templates/da/admin.tmpl ++++ b/templates/da/admin.tmpl +@@ -38,23 +38,23 @@ + +

Avanceret ▼
+ +- +-
++ ++
+         Maks. klienter\: +
+-         
+-         
+-
+- {have_gssapi?
:} +-
+-
++         
++         
++
++ {have_gssapi?
:} ++
++
+         Maksimum jobs (0 for ubegrænset)\: +
+         Bevar metadata\: +
+         Bevar dokumenter\: +
+-
++
+         Maks. størrelse på logfil\: +

+ +@@ -62,12 +62,12 @@ + +

Avanceret ▶
+ +-
+-         
+-
+- {have_gssapi?
:} +-
+-

++
++         
++
++ {have_gssapi?
:} ++
++

+ + } +

+diff --git a/templates/da/modify-printer.tmpl b/templates/da/modify-printer.tmpl +index 9eb32af9d..4e175194a 100644 +--- a/templates/da/modify-printer.tmpl ++++ b/templates/da/modify-printer.tmpl +@@ -26,7 +26,7 @@ + + + Deling: +- ++ + + + +diff --git a/templates/de/add-printer.tmpl b/templates/de/add-printer.tmpl +index b54fb225f..acb44d4f2 100644 +--- a/templates/de/add-printer.tmpl ++++ b/templates/de/add-printer.tmpl +@@ -32,7 +32,7 @@ + + + Freigabe: +- ++ + + + +diff --git a/templates/de/admin.tmpl b/templates/de/admin.tmpl +index bbfa2b097..70fdc92b4 100644 +--- a/templates/de/admin.tmpl ++++ b/templates/de/admin.tmpl +@@ -38,23 +38,23 @@ + +

Erweitert ▼
+ +- +-
++ ++
+         Maximale Anzahl an Clients\: +
+-         
+-         
+-
+- {have_gssapi?
:} +-
+-
++         
++         
++
++ {have_gssapi?
:} ++
++
+         Maximale Auftragsanzahl (0 für unbegrenzt)\: +
+         Metadaten aufbewahren\: +
+         Dokumente aufbewahren\: +
+-
++
+         Maximale Protokoll-Dateigröße\: +

+ +@@ -62,12 +62,12 @@ + +

Erweitert ▶
+ +-
+-         
+-
+- {have_gssapi?
:} +-
+-

++
++         
++
++ {have_gssapi?
:} ++
++

+ + } +

+diff --git a/templates/de/modify-printer.tmpl b/templates/de/modify-printer.tmpl +index 8844bfa79..57c70715c 100644 +--- a/templates/de/modify-printer.tmpl ++++ b/templates/de/modify-printer.tmpl +@@ -26,7 +26,7 @@ + + + Freigabe: +- ++ + + + +diff --git a/templates/es/add-printer.tmpl b/templates/es/add-printer.tmpl +index 05bf42164..d67cda778 100644 +--- a/templates/es/add-printer.tmpl ++++ b/templates/es/add-printer.tmpl +@@ -32,7 +32,7 @@ + + + Compartición: +- ++ + + + +diff --git a/templates/es/admin.tmpl b/templates/es/admin.tmpl +index d75c8adfe..573ca51bd 100644 +--- a/templates/es/admin.tmpl ++++ b/templates/es/admin.tmpl +@@ -38,23 +38,23 @@ + +

Avanzada ▼
+ +- +-
++ ++
+         Número máximo de clientes\: +
+-         
+-         
+-
+- {have_gssapi?
:} +-
+-
++         
++         
++
++ {have_gssapi?
:} ++
++
+         Número máximo de trabajos (0 sin límite)\: +
+         Retener metadatos\: +
+         Retener documentos\: +
+-
++
+         Tamaño máximo del archivo de registro\: +

+ +@@ -62,12 +62,12 @@ + +

Avanzada ▶
+ +-
+-         
+-
+- {have_gssapi?
:} +-
+-

++
++         
++
++ {have_gssapi?
:} ++
++

+ + } +

+diff --git a/templates/es/modify-printer.tmpl b/templates/es/modify-printer.tmpl +index 1da5bb6fa..e29cf62d4 100644 +--- a/templates/es/modify-printer.tmpl ++++ b/templates/es/modify-printer.tmpl +@@ -26,7 +26,7 @@ + + + Compartida: +- ++ + + + +diff --git a/templates/fr/add-printer.tmpl b/templates/fr/add-printer.tmpl +index b3a35f5bd..d18206d6a 100644 +--- a/templates/fr/add-printer.tmpl ++++ b/templates/fr/add-printer.tmpl +@@ -32,7 +32,7 @@ + + + Partage : +- ++ + + + +diff --git a/templates/fr/admin.tmpl b/templates/fr/admin.tmpl +index a2dd61708..be68137cd 100644 +--- a/templates/fr/admin.tmpl ++++ b/templates/fr/admin.tmpl +@@ -38,23 +38,23 @@ + +

Avancé ▼
+ +- +-
++ ++
+         Nombre maximum de clients \: +
+-         
+-         
+-
+- {have_gssapi?
:} +-
+-
++         
++         
++
++ {have_gssapi?
:} ++
++
+         Nombre maximum de tâches (0 pour aucune limite)\: +
+         Conserver les méta-données \: +
+         Conserver les documents \: +
+-
++
+         Taille maximum du journal système \: +

+ +@@ -62,12 +62,12 @@ + +

Avancé ▶
+ +-
+-         
+-
+- {have_gssapi?
:} +-
+-

++
++         
++
++ {have_gssapi?
:} ++
++

+ + } +

+diff --git a/templates/fr/modify-printer.tmpl b/templates/fr/modify-printer.tmpl +index 56376912c..64cb58843 100644 +--- a/templates/fr/modify-printer.tmpl ++++ b/templates/fr/modify-printer.tmpl +@@ -26,7 +26,7 @@ + + + Partage : +- ++ + + + +diff --git a/templates/ja/add-printer.tmpl b/templates/ja/add-printer.tmpl +index 450624a39..f162a29f5 100644 +--- a/templates/ja/add-printer.tmpl ++++ b/templates/ja/add-printer.tmpl +@@ -32,7 +32,7 @@ + + + 共有: +- ++ + + + +diff --git a/templates/ja/admin.tmpl b/templates/ja/admin.tmpl +index 15faa9156..a7055bff0 100644 +--- a/templates/ja/admin.tmpl ++++ b/templates/ja/admin.tmpl +@@ -38,23 +38,23 @@ + +

詳細 ▼
+ +- +-
++ ++
+         最大クライアント数\: +
+-         
+-         
+-
+- {have_gssapi?
:} +-
+-
++         
++         
++
++ {have_gssapi?
:} ++
++
+         最大ジョブ数 (0 は無制限)\: +
+         メタデータを保持\: +
+         ドキュメントを保持\: +
+-
++
+         最大ログファイルサイズ\: +

+ +@@ -62,12 +62,12 @@ + +

詳細 ▶
+ +-
+-         
+-
+- {have_gssapi?
:} +-
+-

++
++         
++
++ {have_gssapi?
:} ++
++

+ + } +

+diff --git a/templates/ja/modify-printer.tmpl b/templates/ja/modify-printer.tmpl +index a3ac71644..0276c90a0 100644 +--- a/templates/ja/modify-printer.tmpl ++++ b/templates/ja/modify-printer.tmpl +@@ -26,7 +26,7 @@ + + + 共有: +- ++ + + + +diff --git a/templates/modify-printer.tmpl b/templates/modify-printer.tmpl +index 1aed9f39c..ef4d094b9 100644 +--- a/templates/modify-printer.tmpl ++++ b/templates/modify-printer.tmpl +@@ -26,7 +26,7 @@ + + + Sharing: +- ++ + + + +diff --git a/templates/pt_BR/add-printer.tmpl b/templates/pt_BR/add-printer.tmpl +index ce82480f6..48ad27841 100644 +--- a/templates/pt_BR/add-printer.tmpl ++++ b/templates/pt_BR/add-printer.tmpl +@@ -32,7 +32,7 @@ + + + Compartilhamento: +- ++ + + + +diff --git a/templates/pt_BR/admin.tmpl b/templates/pt_BR/admin.tmpl +index 7dedf031c..d6cf283fe 100644 +--- a/templates/pt_BR/admin.tmpl ++++ b/templates/pt_BR/admin.tmpl +@@ -38,23 +38,23 @@ + +

Avançado ▼
+ +- +-
++ ++
+         Máximo de clientes\: +
+-         
+-         
+-
+- {have_gssapi?
:} +-
+-
++         
++         
++
++ {have_gssapi?
:} ++
++
+         Máximo de trabalhos (0 para sem limite)\: +
+         Reter metadados\: +
+         Reter documentos\: +
+-
++
+         Tamanho máximo do arquivo de log\: +

+ +@@ -62,12 +62,12 @@ + +

Avançado ▶
+ +-
+-         
+-
+- {have_gssapi?
:} +-
+-

++
++         
++
++ {have_gssapi?
:} ++
++

+ + } +

+diff --git a/templates/pt_BR/modify-printer.tmpl b/templates/pt_BR/modify-printer.tmpl +index f8d28c55e..41a23287a 100644 +--- a/templates/pt_BR/modify-printer.tmpl ++++ b/templates/pt_BR/modify-printer.tmpl +@@ -26,7 +26,7 @@ + + + Compartilhamento: +- ++ + + + +diff --git a/templates/ru/add-printer.tmpl b/templates/ru/add-printer.tmpl +index 9a6d043e1..9b94964d7 100644 +--- a/templates/ru/add-printer.tmpl ++++ b/templates/ru/add-printer.tmpl +@@ -32,7 +32,7 @@ + + + Совместный доступ: +- ++ + + + +diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl +index 0e7fa4dd8..07d136994 100644 +--- a/templates/ru/admin.tmpl ++++ b/templates/ru/admin.tmpl +@@ -37,23 +37,23 @@ + +

Дополнительные параметры▼
+ +- +-
++ ++
+         Максимум клиентов\: +
+-         
+-         
+-
+- {have_gssapi?
:} +-
+-
++         
++         
++
++ {have_gssapi?
:} ++
++
+         Количество заданий (0 без ограничений)\: +
+         Записывать метаданные(Retain Metadata)\: +
+         Существующие документы(Retain Documents)\: +
+-
++
+         Максимальный размер журнала\: +

+ +@@ -61,13 +61,13 @@ + +

Дополнительные параметры ▶
+ +-
+-         

++
++ {have_gssapi?
:} ++
++

+ + } +

+diff --git a/templates/ru/modify-printer.tmpl b/templates/ru/modify-printer.tmpl +index 811c2d8cc..e381ca027 100644 +--- a/templates/ru/modify-printer.tmpl ++++ b/templates/ru/modify-printer.tmpl +@@ -26,7 +26,7 @@ + + + Совместный доступ: +- ++ + + + +-- +2.45.2 + diff --git a/0001-dest.c-Don-t-look-for-user-config-in-cupsGetNamedDes.patch b/0001-dest.c-Don-t-look-for-user-config-in-cupsGetNamedDes.patch new file mode 100644 index 0000000..3efed92 --- /dev/null +++ b/0001-dest.c-Don-t-look-for-user-config-in-cupsGetNamedDes.patch @@ -0,0 +1,57 @@ +From 8dce8d76c1f9ae1769284e3a3b9405f906956a10 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Wed, 9 Oct 2024 10:31:18 +0200 +Subject: [PATCH] dest.c: Don't look for user config in cupsGetNamedDest as + root + +We were still looking into ~/.cups/lpoptions as root in the function, +which IMHO is not expected. + +Merged from master +--- + cups/dest.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/cups/dest.c b/cups/dest.c +index b48d8f219..3eeb50933 100644 +--- a/cups/dest.c ++++ b/cups/dest.c +@@ -1784,7 +1784,11 @@ cupsGetNamedDest(http_t *http, /* I - Connection to server or @code CUPS_HTT + else + instance = NULL; + } ++#if _WIN32 + else if (cg->home) ++#else ++ else if (cg->home && getuid() != 0) ++#endif + { + /* + * No default in the environment, try the user's lpoptions files... +@@ -1899,7 +1903,11 @@ cupsGetNamedDest(http_t *http, /* I - Connection to server or @code CUPS_HTT + snprintf(filename, sizeof(filename), "%s/lpoptions", cg->cups_serverroot); + cups_get_dests(filename, dest_name, instance, 0, 1, 1, &dest); + ++#if _WIN32 + if (cg->home) ++#else ++ if (cg->home && getuid() != 0) ++#endif // _WIN32 + { + #if _WIN32 + snprintf(filename, sizeof(filename), "%s/AppData/Local/cups/lpoptions", cg->home); +@@ -3493,7 +3501,11 @@ cups_enum_dests( + snprintf(filename, sizeof(filename), "%s/lpoptions", cg->cups_serverroot); + data.num_dests = cups_get_dests(filename, NULL, NULL, 1, user_default != NULL, data.num_dests, &data.dests); + ++#if _WIN32 + if (cg->home) ++#else ++ if (cg->home && getuid() != 0) ++#endif // _WIN32 + { + #if _WIN32 + snprintf(filename, sizeof(filename), "%s/AppData/Local/cups/lpoptions", cg->home); +-- +2.47.0 + diff --git a/0001-fix-warnings-for-unused-vars.patch b/0001-fix-warnings-for-unused-vars.patch new file mode 100644 index 0000000..85b5aef --- /dev/null +++ b/0001-fix-warnings-for-unused-vars.patch @@ -0,0 +1,37 @@ +From 2abe1ba8a66864aa82cd9836b37e57103b8e1a3b Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 23 Sep 2024 10:11:31 -0400 +Subject: [PATCH] Fix warnings for unused vars. + +--- + cups/ppd-cache.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index 85ede0f18..a6163a0e1 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -3222,8 +3222,7 @@ _ppdCreateFromIPP2( + int have_qdraft = 0,/* Have draft quality? */ + have_qhigh = 0; /* Have high quality? */ + char msgid[256]; /* Message identifier (attr.value) */ +- const char *keyword, /* Keyword value */ +- *msgstr; /* Localized string */ ++ const char *keyword; /* Keyword value */ + cups_array_t *strings = NULL;/* Printer strings file */ + struct lconv *loc = localeconv(); + /* Locale data */ +@@ -5009,9 +5008,8 @@ _ppdCreateFromIPP2( + { + ipp_t *preset = ippGetCollection(attr, i); + /* Preset collection */ +- const char *preset_name = ippGetString(ippFindAttribute(preset, "preset-name", IPP_TAG_ZERO), 0, NULL), ++ const char *preset_name = ippGetString(ippFindAttribute(preset, "preset-name", IPP_TAG_ZERO), 0, NULL); + /* Preset name */ +- *localized_name; /* Localized preset name */ + ipp_attribute_t *member; /* Member attribute in preset */ + const char *member_name; /* Member attribute name */ + char member_value[256]; /* Member attribute value */ +-- +2.46.1 + diff --git a/0001-mirror-ipp-everywhere-printer-changes-from-master.patch b/0001-mirror-ipp-everywhere-printer-changes-from-master.patch new file mode 100644 index 0000000..dc8c1fc --- /dev/null +++ b/0001-mirror-ipp-everywhere-printer-changes-from-master.patch @@ -0,0 +1,79 @@ +From 9939a70b750edd9d05270060cc5cf62ca98cfbe5 Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 9 Sep 2024 10:03:10 -0400 +Subject: [PATCH] Mirror IPP Everywhere printer changes from master. + +--- + cups/ppd-cache.c | 10 +++++----- + scheduler/ipp.c | 9 ++++++++- + 2 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index 9cdb90a4f..8a99a865c 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -3316,10 +3316,10 @@ _ppdCreateFromIPP2( + } + cupsFilePuts(fp, "\"\n"); + +- if ((attr = ippFindAttribute(supported, "printer-more-info", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-more-info", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*APSupplies: \"%s\"\n", ippGetString(attr, 0, NULL)); + +- if ((attr = ippFindAttribute(supported, "printer-charge-info-uri", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-charge-info-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*cupsChargeInfoURI: \"%s\"\n", ippGetString(attr, 0, NULL)); + + if ((attr = ippFindAttribute(supported, "printer-strings-uri", IPP_TAG_URI)) != NULL) +@@ -3388,10 +3388,10 @@ _ppdCreateFromIPP2( + if (ippGetBoolean(ippFindAttribute(supported, "job-accounting-user-id-supported", IPP_TAG_BOOLEAN), 0)) + cupsFilePuts(fp, "*cupsJobAccountingUserId: True\n"); + +- if ((attr = ippFindAttribute(supported, "printer-privacy-policy-uri", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-privacy-policy-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*cupsPrivacyURI: \"%s\"\n", ippGetString(attr, 0, NULL)); + +- if ((attr = ippFindAttribute(supported, "printer-mandatory-job-attributes", IPP_TAG_KEYWORD)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-mandatory-job-attributes", IPP_TAG_KEYWORD)) != NULL && ippValidateAttribute(attr)) + { + char prefix = '\"'; // Prefix for string + +@@ -3409,7 +3409,7 @@ _ppdCreateFromIPP2( + cupsFilePuts(fp, "\"\n"); + } + +- if ((attr = ippFindAttribute(supported, "printer-requested-job-attributes", IPP_TAG_KEYWORD)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-requested-job-attributes", IPP_TAG_KEYWORD)) != NULL && ippValidateAttribute(attr)) + { + char prefix = '\"'; // Prefix for string + +diff --git a/scheduler/ipp.c b/scheduler/ipp.c +index d334f70cf..2d80a960e 100644 +--- a/scheduler/ipp.c ++++ b/scheduler/ipp.c +@@ -1,7 +1,7 @@ + /* + * IPP routines for the CUPS scheduler. + * +- * Copyright © 2020-2023 by OpenPrinting ++ * Copyright © 2020-2024 by OpenPrinting + * Copyright © 2007-2021 by Apple Inc. + * Copyright © 1997-2007 by Easy Software Products, all rights reserved. + * +@@ -5417,6 +5417,13 @@ create_local_bg_thread( + } + } + ++ // Validate response from printer... ++ if (!ippValidateAttributes(response)) ++ { ++ send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("Printer returned invalid data: %s"), cupsLastErrorString()); ++ goto finish_response; ++ } ++ + // TODO: Grab printer icon file... + httpClose(http); + +-- +2.46.1 + diff --git a/0001-ppdize-preset-and-template-names.patch b/0001-ppdize-preset-and-template-names.patch new file mode 100644 index 0000000..ec88f36 --- /dev/null +++ b/0001-ppdize-preset-and-template-names.patch @@ -0,0 +1,116 @@ +From e0630cd18f76340d302000f2bf6516e99602b844 Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 9 Sep 2024 15:59:57 -0400 +Subject: [PATCH] PPDize preset and template names. + +--- + cups/ppd-cache.c | 33 ++++++++++++++++++++++++--------- + 1 file changed, 24 insertions(+), 9 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index 986c64f73..18c38d0ee 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -4975,12 +4975,14 @@ _ppdCreateFromIPP2( + + cupsArrayAdd(templates, (void *)keyword); + ++ pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); ++ + snprintf(msgid, sizeof(msgid), "finishing-template.%s", keyword); + if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) + if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) + msgstr = keyword; + +- cupsFilePrintf(fp, "*cupsFinishingTemplate %s: \"\n", keyword); ++ cupsFilePrintf(fp, "*cupsFinishingTemplate %s: \"\n", ppdname); + for (finishing_attr = ippFirstAttribute(finishing_col); finishing_attr; finishing_attr = ippNextAttribute(finishing_col)) + { + if (ippGetValueTag(finishing_attr) == IPP_TAG_BEGIN_COLLECTION) +@@ -4993,7 +4995,7 @@ _ppdCreateFromIPP2( + } + } + cupsFilePuts(fp, "\"\n"); +- cupsFilePrintf(fp, "*%s.cupsFinishingTemplate %s/%s: \"\"\n", lang->language, keyword, msgstr); ++ cupsFilePrintf(fp, "*%s.cupsFinishingTemplate %s/%s: \"\"\n", lang->language, ppdname, msgstr); + cupsFilePuts(fp, "*End\n"); + } + +@@ -5039,7 +5041,8 @@ _ppdCreateFromIPP2( + if (!preset || !preset_name) + continue; + +- cupsFilePrintf(fp, "*APPrinterPreset %s: \"\n", preset_name); ++ pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname)); ++ cupsFilePrintf(fp, "*APPrinterPreset %s: \"\n", ppdname); + for (member = ippFirstAttribute(preset); member; member = ippNextAttribute(preset)) + { + member_name = ippGetName(member); +@@ -5080,7 +5083,10 @@ _ppdCreateFromIPP2( + fin_col = ippGetCollection(member, i); + + if ((keyword = ippGetString(ippFindAttribute(fin_col, "finishing-template", IPP_TAG_ZERO), 0, NULL)) != NULL) +- cupsFilePrintf(fp, "*cupsFinishingTemplate %s\n", keyword); ++ { ++ pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); ++ cupsFilePrintf(fp, "*cupsFinishingTemplate %s\n", ppdname); ++ } + } + } + else if (!strcmp(member_name, "media")) +@@ -5107,13 +5113,13 @@ _ppdCreateFromIPP2( + if ((keyword = ippGetString(ippFindAttribute(media_col, "media-source", IPP_TAG_ZERO), 0, NULL)) != NULL) + { + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); +- cupsFilePrintf(fp, "*InputSlot %s\n", keyword); ++ cupsFilePrintf(fp, "*InputSlot %s\n", ppdname); + } + + if ((keyword = ippGetString(ippFindAttribute(media_col, "media-type", IPP_TAG_ZERO), 0, NULL)) != NULL) + { + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); +- cupsFilePrintf(fp, "*MediaType %s\n", keyword); ++ cupsFilePrintf(fp, "*MediaType %s\n", ppdname); + } + } + else if (!strcmp(member_name, "print-quality")) +@@ -5159,7 +5165,10 @@ _ppdCreateFromIPP2( + cupsFilePuts(fp, "\"\n*End\n"); + + if ((localized_name = _cupsMessageLookup(strings, preset_name)) != preset_name) +- cupsFilePrintf(fp, "*%s.APPrinterPreset %s/%s: \"\"\n", lang->language, preset_name, localized_name); ++ { ++ pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname)); ++ cupsFilePrintf(fp, "*%s.APPrinterPreset %s/%s: \"\"\n", lang->language, ppdname, localized_name); ++ } + } + } + +@@ -5543,7 +5552,7 @@ pwg_ppdize_name(const char *ipp, /* I - IPP keyword */ + *end; /* End of name buffer */ + + +- if (!ipp) ++ if (!ipp || !_cups_isalnum(*ipp)) + { + *name = '\0'; + return; +@@ -5558,8 +5567,14 @@ pwg_ppdize_name(const char *ipp, /* I - IPP keyword */ + ipp ++; + *ptr++ = (char)toupper(*ipp++ & 255); + } +- else ++ else if (*ipp == '_' || *ipp == '.' || *ipp == '-' || _cups_isalnum(*ipp)) ++ { + *ptr++ = *ipp++; ++ } ++ else ++ { ++ ipp ++; ++ } + } + + *ptr = '\0'; +-- +2.46.1 + diff --git a/0001-quote-ppd-localized-strings.patch b/0001-quote-ppd-localized-strings.patch new file mode 100644 index 0000000..cca336d --- /dev/null +++ b/0001-quote-ppd-localized-strings.patch @@ -0,0 +1,246 @@ +From 1e6ca5913eceee906038bc04cc7ccfbe2923bdfd Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 23 Sep 2024 09:36:39 -0400 +Subject: [PATCH] Quote PPD localized strings. + +--- + cups/ppd-cache.c | 93 +++++++++++++++++++++++++++--------------------- + 1 file changed, 53 insertions(+), 40 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index 18c38d0ee..85ede0f18 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -32,6 +32,7 @@ + static int cups_connect(http_t **http, const char *url, char *resource, size_t ressize); + static int cups_get_url(http_t **http, const char *url, char *name, size_t namesize); + static const char *ppd_inputslot_for_keyword(_ppd_cache_t *pc, const char *keyword); ++static void ppd_put_string(cups_file_t *fp, cups_lang_t *lang, cups_array_t *strings, const char *ppd_option, const char *ppd_choice, const char *pwg_msgid); + static void pwg_add_finishing(cups_array_t *finishings, ipp_finishings_t template, const char *name, const char *value); + static void pwg_add_message(cups_array_t *a, const char *msg, const char *str); + static int pwg_compare_finishings(_pwg_finishings_t *a, _pwg_finishings_t *b); +@@ -3393,7 +3394,7 @@ _ppdCreateFromIPP2( + if ((attr = ippFindAttribute(supported, "printer-charge-info-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*cupsChargeInfoURI: \"%s\"\n", ippGetString(attr, 0, NULL)); + +- if ((attr = ippFindAttribute(supported, "printer-strings-uri", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(supported, "printer-strings-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + { + http_t *http = NULL; /* Connection to printer */ + char stringsfile[1024]; /* Temporary strings file */ +@@ -3437,7 +3438,7 @@ _ppdCreateFromIPP2( + + response = cupsDoRequest(http, request, resource); + +- if ((attr = ippFindAttribute(response, "printer-strings-uri", IPP_TAG_URI)) != NULL) ++ if ((attr = ippFindAttribute(response, "printer-strings-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr)) + cupsFilePrintf(fp, "*cupsStringsURI %s: \"%s\"\n", keyword, ippGetString(attr, 0, NULL)); + + ippDelete(response); +@@ -4043,18 +4044,16 @@ _ppdCreateFromIPP2( + cupsFilePrintf(fp, "*DefaultInputSlot: %s\n", ppdname); + + for (j = 0; j < (int)(sizeof(sources) / sizeof(sources[0])); j ++) ++ { + if (!strcmp(sources[j], keyword)) + { + snprintf(msgid, sizeof(msgid), "media-source.%s", keyword); + +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; +- + cupsFilePrintf(fp, "*InputSlot %s: \"<>setpagedevice\"\n", ppdname, j); +- cupsFilePrintf(fp, "*%s.InputSlot %s/%s: \"\"\n", lang->language, ppdname, msgstr); ++ ppd_put_string(fp, lang, strings, "InputSlot", ppdname, msgid); + break; + } ++ } + } + cupsFilePuts(fp, "*CloseUI: *InputSlot\n"); + } +@@ -4080,12 +4079,9 @@ _ppdCreateFromIPP2( + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); + + snprintf(msgid, sizeof(msgid), "media-type.%s", keyword); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + cupsFilePrintf(fp, "*MediaType %s: \"<>setpagedevice\"\n", ppdname, ppdname); +- cupsFilePrintf(fp, "*%s.MediaType %s/%s: \"\"\n", lang->language, ppdname, msgstr); ++ ppd_put_string(fp, lang, strings, "MediaType", ppdname, msgid); + } + cupsFilePuts(fp, "*CloseUI: *MediaType\n"); + } +@@ -4546,12 +4542,9 @@ _ppdCreateFromIPP2( + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); + + snprintf(msgid, sizeof(msgid), "output-bin.%s", keyword); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + cupsFilePrintf(fp, "*OutputBin %s: \"\"\n", ppdname); +- cupsFilePrintf(fp, "*%s.OutputBin %s/%s: \"\"\n", lang->language, ppdname, msgstr); ++ ppd_put_string(fp, lang, strings, "OutputBin", ppdname, msgid); + + if ((tray_ptr = ippGetOctetString(trays, i, &tray_len)) != NULL) + { +@@ -4670,9 +4663,6 @@ _ppdCreateFromIPP2( + cupsArrayAdd(names, (char *)keyword); + + snprintf(msgid, sizeof(msgid), "finishings.%d", value); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + if (value >= IPP_FINISHINGS_NONE && value <= IPP_FINISHINGS_LAMINATE) + ppd_keyword = base_keywords[value - IPP_FINISHINGS_NONE]; +@@ -4687,7 +4677,7 @@ _ppdCreateFromIPP2( + continue; + + cupsFilePrintf(fp, "*StapleLocation %s: \"\"\n", ppd_keyword); +- cupsFilePrintf(fp, "*%s.StapleLocation %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr); ++ ppd_put_string(fp, lang, strings, "StapleLocation", ppd_keyword, msgid); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*StapleLocation %s\"\n", value, keyword, ppd_keyword); + } + +@@ -4750,9 +4740,6 @@ _ppdCreateFromIPP2( + cupsArrayAdd(names, (char *)keyword); + + snprintf(msgid, sizeof(msgid), "finishings.%d", value); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + if (value >= IPP_FINISHINGS_NONE && value <= IPP_FINISHINGS_LAMINATE) + ppd_keyword = base_keywords[value - IPP_FINISHINGS_NONE]; +@@ -4767,7 +4754,7 @@ _ppdCreateFromIPP2( + continue; + + cupsFilePrintf(fp, "*FoldType %s: \"\"\n", ppd_keyword); +- cupsFilePrintf(fp, "*%s.FoldType %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr); ++ ppd_put_string(fp, lang, strings, "FoldType", ppd_keyword, msgid); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*FoldType %s\"\n", value, keyword, ppd_keyword); + } + +@@ -4838,9 +4825,6 @@ _ppdCreateFromIPP2( + cupsArrayAdd(names, (char *)keyword); + + snprintf(msgid, sizeof(msgid), "finishings.%d", value); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + if (value >= IPP_FINISHINGS_NONE && value <= IPP_FINISHINGS_LAMINATE) + ppd_keyword = base_keywords[value - IPP_FINISHINGS_NONE]; +@@ -4855,7 +4839,7 @@ _ppdCreateFromIPP2( + continue; + + cupsFilePrintf(fp, "*PunchMedia %s: \"\"\n", ppd_keyword); +- cupsFilePrintf(fp, "*%s.PunchMedia %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr); ++ ppd_put_string(fp, lang, strings, "PunchMedia", ppd_keyword, msgid); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*PunchMedia %s\"\n", value, keyword, ppd_keyword); + } + +@@ -4926,9 +4910,6 @@ _ppdCreateFromIPP2( + cupsArrayAdd(names, (char *)keyword); + + snprintf(msgid, sizeof(msgid), "finishings.%d", value); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + if (value == IPP_FINISHINGS_TRIM) + ppd_keyword = "Auto"; +@@ -4936,7 +4917,7 @@ _ppdCreateFromIPP2( + ppd_keyword = trim_keywords[value - IPP_FINISHINGS_TRIM_AFTER_PAGES]; + + cupsFilePrintf(fp, "*CutMedia %s: \"\"\n", ppd_keyword); +- cupsFilePrintf(fp, "*%s.CutMedia %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr); ++ ppd_put_string(fp, lang, strings, "CutMedia", ppd_keyword, msgid); + cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*CutMedia %s\"\n", value, keyword, ppd_keyword); + } + +@@ -4978,9 +4959,6 @@ _ppdCreateFromIPP2( + pwg_ppdize_name(keyword, ppdname, sizeof(ppdname)); + + snprintf(msgid, sizeof(msgid), "finishing-template.%s", keyword); +- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr)) +- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid) +- msgstr = keyword; + + cupsFilePrintf(fp, "*cupsFinishingTemplate %s: \"\n", ppdname); + for (finishing_attr = ippFirstAttribute(finishing_col); finishing_attr; finishing_attr = ippNextAttribute(finishing_col)) +@@ -4995,7 +4973,7 @@ _ppdCreateFromIPP2( + } + } + cupsFilePuts(fp, "\"\n"); +- cupsFilePrintf(fp, "*%s.cupsFinishingTemplate %s/%s: \"\"\n", lang->language, ppdname, msgstr); ++ ppd_put_string(fp, lang, strings, "cupsFinishingTemplate", ppdname, msgid); + cupsFilePuts(fp, "*End\n"); + } + +@@ -5164,11 +5142,9 @@ _ppdCreateFromIPP2( + + cupsFilePuts(fp, "\"\n*End\n"); + +- if ((localized_name = _cupsMessageLookup(strings, preset_name)) != preset_name) +- { +- pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname)); +- cupsFilePrintf(fp, "*%s.APPrinterPreset %s/%s: \"\"\n", lang->language, ppdname, localized_name); +- } ++ snprintf(msgid, sizeof(msgid), "preset-name.%s", preset_name); ++ pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname)); ++ ppd_put_string(fp, lang, strings, "APPrinterPreset", ppdname, msgid); + } + } + +@@ -5439,6 +5415,43 @@ cups_get_url(http_t **http, /* IO - Current HTTP connection */ + } + + ++/* ++ * 'ppd_put_strings()' - Write localization attributes to a PPD file. ++ */ ++ ++static void ++ppd_put_string(cups_file_t *fp, /* I - PPD file */ ++ cups_lang_t *lang, /* I - Language */ ++ cups_array_t *strings, /* I - Strings */ ++ const char *ppd_option,/* I - PPD option */ ++ const char *ppd_choice,/* I - PPD choice */ ++ const char *pwg_msgid) /* I - PWG message ID */ ++{ ++ const char *text; /* Localized text */ ++ ++ ++ if ((text = _cupsLangString(lang, pwg_msgid)) == pwg_msgid || !strcmp(pwg_msgid, text)) ++ { ++ if ((text = _cupsMessageLookup(strings, pwg_msgid)) == pwg_msgid) ++ return; ++ } ++ ++ // Add the first line of localized text... ++ cupsFilePrintf(fp, "*%s.%s %s/", lang->language, ppd_option, ppd_choice); ++ while (*text && *text != '\n') ++ { ++ // Escape ":" and "<"... ++ if (*text == ':' || *text == '<') ++ cupsFilePrintf(fp, "<%02X>", *text); ++ else ++ cupsFilePutChar(fp, *text); ++ ++ text ++; ++ } ++ cupsFilePuts(fp, ": \"\"\n"); ++} ++ ++ + /* + * 'pwg_add_finishing()' - Add a finishings value. + */ +-- +2.46.1 + diff --git a/SOURCES/0001-refactor-make-and-model-code.patch b/0001-refactor-make-and-model-code.patch similarity index 76% rename from SOURCES/0001-refactor-make-and-model-code.patch rename to 0001-refactor-make-and-model-code.patch index d1667b3..36b45a6 100644 --- a/SOURCES/0001-refactor-make-and-model-code.patch +++ b/0001-refactor-make-and-model-code.patch @@ -1,9 +1,19 @@ -diff -up cups-2.2.6/cups/ppd-cache.c.make-model-refact cups-2.2.6/cups/ppd-cache.c ---- cups-2.2.6/cups/ppd-cache.c.make-model-refact 2024-10-25 09:50:04.894056025 +0200 -+++ cups-2.2.6/cups/ppd-cache.c 2024-10-25 09:51:15.832552712 +0200 -@@ -2937,9 +2937,10 @@ _ppdCreateFromIPP(char *buffer, /* I - - *x_dim, *y_dim; /* Media dimensions */ - ipp_t *media_size; /* Media size collection */ +From 04bb2af4521b56c1699a2c2431c56c05a7102e69 Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 9 Sep 2024 14:05:42 -0400 +Subject: [PATCH] Refactor make-and-model code. + +--- + cups/ppd-cache.c | 103 +++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 87 insertions(+), 16 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index 8a99a865c..986c64f73 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -3196,9 +3196,10 @@ _ppdCreateFromIPP2( + ipp_t *media_col, /* Media collection */ + *media_size; /* Media size collection */ char make[256], /* Make and model */ - *model, /* Model name */ + *mptr, /* Pointer into make and model */ @@ -13,7 +23,7 @@ diff -up cups-2.2.6/cups/ppd-cache.c.make-model-refact cups-2.2.6/cups/ppd-cache int i, j, /* Looping vars */ count, /* Number of values */ bottom, /* Largest bottom margin */ -@@ -3057,35 +3058,105 @@ _ppdCreateFromIPP(char *buffer, /* I - +@@ -3259,34 +3260,104 @@ _ppdCreateFromIPP2( } /* @@ -30,13 +40,13 @@ diff -up cups-2.2.6/cups/ppd-cache.c.make-model-refact cups-2.2.6/cups/ppd-cache - cupsFilePuts(fp, "*LanguageLevel: \"3\"\n"); - cupsFilePuts(fp, "*FileSystem: False\n"); - cupsFilePuts(fp, "*PCFileName: \"ippeve.ppd\"\n"); -+ if ((attr = ippFindAttribute(response, "printer-make-and-model", IPP_TAG_TEXT)) != NULL && ippValidateAttribute(attr)) ++ if ((attr = ippFindAttribute(supported, "printer-make-and-model", IPP_TAG_TEXT)) != NULL && ippValidateAttribute(attr)) + { + /* + * Sanitize the model name to only contain PPD-safe characters. + */ -- if ((attr = ippFindAttribute(response, "printer-make-and-model", IPP_TAG_TEXT)) != NULL) +- if ((attr = ippFindAttribute(supported, "printer-make-and-model", IPP_TAG_TEXT)) != NULL) strlcpy(make, ippGetString(attr, 0, NULL), sizeof(make)); + + for (mptr = make; *mptr; mptr ++) @@ -82,8 +92,7 @@ diff -up cups-2.2.6/cups/ppd-cache.c.make-model-refact cups-2.2.6/cups/ppd-cache + strlcpy(make, "Unknown", sizeof(make)); + } - if (!_cups_strncasecmp(make, "Hewlett Packard ", 16) || - !_cups_strncasecmp(make, "Hewlett-Packard ", 16)) + if (!_cups_strncasecmp(make, "Hewlett Packard ", 16) || !_cups_strncasecmp(make, "Hewlett-Packard ", 16)) { + /* + * Normalize HP printer make and model... @@ -114,14 +123,14 @@ diff -up cups-2.2.6/cups/ppd-cache.c.make-model-refact cups-2.2.6/cups/ppd-cache + /* + * No separate model name... + */ -+ + + model = "Printer"; + } + + /* + * Standard stuff for PPD file... + */ - ++ + cupsFilePuts(fp, "*PPD-Adobe: \"4.3\"\n"); + cupsFilePuts(fp, "*FormatVersion: \"4.3\"\n"); + cupsFilePrintf(fp, "*FileVersion: \"%d.%d\"\n", CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR); @@ -134,3 +143,6 @@ diff -up cups-2.2.6/cups/ppd-cache.c.make-model-refact cups-2.2.6/cups/ppd-cache cupsFilePrintf(fp, "*Manufacturer: \"%s\"\n", make); cupsFilePrintf(fp, "*ModelName: \"%s\"\n", model); cupsFilePrintf(fp, "*Product: \"(%s)\"\n", model); +-- +2.46.1 + diff --git a/0001-scheduler-Clean-up-failed-IPP-Everywhere-permanent-q.patch b/0001-scheduler-Clean-up-failed-IPP-Everywhere-permanent-q.patch new file mode 100644 index 0000000..8bf2f06 --- /dev/null +++ b/0001-scheduler-Clean-up-failed-IPP-Everywhere-permanent-q.patch @@ -0,0 +1,81 @@ +From 2e3f15832140454e2d21b327bfa4b05612b50b9a Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Mon, 2 Dec 2024 14:20:26 +0100 +Subject: [PATCH] scheduler: Clean up failed IPP Everywhere permanent queues + +If creating of permanent queue with IPP Everywhere model fails +in separate thread, the print queue is created as raw. +It would be great if we remove such queue if creation fails, +and marking them as temporary would make them to be removed automatically. +--- + scheduler/ipp.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/scheduler/ipp.c b/scheduler/ipp.c +index 2d80a960e..089267c86 100644 +--- a/scheduler/ipp.c ++++ b/scheduler/ipp.c +@@ -5294,6 +5294,7 @@ create_local_bg_thread( + /* Force printer to timeout and be deleted */ + _cupsRWLockWrite(&printer->lock); + printer->state_time = 0; ++ printer->temporary = 1; + _cupsRWUnlock(&printer->lock); + + send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("Couldn't resolve mDNS URI \"%s\"."), printer->device_uri); +@@ -5314,6 +5315,7 @@ create_local_bg_thread( + /* Force printer to timeout and be deleted */ + _cupsRWLockWrite(&printer->lock); + printer->state_time = 0; ++ printer->temporary = 1; + _cupsRWUnlock(&printer->lock); + + send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("Bad device URI \"%s\"."), device_uri); +@@ -5332,6 +5334,7 @@ create_local_bg_thread( + /* Force printer to timeout and be deleted */ + _cupsRWLockWrite(&printer->lock); + printer->state_time = 0; ++ printer->temporary = 1; + _cupsRWUnlock(&printer->lock); + + send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("Unable to connect to %s:%d: %s"), host, port, cupsLastErrorString()); +@@ -5420,6 +5423,12 @@ create_local_bg_thread( + // Validate response from printer... + if (!ippValidateAttributes(response)) + { ++ /* Force printer to timeout and be deleted */ ++ _cupsRWLockWrite(&printer->lock); ++ printer->state_time = 0; ++ printer->temporary = 1; ++ _cupsRWUnlock(&printer->lock); ++ + send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("Printer returned invalid data: %s"), cupsLastErrorString()); + goto finish_response; + } +@@ -5453,6 +5462,7 @@ create_local_bg_thread( + /* Force printer to timeout and be deleted */ + _cupsRWLockWrite(&printer->lock); + printer->state_time = 0; ++ printer->temporary = 1; + _cupsRWUnlock(&printer->lock); + + send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("Unable to read generated PPD: %s"), strerror(errno)); +@@ -5468,6 +5478,7 @@ create_local_bg_thread( + /* Force printer to timeout and be deleted */ + _cupsRWLockWrite(&printer->lock); + printer->state_time = 0; ++ printer->temporary = 1; + _cupsRWUnlock(&printer->lock); + + send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("Unable to create PPD for printer: %s"), strerror(errno)); +@@ -5501,6 +5512,7 @@ create_local_bg_thread( + /* Force printer to timeout and be deleted */ + _cupsRWLockWrite(&printer->lock); + printer->state_time = 0; ++ printer->temporary = 1; + _cupsRWUnlock(&printer->lock); + + send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("Unable to create PPD: %s"), cupsLastErrorString()); +-- +2.47.1 + diff --git a/0001-tls-gnutls.c-Use-system-crypto-policy-if-available.patch b/0001-tls-gnutls.c-Use-system-crypto-policy-if-available.patch new file mode 100644 index 0000000..2cfdb23 --- /dev/null +++ b/0001-tls-gnutls.c-Use-system-crypto-policy-if-available.patch @@ -0,0 +1,31 @@ +From 331a202a87db30b5d1d5386ccc99de6843eef03e Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Fri, 6 Dec 2024 07:59:16 +0100 +Subject: [PATCH] tls-gnutls.c: Use system crypto policy if available + +Some Linux systems provide a way how to control cryptography on system or service level via cryptographic policies. OpenSSL implementation reflects system changes to some degree, however GnuTLS implementation does not take system policy into account. + +GnuTLS supports fallback mechanism, so we can fallback to NORMAL if @System is not defined on the system. + +Fortunately, the current GnuTLS implementation allows overrides via priority strings (so no "this cipher/hash is disabled" if we enabled them in our application by priority string), so allowing to honor system policy can save us work if someone wants to disable a specific cipher, so we don't have to implement it in libcups. +--- + CHANGES.md | 2 ++ + cups/tls-gnutls.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c +index f3f71a055..719161da7 100644 +--- a/cups/tls-gnutls.c ++++ b/cups/tls-gnutls.c +@@ -1504,7 +1504,7 @@ _httpTLSStart(http_t *http) /* I - Connection to server */ + return (-1); + } + +- strlcpy(priority_string, "NORMAL", sizeof(priority_string)); ++ strlcpy(priority_string, "@SYSTEM,NORMAL", sizeof(priority_string)); + + if (tls_max_version < _HTTP_TLS_MAX) + { +-- +2.47.1 + diff --git a/SOURCES/0001-Add-support-for-MinTLS-and-MaxTLS-options-Issue-5119.patch b/SOURCES/0001-Add-support-for-MinTLS-and-MaxTLS-options-Issue-5119.patch deleted file mode 100644 index 810b9ca..0000000 --- a/SOURCES/0001-Add-support-for-MinTLS-and-MaxTLS-options-Issue-5119.patch +++ /dev/null @@ -1,497 +0,0 @@ -diff -up cups-2.2.6/cups/http-private.h.remove-weak-ciphers cups-2.2.6/cups/http-private.h ---- cups-2.2.6/cups/http-private.h.remove-weak-ciphers 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/cups/http-private.h 2018-08-07 11:53:54.985633959 +0200 -@@ -180,13 +180,17 @@ extern "C" { - - # define _HTTP_TLS_NONE 0 /* No TLS options */ - # define _HTTP_TLS_ALLOW_RC4 1 /* Allow RC4 cipher suites */ --# define _HTTP_TLS_ALLOW_SSL3 2 /* Allow SSL 3.0 */ --# define _HTTP_TLS_ALLOW_DH 4 /* Allow DH/DHE key negotiation */ --# define _HTTP_TLS_DENY_TLS10 16 /* Deny TLS 1.0 */ --# define _HTTP_TLS_DENY_CBC 32 /* Deny CBC cipher suites */ --# define _HTTP_TLS_ONLY_TLS10 64 /* Only use TLS 1.0 */ -+# define _HTTP_TLS_ALLOW_DH 2 /* Allow DH/DHE key negotiation */ -+# define _HTTP_TLS_DENY_CBC 4 /* Deny CBC cipher suites */ - # define _HTTP_TLS_SET_DEFAULT 128 /* Setting the default TLS options */ - -+# define _HTTP_TLS_SSL3 0 /* Min/max version is SSL/3.0 */ -+# define _HTTP_TLS_1_0 1 /* Min/max version is TLS/1.0 */ -+# define _HTTP_TLS_1_1 2 /* Min/max version is TLS/1.1 */ -+# define _HTTP_TLS_1_2 3 /* Min/max version is TLS/1.2 */ -+# define _HTTP_TLS_1_3 4 /* Min/max version is TLS/1.3 */ -+# define _HTTP_TLS_MAX 5 /* Highest known TLS version */ -+ - - /* - * Types and functions for SSL support... -@@ -442,7 +446,7 @@ extern void _httpTLSInitialize(void); - extern size_t _httpTLSPending(http_t *http); - extern int _httpTLSRead(http_t *http, char *buf, int len); - extern int _httpTLSSetCredentials(http_t *http); --extern void _httpTLSSetOptions(int options); -+extern void _httpTLSSetOptions(int options, int min_version, int max_version); - extern int _httpTLSStart(http_t *http); - extern void _httpTLSStop(http_t *http); - extern int _httpTLSWrite(http_t *http, const char *buf, int len); -diff -up cups-2.2.6/cups/tlscheck.c.remove-weak-ciphers cups-2.2.6/cups/tlscheck.c ---- cups-2.2.6/cups/tlscheck.c.remove-weak-ciphers 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/cups/tlscheck.c 2018-08-07 11:53:54.987633942 +0200 -@@ -54,6 +54,8 @@ main(int argc, /* I - Number of comm - int af = AF_UNSPEC, /* Address family */ - tls_options = _HTTP_TLS_NONE, - /* TLS options */ -+ tls_min_version = _HTTP_TLS_1_0, -+ tls_max_version = _HTTP_TLS_MAX, - verbose = 0; /* Verbosity */ - ipp_t *request, /* IPP Get-Printer-Attributes request */ - *response; /* IPP Get-Printer-Attributes response */ -@@ -88,11 +90,12 @@ main(int argc, /* I - Number of comm - } - else if (!strcmp(argv[i], "--no-tls10")) - { -- tls_options |= _HTTP_TLS_DENY_TLS10; -+ tls_min_version = _HTTP_TLS_1_1; - } - else if (!strcmp(argv[i], "--tls10")) - { -- tls_options |= _HTTP_TLS_ONLY_TLS10; -+ tls_min_version = _HTTP_TLS_1_0; -+ tls_max_version = _HTTP_TLS_1_0; - } - else if (!strcmp(argv[i], "--rc4")) - { -@@ -148,7 +151,7 @@ main(int argc, /* I - Number of comm - if (!port) - port = 631; - -- _httpTLSSetOptions(tls_options); -+ _httpTLSSetOptions(tls_options, tls_min_version, tls_max_version); - - http = httpConnect2(server, port, NULL, af, HTTP_ENCRYPTION_ALWAYS, 1, 30000, NULL); - if (!http) -diff -up cups-2.2.6/cups/tls-darwin.c.remove-weak-ciphers cups-2.2.6/cups/tls-darwin.c ---- cups-2.2.6/cups/tls-darwin.c.remove-weak-ciphers 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/cups/tls-darwin.c 2018-08-07 11:53:54.986633951 +0200 -@@ -53,7 +53,9 @@ static char *tls_keypath = NULL; - /* Server cert keychain path */ - static _cups_mutex_t tls_mutex = _CUPS_MUTEX_INITIALIZER; - /* Mutex for keychain/certs */ --static int tls_options = -1;/* Options for TLS connections */ -+static int tls_options = -1,/* Options for TLS connections */ -+ tls_min_version = _HTTP_TLS_1_0, -+ tls_max_version = _HTTP_TLS_MAX; - - - /* -@@ -1139,10 +1141,16 @@ _httpTLSRead(http_t *http, /* I - HTTP - */ - - void --_httpTLSSetOptions(int options) /* I - Options */ -+_httpTLSSetOptions(int options, /* I - Options */ -+ int min_version, /* I - Minimum TLS version */ -+ int max_version) /* I - Maximum TLS version */ - { - if (!(options & _HTTP_TLS_SET_DEFAULT) || tls_options < 0) -- tls_options = options; -+ { -+ tls_options = options; -+ tls_min_version = min_version; -+ tls_max_version = max_version; -+ } - } - - -@@ -1174,7 +1182,7 @@ _httpTLSStart(http_t *http) /* I - HTTP - { - DEBUG_puts("4_httpTLSStart: Setting defaults."); - _cupsSetDefaults(); -- DEBUG_printf(("4_httpTLSStart: tls_options=%x", tls_options)); -+ DEBUG_printf(("4_httpTLSStart: tls_options=%x, tls_min_version=%d, tls_max_version=%d", tls_options, tls_min_version, tls_max_version)); - } - - #ifdef HAVE_SECKEYCHAINOPEN -@@ -1217,22 +1225,23 @@ _httpTLSStart(http_t *http) /* I - HTTP - - if (!error) - { -- SSLProtocol minProtocol; -- -- if (tls_options & _HTTP_TLS_DENY_TLS10) -- minProtocol = kTLSProtocol11; -- else if (tls_options & _HTTP_TLS_ALLOW_SSL3) -- minProtocol = kSSLProtocol3; -- else -- minProtocol = kTLSProtocol1; -+ static const SSLProtocol protocols[] = /* Min/max protocol versions */ -+ { -+ kSSLProtocol3, -+ kTLSProtocol1, -+ kTLSProtocol11, -+ kTLSProtocol12, -+ kTLSProtocol13, -+ kTLSProtocolMaxSupported -+ }; - -- error = SSLSetProtocolVersionMin(http->tls, minProtocol); -- DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMin(%d), error=%d", minProtocol, (int)error)); -+ error = SSLSetProtocolVersionMin(http->tls, protocols[tls_min_version]); -+ DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMin(%d), error=%d", protocols[tls_min_version], (int)error)); - -- if (!error && (tls_options & _HTTP_TLS_ONLY_TLS10)) -+ if (!error) - { -- error = SSLSetProtocolVersionMax(http->tls, kTLSProtocol1); -- DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMax(kTLSProtocol1), error=%d", (int)error)); -+ error = SSLSetProtocolVersionMax(http->tls, protocols[tls_max_version]); -+ DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMax(%d), error=%d", protocols[tls_max_version], (int)error)); - } - } - -diff -up cups-2.2.6/cups/tls-gnutls.c.remove-weak-ciphers cups-2.2.6/cups/tls-gnutls.c ---- cups-2.2.6/cups/tls-gnutls.c.remove-weak-ciphers 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/cups/tls-gnutls.c 2018-08-07 11:58:45.164114342 +0200 -@@ -35,7 +35,9 @@ static char *tls_keypath = NULL; - /* Server cert keychain path */ - static _cups_mutex_t tls_mutex = _CUPS_MUTEX_INITIALIZER; - /* Mutex for keychain/certs */ --static int tls_options = -1;/* Options for TLS connections */ -+static int tls_options = -1,/* Options for TLS connections */ -+ tls_min_version = _HTTP_TLS_1_0, -+ tls_max_version = _HTTP_TLS_MAX; - - - /* -@@ -1224,10 +1226,16 @@ _httpTLSSetCredentials(http_t *http) /* - */ - - void --_httpTLSSetOptions(int options) /* I - Options */ -+_httpTLSSetOptions(int options, /* I - Options */ -+ int min_version, /* I - Minimum TLS version */ -+ int max_version) /* I - Maximum TLS version */ - { - if (!(options & _HTTP_TLS_SET_DEFAULT) || tls_options < 0) -- tls_options = options; -+ { -+ tls_options = options; -+ tls_min_version = min_version; -+ tls_max_version = max_version; -+ } - } - - -@@ -1245,6 +1253,16 @@ _httpTLSStart(http_t *http) /* I - Conn - /* TLS credentials */ - char priority_string[2048]; - /* Priority string */ -+ int version; /* Current version */ -+ static const char * const versions[] =/* SSL/TLS versions */ -+ { -+ "VERS-SSL3.0", -+ "VERS-TLS1.0", -+ "VERS-TLS1.1", -+ "VERS-TLS1.2", -+ "VERS-TLS1.3", -+ "VERS-TLS-ALL" -+ }; - - - DEBUG_printf(("3_httpTLSStart(http=%p)", http)); -@@ -1506,14 +1524,40 @@ _httpTLSStart(http_t *http) /* I - Conn - - strlcpy(priority_string, "NORMAL", sizeof(priority_string)); - -- if (tls_options & _HTTP_TLS_DENY_TLS10) -- strlcat(priority_string, ":+VERS-TLS-ALL:-VERS-TLS1.0:-VERS-SSL3.0", sizeof(priority_string)); -- else if (tls_options & _HTTP_TLS_ALLOW_SSL3) -+ if (tls_max_version < _HTTP_TLS_MAX) -+ { -+ /* -+ * Require specific TLS versions... -+ */ -+ -+ strlcat(priority_string, ":-VERS-TLS-ALL", sizeof(priority_string)); -+ for (version = tls_min_version; version <= tls_max_version; version ++) -+ { -+ strlcat(priority_string, ":+", sizeof(priority_string)); -+ strlcat(priority_string, versions[version], sizeof(priority_string)); -+ } -+ } -+ else if (tls_min_version == _HTTP_TLS_SSL3) -+ { -+ /* -+ * Allow all versions of TLS and SSL/3.0... -+ */ -+ - strlcat(priority_string, ":+VERS-TLS-ALL:+VERS-SSL3.0", sizeof(priority_string)); -- else if (tls_options & _HTTP_TLS_ONLY_TLS10) -- strlcat(priority_string, ":-VERS-TLS-ALL:-VERS-SSL3.0:+VERS-TLS1.0", sizeof(priority_string)); -+ } - else -- strlcat(priority_string, ":+VERS-TLS-ALL:-VERS-SSL3.0", sizeof(priority_string)); -+ { -+ /* -+ * Require a minimum version... -+ */ -+ -+ strlcat(priority_string, ":+VERS-TLS-ALL", sizeof(priority_string)); -+ for (version = 0; version < tls_min_version; version ++) -+ { -+ strlcat(priority_string, ":-", sizeof(priority_string)); -+ strlcat(priority_string, versions[version], sizeof(priority_string)); -+ } -+ } - - if (tls_options & _HTTP_TLS_ALLOW_RC4) - strlcat(priority_string, ":+ARCFOUR-128", sizeof(priority_string)); -diff -up cups-2.2.6/cups/tls-sspi.c.remove-weak-ciphers cups-2.2.6/cups/tls-sspi.c ---- cups-2.2.6/cups/tls-sspi.c.remove-weak-ciphers 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/cups/tls-sspi.c 2018-08-07 11:53:54.986633951 +0200 -@@ -52,7 +52,9 @@ - * Local globals... - */ - --static int tls_options = -1;/* Options for TLS connections */ -+static int tls_options = -1,/* Options for TLS connections */ -+ tls_min_version = _HTTP_TLS_1_0, -+ tls_max_version = _HTTP_TLS_MAX; - - - /* -@@ -914,7 +916,11 @@ void - _httpTLSSetOptions(int options) /* I - Options */ - { - if (!(options & _HTTP_TLS_SET_DEFAULT) || tls_options < 0) -- tls_options = options; -+ { -+ tls_options = options; -+ tls_min_version = min_version; -+ tls_max_version = max_version; -+ } - } - - -@@ -1782,14 +1788,14 @@ http_sspi_find_credentials( - #else - if (http->mode == _HTTP_MODE_SERVER) - { -- if (tls_options & _HTTP_TLS_ALLOW_SSL3) -+ if (tls_min_version == _HTTP_TLS_SSL3) - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_SERVER | SP_PROT_SSL3_SERVER; - else - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_SERVER; - } - else - { -- if (tls_options & _HTTP_TLS_ALLOW_SSL3) -+ if (tls_min_version == _HTTP_TLS_SSL3) - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT | SP_PROT_SSL3_CLIENT; - else - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; -diff -up cups-2.2.6/cups/usersys.c.remove-weak-ciphers cups-2.2.6/cups/usersys.c ---- cups-2.2.6/cups/usersys.c.remove-weak-ciphers 2018-08-07 11:53:54.945634283 +0200 -+++ cups-2.2.6/cups/usersys.c 2018-08-07 11:53:54.987633942 +0200 -@@ -54,7 +54,9 @@ - typedef struct _cups_client_conf_s /**** client.conf config data ****/ - { - #ifdef HAVE_SSL -- int ssl_options; /* SSLOptions values */ -+ int ssl_options, /* SSLOptions values */ -+ ssl_min_version,/* Minimum SSL/TLS version */ -+ ssl_max_version;/* Maximum SSL/TLS version */ - #endif /* HAVE_SSL */ - int trust_first, /* Trust on first use? */ - any_root, /* Allow any (e.g., self-signed) root */ -@@ -957,7 +959,7 @@ _cupsSetDefaults(void) - cg->validate_certs = cc.validate_certs; - - #ifdef HAVE_SSL -- _httpTLSSetOptions(cc.ssl_options | _HTTP_TLS_SET_DEFAULT); -+ _httpTLSSetOptions(cc.ssl_options | _HTTP_TLS_SET_DEFAULT, cc.ssl_min_version, cc.ssl_max_version); - #endif /* HAVE_SSL */ - } - -@@ -1336,7 +1338,9 @@ cups_set_ssl_options( - * SSLOptions [AllowRC4] [AllowSSL3] [AllowDH] [DenyTLS1.0] [None] - */ - -- int options = _HTTP_TLS_NONE; /* SSL/TLS options */ -+ int options = _HTTP_TLS_NONE, /* SSL/TLS options */ -+ min_version = _HTTP_TLS_1_0, /* Minimum SSL/TLS version */ -+ max_version = _HTTP_TLS_MAX; /* Maximum SSL/TLS version */ - char temp[256], /* Copy of value */ - *start, /* Start of option */ - *end; /* End of option */ -@@ -1364,20 +1368,38 @@ cups_set_ssl_options( - if (!_cups_strcasecmp(start, "AllowRC4")) - options |= _HTTP_TLS_ALLOW_RC4; - else if (!_cups_strcasecmp(start, "AllowSSL3")) -- options |= _HTTP_TLS_ALLOW_SSL3; -+ min_version = _HTTP_TLS_SSL3; - else if (!_cups_strcasecmp(start, "AllowDH")) - options |= _HTTP_TLS_ALLOW_DH; - else if (!_cups_strcasecmp(start, "DenyCBC")) - options |= _HTTP_TLS_DENY_CBC; - else if (!_cups_strcasecmp(start, "DenyTLS1.0")) -- options |= _HTTP_TLS_DENY_TLS10; -+ min_version = _HTTP_TLS_1_1; -+ else if (!_cups_strcasecmp(start, "MaxTLS1.0")) -+ max_version = _HTTP_TLS_1_0; -+ else if (!_cups_strcasecmp(start, "MaxTLS1.1")) -+ max_version = _HTTP_TLS_1_1; -+ else if (!_cups_strcasecmp(start, "MaxTLS1.2")) -+ max_version = _HTTP_TLS_1_2; -+ else if (!_cups_strcasecmp(start, "MaxTLS1.3")) -+ max_version = _HTTP_TLS_1_3; -+ else if (!_cups_strcasecmp(start, "MinTLS1.0")) -+ min_version = _HTTP_TLS_1_0; -+ else if (!_cups_strcasecmp(start, "MinTLS1.1")) -+ min_version = _HTTP_TLS_1_1; -+ else if (!_cups_strcasecmp(start, "MinTLS1.2")) -+ min_version = _HTTP_TLS_1_2; -+ else if (!_cups_strcasecmp(start, "MinTLS1.3")) -+ min_version = _HTTP_TLS_1_3; - else if (!_cups_strcasecmp(start, "None")) - options = _HTTP_TLS_NONE; - } - -- cc->ssl_options = options; -+ cc->ssl_options = options; -+ cc->ssl_max_version = max_version; -+ cc->ssl_min_version = min_version; - -- DEBUG_printf(("4cups_set_ssl_options(cc=%p, value=\"%s\") options=%x", (void *)cc, value, options)); -+ DEBUG_printf(("4cups_set_ssl_options(cc=%p, value=\"%s\") options=%x, min_version=%d, max_version=%d", (void *)cc, value, options, min_version, max_version)); - } - #endif /* HAVE_SSL */ - -diff -up cups-2.2.6/man/client.conf.man.in.remove-weak-ciphers cups-2.2.6/man/client.conf.man.in ---- cups-2.2.6/man/client.conf.man.in.remove-weak-ciphers 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/man/client.conf.man.in 2018-08-07 11:53:54.987633942 +0200 -@@ -10,7 +10,7 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH client.conf 5 "CUPS" "19 October 2017" "Apple Inc." -+.TH client.conf 5 "CUPS" "3 November 2017" "Apple Inc." - .SH NAME - client.conf \- client configuration file for cups - .SH DESCRIPTION -@@ -56,7 +56,7 @@ Specifies the address and optionally the - \fBServerName \fIhostname-or-ip-address\fR[\fI:port\fR]\fB/version=1.1\fR - Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier. - .TP 5 --\fBSSLOptions \fR[\fIAllowDH\fR] [\fIAllowRC4\fR] [\fIAllowSSL3\fR] [\fIDenyCBC\fR] [\fIDenyTLS1.0\fR] -+\fBSSLOptions \fR[\fIAllowDH\fR] [\fIAllowRC4\fR] [\fIAllowSSL3\fR] [\fIDenyCBC\fR] [\fIDenyTLS1.0\fR] [\fIMaxTLS1.0\fR] [\fIMaxTLS1.1\fR] [\fIMaxTLS1.2\fR] [\fIMaxTLS1.3\fR] [\fIMinTLS1.0\fR] [\fIMinTLS1.1\fR] [\fIMinTLS1.2\fR] [\fIMinTLS1.3\fR] - .TP 5 - \fBSSLOptions None\fR - Sets encryption options (only in /etc/cups/client.conf). -@@ -68,6 +68,9 @@ The \fIAllowRC4\fR option enables the 12 - The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. - The \fIDenyCBC\fR option disables all CBC cipher suites. - The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. -+The \fMinTLS\fR options set the minimum TLS version to support. -+The \fMaxTLS\fR options set the maximum TLS version to support. -+Not all operating systems support TLS 1.3 at this time. - .TP 5 - \fBTrustOnFirstUse Yes\fR - .TP 5 -diff -up cups-2.2.6/man/cupsd.conf.man.in.remove-weak-ciphers cups-2.2.6/man/cupsd.conf.man.in ---- cups-2.2.6/man/cupsd.conf.man.in.remove-weak-ciphers 2018-08-07 11:53:54.981633991 +0200 -+++ cups-2.2.6/man/cupsd.conf.man.in 2018-08-07 11:53:54.987633942 +0200 -@@ -432,10 +432,11 @@ The default is "Minimal". - Listens on the specified address and port for encrypted connections. - .\"#SSLOptions - .TP 5 --\fBSSLOptions \fR[\fIAllowDH\fR] [\fIAllowRC4\fR] [\fIAllowSSL3\fR] [\fIDenyCBC\fR] [\fIDenyTLS1.0\fR] -+.TP 5 -+\fBSSLOptions \fR[\fIAllowDH\fR] [\fIAllowRC4\fR] [\fIAllowSSL3\fR] [\fIDenyCBC\fR] [\fIDenyTLS1.0\fR] [\fIMaxTLS1.0\fR] [\fIMaxTLS1.1\fR] [\fIMaxTLS1.2\fR] [\fIMaxTLS1.3\fR] [\fIMinTLS1.0\fR] [\fIMinTLS1.1\fR] [\fIMinTLS1.2\fR] [\fIMinTLS1.3\fR] - .TP 5 - \fBSSLOptions None\fR --Sets encryption options. -+Sets encryption options (only in /etc/cups/client.conf). - By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. - Security is reduced when \fIAllow\fR options are used. - Security is enhanced when \fIDeny\fR options are used. -@@ -444,6 +445,9 @@ The \fIAllowRC4\fR option enables the 12 - The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. - The \fIDenyCBC\fR option disables all CBC cipher suites. - The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. -+The \fMinTLS\fR options set the minimum TLS version to support. -+The \fMaxTLS\fR options set the maximum TLS version to support. -+Not all operating systems support TLS 1.3 at this time. - .\"#SSLPort - .TP 5 - \fBSSLPort \fIport\fR -diff -up cups-2.2.6/scheduler/conf.c.remove-weak-ciphers cups-2.2.6/scheduler/conf.c ---- cups-2.2.6/scheduler/conf.c.remove-weak-ciphers 2018-08-07 11:53:54.981633991 +0200 -+++ cups-2.2.6/scheduler/conf.c 2018-08-07 11:53:54.988633934 +0200 -@@ -630,7 +630,7 @@ cupsdReadConfiguration(void) - cupsdSetString(&ServerKeychain, "/Library/Keychains/System.keychain"); - # endif /* HAVE_GNUTLS */ - -- _httpTLSSetOptions(0); -+ _httpTLSSetOptions(_HTTP_TLS_NONE, _HTTP_TLS_1_0, _HTTP_TLS_MAX); - #endif /* HAVE_SSL */ - - language = cupsLangDefault(); -@@ -3024,7 +3024,9 @@ read_cupsd_conf(cups_file_t *fp) /* I - - * SSLOptions [AllowRC4] [AllowSSL3] [AllowDH] [DenyCBC] [DenyTLS1.0] [None] - */ - -- int options = 0; /* SSL/TLS options */ -+ int options = _HTTP_TLS_NONE,/* SSL/TLS options */ -+ min_version = _HTTP_TLS_1_0, -+ max_version = _HTTP_TLS_MAX; - - if (value) - { -@@ -3048,24 +3050,40 @@ read_cupsd_conf(cups_file_t *fp) /* I - - * Compare... - */ - -- if (!_cups_strcasecmp(start, "AllowRC4")) -+ if (!_cups_strcasecmp(start, "AllowRC4")) - options |= _HTTP_TLS_ALLOW_RC4; -- else if (!_cups_strcasecmp(start, "AllowSSL3")) -- options |= _HTTP_TLS_ALLOW_SSL3; -+ else if (!_cups_strcasecmp(start, "AllowSSL3")) -+ min_version = _HTTP_TLS_SSL3; - else if (!_cups_strcasecmp(start, "AllowDH")) - options |= _HTTP_TLS_ALLOW_DH; - else if (!_cups_strcasecmp(start, "DenyCBC")) - options |= _HTTP_TLS_DENY_CBC; - else if (!_cups_strcasecmp(start, "DenyTLS1.0")) -- options |= _HTTP_TLS_DENY_TLS10; -- else if (!_cups_strcasecmp(start, "None")) -- options = 0; -+ min_version = _HTTP_TLS_1_1; -+ else if (!_cups_strcasecmp(start, "MaxTLS1.0")) -+ max_version = _HTTP_TLS_1_0; -+ else if (!_cups_strcasecmp(start, "MaxTLS1.1")) -+ max_version = _HTTP_TLS_1_1; -+ else if (!_cups_strcasecmp(start, "MaxTLS1.2")) -+ max_version = _HTTP_TLS_1_2; -+ else if (!_cups_strcasecmp(start, "MaxTLS1.3")) -+ max_version = _HTTP_TLS_1_3; -+ else if (!_cups_strcasecmp(start, "MinTLS1.0")) -+ min_version = _HTTP_TLS_1_0; -+ else if (!_cups_strcasecmp(start, "MinTLS1.1")) -+ min_version = _HTTP_TLS_1_1; -+ else if (!_cups_strcasecmp(start, "MinTLS1.2")) -+ min_version = _HTTP_TLS_1_2; -+ else if (!_cups_strcasecmp(start, "MinTLS1.3")) -+ min_version = _HTTP_TLS_1_3; -+ else if (!_cups_strcasecmp(start, "None")) -+ options = _HTTP_TLS_NONE; - else if (_cups_strcasecmp(start, "NoEmptyFragments")) - cupsdLogMessage(CUPSD_LOG_WARN, "Unknown SSL option %s at line %d.", start, linenum); - } - } - -- _httpTLSSetOptions(options); -+ _httpTLSSetOptions(options, min_version, max_version); - } - #endif /* HAVE_SSL */ - else if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen") diff --git a/SOURCES/0001-Add-with-idle-exit-timeout-configure-option.patch b/SOURCES/0001-Add-with-idle-exit-timeout-configure-option.patch deleted file mode 100644 index 5a638e1..0000000 --- a/SOURCES/0001-Add-with-idle-exit-timeout-configure-option.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up cups-2.2.6/conf/cupsd.conf.in.idleexittimeout cups-2.2.6/conf/cupsd.conf.in ---- cups-2.2.6/conf/cupsd.conf.in.idleexittimeout 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/conf/cupsd.conf.in 2021-11-29 11:45:37.416058954 +0100 -@@ -22,6 +22,9 @@ DefaultAuthType Basic - # 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... - - Order allow,deny -diff -up cups-2.2.6/config-scripts/cups-defaults.m4.idleexittimeout cups-2.2.6/config-scripts/cups-defaults.m4 ---- cups-2.2.6/config-scripts/cups-defaults.m4.idleexittimeout 2021-11-29 11:45:37.416058954 +0100 -+++ cups-2.2.6/config-scripts/cups-defaults.m4 2021-11-29 11:46:31.680612421 +0100 -@@ -425,3 +425,16 @@ esac - - AC_SUBST(CUPS_WEBIF) - AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF) -+ -+dnl Set default value of IdleExitTimeout -+AC_ARG_WITH([idle_exit_timeout], AS_HELP_STRING([--with-idle-exit-timeout], [set the default value for IdleExitTimeout, default=60]), [ -+ AS_IF([test "x$withval" = "xno"], [ -+ EXIT_TIMEOUT=0 -+ ], [ -+ EXIT_TIMEOUT=$withval -+ ]) -+], [ -+ EXIT_TIMEOUT=60 -+]) -+ -+AC_SUBST([EXIT_TIMEOUT]) diff --git a/SOURCES/0001-Add-with-systemd-timeoutstartsec-configure-option.patch b/SOURCES/0001-Add-with-systemd-timeoutstartsec-configure-option.patch deleted file mode 100644 index af83a6c..0000000 --- a/SOURCES/0001-Add-with-systemd-timeoutstartsec-configure-option.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up cups-2.3.3op2/config-scripts/cups-defaults.m4.conf-timeoutstartsec cups-2.3.3op2/config-scripts/cups-defaults.m4 ---- cups-2.3.3op2/config-scripts/cups-defaults.m4.conf-timeoutstartsec 2021-11-29 13:50:14.568976028 +0100 -+++ cups-2.3.3op2/config-scripts/cups-defaults.m4 2021-11-29 13:51:02.785567762 +0100 -@@ -482,3 +482,18 @@ AC_ARG_WITH([idle_exit_timeout], AS_HELP - ]) - - AC_SUBST([EXIT_TIMEOUT]) -+ -+dnl set TimeoutStartSec for cups.service -+dnl - if used as --without-*, it sets TimeoutStartSec to infinity -+AC_ARG_WITH([systemd-timeoutstartsec], -+ AS_HELP_STRING([--with-systemd-timeoutstartsec], -+ [set TimeoutStartSec value in cups.service, default=default value in systemd]), [ -+ AS_IF([ test "x$withval" = "xno" ], [ -+ TIMEOUTSTARTSEC="TimeoutStartSec=infinity" -+ ], [ -+ TIMEOUTSTARTSEC="TimeoutStartSec=$withval" -+ ]) -+], [ -+ TIMEOUTSTARTSEC="" -+]) -+AC_SUBST([TIMEOUTSTARTSEC]) -diff -up cups-2.3.3op2/scheduler/org.cups.cupsd.service.in.conf-timeoutstartsec cups-2.3.3op2/scheduler/org.cups.cupsd.service.in ---- cups-2.3.3op2/scheduler/org.cups.cupsd.service.in.conf-timeoutstartsec 2021-11-29 13:50:14.551976172 +0100 -+++ cups-2.3.3op2/scheduler/org.cups.cupsd.service.in 2021-11-29 13:50:14.568976028 +0100 -@@ -8,6 +8,7 @@ Requires=cups.socket - ExecStart=@sbindir@/cupsd -l - Type=notify - Restart=on-failure -+@TIMEOUTSTARTSEC@ - - [Install] - Also=cups.socket cups.path diff --git a/SOURCES/0001-CVE-2018-4700-Linux-session-cookies-used-a-predictab.patch b/SOURCES/0001-CVE-2018-4700-Linux-session-cookies-used-a-predictab.patch deleted file mode 100644 index 2745b5d..0000000 --- a/SOURCES/0001-CVE-2018-4700-Linux-session-cookies-used-a-predictab.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cgi-bin/var.c b/cgi-bin/var.c -index 316b67f05..12f3c8344 100644 ---- a/cgi-bin/var.c -+++ b/cgi-bin/var.c -@@ -1186,6 +1186,7 @@ cgi_set_sid(void) - const char *remote_addr, /* REMOTE_ADDR */ - *server_name, /* SERVER_NAME */ - *server_port; /* SERVER_PORT */ -+ struct timeval curtime; /* Current time */ - - - if ((remote_addr = getenv("REMOTE_ADDR")) == NULL) -@@ -1195,7 +1196,8 @@ cgi_set_sid(void) - if ((server_port = getenv("SERVER_PORT")) == NULL) - server_port = "SERVER_PORT"; - -- CUPS_SRAND(time(NULL)); -+ gettimeofday(&curtime, NULL); -+ CUPS_SRAND(curtime.tv_sec + curtime.tv_usec); - snprintf(buffer, sizeof(buffer), "%s:%s:%s:%02X%02X%02X%02X%02X%02X%02X%02X", - remote_addr, server_name, server_port, - (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255, diff --git a/SOURCES/0001-Fix-default-TLS-versions.patch b/SOURCES/0001-Fix-default-TLS-versions.patch deleted file mode 100644 index b3821d6..0000000 --- a/SOURCES/0001-Fix-default-TLS-versions.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up cups-2.2.6/cups/usersys.c.defaulttls cups-2.2.6/cups/usersys.c ---- cups-2.2.6/cups/usersys.c.defaulttls 2018-09-03 12:10:36.111230611 +0200 -+++ cups-2.2.6/cups/usersys.c 2018-09-03 12:12:41.307074414 +0200 -@@ -1166,11 +1166,15 @@ cups_init_client_conf( - - memset(cc, 0, sizeof(_cups_client_conf_t)); - -- cc->encryption = (http_encryption_t)-1; -- cc->trust_first = -1; -- cc->any_root = -1; -- cc->expired_certs = -1; -- cc->validate_certs = -1; -+#ifdef HAVE_SSL -+ cc->ssl_min_version = _HTTP_TLS_1_0; -+ cc->ssl_max_version = _HTTP_TLS_MAX; -+#endif /* HAVE_SSL */ -+ cc->encryption = (http_encryption_t)-1; -+ cc->trust_first = -1; -+ cc->any_root = -1; -+ cc->expired_certs = -1; -+ cc->validate_certs = -1; - - /* - * Load settings from the org.cups.PrintingPrefs plist (which trump diff --git a/SOURCES/0001-Fix-delays-printing-to-lpd-when-reserved-ports-are-e.patch b/SOURCES/0001-Fix-delays-printing-to-lpd-when-reserved-ports-are-e.patch deleted file mode 100644 index fdec951..0000000 --- a/SOURCES/0001-Fix-delays-printing-to-lpd-when-reserved-ports-are-e.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-2.3.3op2/backend/lpd.c.lpd-delay cups-2.3.3op2/backend/lpd.c ---- cups-2.3.3op2/backend/lpd.c.lpd-delay 2021-02-01 22:10:25.000000000 +0100 -+++ cups-2.3.3op2/backend/lpd.c 2023-06-28 17:28:52.465476261 +0200 -@@ -63,7 +63,7 @@ static int abort_job = 0; /* Non-zero i - - #define RESERVE_NONE 0 /* Don't reserve a priviledged port */ - #define RESERVE_RFC1179 1 /* Reserve port 721-731 */ --#define RESERVE_ANY 2 /* Reserve port 1-1023 */ -+#define RESERVE_ANY 2 /* Reserve port 512-1023 */ - - - /* -@@ -778,7 +778,7 @@ lpd_queue(const char *hostname, /* - - if (lport < 721 && reserve == RESERVE_RFC1179) - lport = 731; -- else if (lport < 1) -+ else if (lport < 512) - lport = 1023; - - #ifdef HAVE_GETEUID diff --git a/SOURCES/0001-Fix-domain-socket-handling.patch b/SOURCES/0001-Fix-domain-socket-handling.patch deleted file mode 100644 index 35c9ebd..0000000 --- a/SOURCES/0001-Fix-domain-socket-handling.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/cups/http-addr.c b/cups/http-addr.c -index 61c86384b..e86dcb622 100644 ---- a/cups/http-addr.c -+++ b/cups/http-addr.c -@@ -198,31 +198,29 @@ httpAddrListen(http_addr_t *addr, /* I - Address to bind to */ - { - mode_t mask; /* Umask setting */ - -- /* -- * Remove any existing domain socket file... -- */ -- -- unlink(addr->un.sun_path); -- -- /* -- * Save the current umask and set it to 0 so that all users can access -- * the domain socket... -- */ -- -- mask = umask(0); -- -- /* -- * Bind the domain socket... -- */ -+ // Remove any existing domain socket file... -+ if ((status = unlink(addr->un.sun_path)) < 0) -+ { -+ DEBUG_printf(("1httpAddrListen: Unable to unlink \"%s\": %s", addr->un.sun_path, strerror(errno))); -+ if (errno == ENOENT) -+ status = 0; -+ } - -- status = bind(fd, (struct sockaddr *)addr, (socklen_t)httpAddrLength(addr)); -+ if (!status) -+ { -+ // Save the current umask and set it to 0 so that all users can access -+ // the domain socket... -+ mask = umask(0); - -- /* -- * Restore the umask and fix permissions... -- */ -+ // Bind the domain socket... -+ if ((status = bind(fd, (struct sockaddr *)addr, (socklen_t)httpAddrLength(addr))) < 0) -+ { -+ DEBUG_printf(("1httpAddrListen: Unable to bind domain socket \"%s\": %s", addr->un.sun_path, strerror(errno))); -+ } - -- umask(mask); -- chmod(addr->un.sun_path, 0140777); -+ // Restore the umask... -+ umask(mask); -+ } - } - else - #endif /* AF_LOCAL */ -diff --git a/scheduler/conf.c b/scheduler/conf.c -index bc52d2add..93de8cf77 100644 ---- a/scheduler/conf.c -+++ b/scheduler/conf.c -@@ -3055,6 +3055,25 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ - - cupsd_listener_t *lis; /* New listeners array */ - -+ /* -+ * If we are launched on-demand, do not use domain sockets from the config -+ * file. Also check that the domain socket path is not too long... -+ */ -+ -+#ifdef HAVE_ONDEMAND -+ if (*value == '/' && OnDemand) -+ { -+ if (strcmp(value, CUPS_DEFAULT_DOMAINSOCKET)) -+ cupsdLogMessage(CUPSD_LOG_INFO, "Ignoring %s address %s at line %d - only using domain socket from launchd/systemd.", line, value, linenum); -+ continue; -+ } -+#endif // HAVE_ONDEMAND -+ -+ if (*value == '/' && strlen(value) > (sizeof(addr->addr.un.sun_path) - 1)) -+ { -+ cupsdLogMessage(CUPSD_LOG_INFO, "Ignoring %s address %s at line %d - too long.", line, value, linenum); -+ continue; -+ } - - /* - * Get the address list... diff --git a/SOURCES/0001-Fix-handling-of-MaxJobTime-0-Issue-5438.patch b/SOURCES/0001-Fix-handling-of-MaxJobTime-0-Issue-5438.patch deleted file mode 100644 index e7f586c..0000000 --- a/SOURCES/0001-Fix-handling-of-MaxJobTime-0-Issue-5438.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3e4dd41459dabc5d18edbe06eb5b81291885204b Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Wed, 5 Dec 2018 12:18:19 -0500 -Subject: [PATCH] Fix handling of MaxJobTime 0 (Issue #5438) - ---- - CHANGES.md | 5 +++-- - scheduler/job.c | 4 +++- - scheduler/printers.c | 2 +- - 3 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/scheduler/job.c b/scheduler/job.c -index 3cbe56aa8..638f256db 100644 ---- a/scheduler/job.c -+++ b/scheduler/job.c -@@ -5148,8 +5148,10 @@ update_job(cupsd_job_t *job) /* I - Job to check */ - - if (cancel_after) - job->cancel_time = time(NULL) + ippGetInteger(cancel_after, 0); -- else -+ else if (MaxJobTime > 0) - job->cancel_time = time(NULL) + MaxJobTime; -+ else -+ job->cancel_time = 0; - } - } - } -diff --git a/scheduler/printers.c b/scheduler/printers.c -index bb99907ad..68239d85d 100644 ---- a/scheduler/printers.c -+++ b/scheduler/printers.c -@@ -3370,7 +3370,7 @@ add_printer_defaults(cupsd_printer_t *p)/* I - Printer */ - "document-format-default", NULL, "application/octet-stream"); - - if (!cupsGetOption("job-cancel-after", p->num_options, p->options)) -- ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_INTEGER, -+ ippAddInteger(p->attrs, IPP_TAG_PRINTER, MaxJobTime > 0 ? IPP_TAG_INTEGER : IPP_TAG_NOVALUE, - "job-cancel-after-default", MaxJobTime); - - if (!cupsGetOption("job-hold-until", p->num_options, p->options)) --- -2.31.1 - diff --git a/SOURCES/0001-Fix-local-privilege-escalation-to-root-and-sandbox-b.patch b/SOURCES/0001-Fix-local-privilege-escalation-to-root-and-sandbox-b.patch deleted file mode 100644 index dfb74a1..0000000 --- a/SOURCES/0001-Fix-local-privilege-escalation-to-root-and-sandbox-b.patch +++ /dev/null @@ -1,481 +0,0 @@ -From d47f6aec436e0e9df6554436e391471097686ecc Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Tue, 8 May 2018 15:24:21 -0700 -Subject: [PATCH] Fix local privilege escalation to root and sandbox bypasses - in scheduler (rdar://37836779, rdar://37836995, rdar://37837252, - rdar://37837581) - ---- - man/cups-files.conf.man.in | 10 ++ - man/cupsd.conf.man.in | 8 -- - scheduler/conf.c | 201 +++++++++++++++++++++++-------------- - scheduler/job.c | 12 +++ - scheduler/process.c | 16 +-- - scheduler/server.c | 20 +++- - test/run-stp-tests.sh | 11 +- - 7 files changed, 179 insertions(+), 99 deletions(-) - -diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in -index 7b96d687d..baf3cb6af 100644 ---- a/man/cups-files.conf.man.in -+++ b/man/cups-files.conf.man.in -@@ -153,6 +153,11 @@ The server name may be included in filenames using the string "%s", for example: - - .fi - The default is "/var/log/cups/page_log". -+.\"#PassEnv -+.TP 5 -+\fBPassEnv \fIvariable \fR[ ... \fIvariable \fR] -+Passes the specified environment variable(s) to child processes. -+Note: the standard CUPS filter and backend environment variables cannot be overridden using this directive. - .\"#RemoteRoot - .TP 5 - \fBRemoteRoot \fIusername\fR -@@ -187,6 +192,11 @@ macOS uses its keychain database to store certificates and keys while other plat - \fBServerRoot \fIdirectory\fR - Specifies the directory containing the server configuration files. - The default is "/etc/cups". -+.\"#SetEnv -+.TP 5 -+\fBSetEnv \fIvariable value\fR -+Set the specified environment variable to be passed to child processes. -+Note: the standard CUPS filter and backend environment variables cannot be overridden using this directive. - .\"#StateDir - .TP 5 - \fBStateDir \fIdirectory\fR -diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in -index 3ffc80e42..36c849398 100644 ---- a/man/cupsd.conf.man.in -+++ b/man/cupsd.conf.man.in -@@ -349,10 +349,6 @@ The default is "1048576" (1MB). - \fBMultipleOperationTimeout \fIseconds\fR - Specifies the maximum amount of time to allow between files in a multiple file print job. - The default is "300" (5 minutes). --.\"#PassEnv --.TP 5 --\fBPassEnv \fIvariable \fR[ ... \fIvariable \fR] --Passes the specified environment variable(s) to child processes. - .\"#Policy - .TP 5 - \fB \fR... \fB\fR -@@ -433,10 +429,6 @@ Specifies what information is included in the Server header of HTTP responses. - command. - "Full" reports "CUPS 2.0.0 (UNAME) IPP/2.0". - The default is "Minimal". --.\"#SetEnv --.TP 5 --\fBSetEnv \fIvariable value\fR --Set the specified environment variable to be passed to child processes. - .\"#SSLListen - .TP 5 - \fBSSLListen \fIipv4-address\fB:\fIport\fR -diff --git a/scheduler/conf.c b/scheduler/conf.c -index 67a91e7a6..b51c6060c 100644 ---- a/scheduler/conf.c -+++ b/scheduler/conf.c -@@ -2929,13 +2929,10 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ - /* Line from file */ - temp[HTTP_MAX_BUFFER], - /* Temporary buffer for value */ -- *value, /* Pointer to value */ -- *valueptr; /* Pointer into value */ -+ *value; /* Pointer to value */ - int valuelen; /* Length of value */ - http_addrlist_t *addrlist, /* Address list */ - *addr; /* Current address */ -- cups_file_t *incfile; /* Include file */ -- char incname[1024]; /* Include filename */ - - - /* -@@ -2950,28 +2947,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ - * Decode the directive... - */ - -- if (!_cups_strcasecmp(line, "Include") && value) -- { -- /* -- * Include filename -- */ -- -- if (value[0] == '/') -- strlcpy(incname, value, sizeof(incname)); -- else -- snprintf(incname, sizeof(incname), "%s/%s", ServerRoot, value); -- -- if ((incfile = cupsFileOpen(incname, "rb")) == NULL) -- cupsdLogMessage(CUPSD_LOG_ERROR, -- "Unable to include config file \"%s\" - %s", -- incname, strerror(errno)); -- else -- { -- read_cupsd_conf(incfile); -- cupsFileClose(incfile); -- } -- } -- else if (!_cups_strcasecmp(line, " -@@ -3367,31 +3343,6 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ - cupsdLogMessage(CUPSD_LOG_WARN, "Unknown ServerTokens %s on line %d of %s.", - value, linenum, ConfigurationFile); - } -- else if (!_cups_strcasecmp(line, "PassEnv") && value) -- { -- /* -- * PassEnv variable [... variable] -- */ -- -- for (; *value;) -- { -- for (valuelen = 0; value[valuelen]; valuelen ++) -- if (_cups_isspace(value[valuelen]) || value[valuelen] == ',') -- break; -- -- if (value[valuelen]) -- { -- value[valuelen] = '\0'; -- valuelen ++; -- } -- -- cupsdSetEnv(value, NULL); -- -- for (value += valuelen; *value; value ++) -- if (!_cups_isspace(*value) || *value != ',') -- break; -- } -- } - else if (!_cups_strcasecmp(line, "ServerAlias") && value) - { - /* -@@ -3420,30 +3371,6 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ - break; - } - } -- else if (!_cups_strcasecmp(line, "SetEnv") && value) -- { -- /* -- * SetEnv variable value -- */ -- -- for (valueptr = value; *valueptr && !isspace(*valueptr & 255); valueptr ++); -- -- if (*valueptr) -- { -- /* -- * Found a value... -- */ -- -- while (isspace(*valueptr & 255)) -- *valueptr++ = '\0'; -- -- cupsdSetEnv(value, valueptr); -- } -- else -- cupsdLogMessage(CUPSD_LOG_ERROR, -- "Missing value for SetEnv directive on line %d of %s.", -- linenum, ConfigurationFile); -- } - else if (!_cups_strcasecmp(line, "AccessLog") || - !_cups_strcasecmp(line, "CacheDir") || - !_cups_strcasecmp(line, "ConfigFilePerm") || -@@ -3457,6 +3384,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ - !_cups_strcasecmp(line, "LogFilePerm") || - !_cups_strcasecmp(line, "LPDConfigFile") || - !_cups_strcasecmp(line, "PageLog") || -+ !_cups_strcasecmp(line, "PassEnv") || - !_cups_strcasecmp(line, "Printcap") || - !_cups_strcasecmp(line, "PrintcapFormat") || - !_cups_strcasecmp(line, "RemoteRoot") || -@@ -3466,6 +3394,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ - !_cups_strcasecmp(line, "ServerKey") || - !_cups_strcasecmp(line, "ServerKeychain") || - !_cups_strcasecmp(line, "ServerRoot") || -+ !_cups_strcasecmp(line, "SetEnv") || - !_cups_strcasecmp(line, "SMBConfigFile") || - !_cups_strcasecmp(line, "StateDir") || - !_cups_strcasecmp(line, "SystemGroup") || -@@ -3495,10 +3424,49 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ - static int /* O - 1 on success, 0 on failure */ - read_cups_files_conf(cups_file_t *fp) /* I - File to read from */ - { -- int linenum; /* Current line number */ -+ int i, /* Looping var */ -+ linenum; /* Current line number */ - char line[HTTP_MAX_BUFFER], /* Line from file */ - *value; /* Value from line */ - struct group *group; /* Group */ -+ static const char * const prohibited_env[] = -+ { /* Prohibited environment variables */ -+ "APPLE_LANGUAGE", -+ "AUTH_DOMAIN", -+ "AUTH_INFO_REQUIRED", -+ "AUTH_NEGOTIATE", -+ "AUTH_PASSWORD", -+ "AUTH_UID", -+ "AUTH_USERNAME", -+ "CHARSET", -+ "CLASS", -+ "CLASSIFICATION", -+ "CONTENT_TYPE", -+ "CUPS_CACHEDIR", -+ "CUPS_DATADIR", -+ "CUPS_DOCROOT", -+ "CUPS_FILETYPE", -+ "CUPS_FONTPATH", -+ "CUPS_MAX_MESSAGE", -+ "CUPS_REQUESTROOT", -+ "CUPS_SERVERBIN", -+ "CUPS_SERVERROOT", -+ "CUPS_STATEDIR", -+ "DEVICE_URI", -+ "FINAL_CONTENT_TYPE", -+ "HOME", -+ "LANG", -+ "PPD", -+ "PRINTER", -+ "PRINTER_INFO", -+ "PRINTER_LOCATION", -+ "PRINTER_STATE_REASONS", -+ "RIP_CACHE", -+ "SERVER_ADMIN", -+ "SOFTWARE", -+ "TMPDIR", -+ "USER" -+ }; - - - /* -@@ -3536,6 +3504,47 @@ read_cups_files_conf(cups_file_t *fp) /* I - File to read from */ - } - } - } -+ else if (!_cups_strcasecmp(line, "PassEnv") && value) -+ { -+ /* -+ * PassEnv variable [... variable] -+ */ -+ -+ int valuelen; /* Length of variable name */ -+ -+ for (; *value;) -+ { -+ for (valuelen = 0; value[valuelen]; valuelen ++) -+ if (_cups_isspace(value[valuelen]) || value[valuelen] == ',') -+ break; -+ -+ if (value[valuelen]) -+ { -+ value[valuelen] = '\0'; -+ valuelen ++; -+ } -+ -+ for (i = 0; i < (int)(sizeof(prohibited_env) / sizeof(prohibited_env[0])); i ++) -+ { -+ if (!strcmp(value, prohibited_env[i])) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Environment variable \"%s\" cannot be passed through on line %d of %s.", value, linenum, CupsFilesFile); -+ -+ if (FatalErrors & CUPSD_FATAL_CONFIG) -+ return (0); -+ else -+ break; -+ } -+ } -+ -+ if (i >= (int)(sizeof(prohibited_env) / sizeof(prohibited_env[0]))) -+ cupsdSetEnv(value, NULL); -+ -+ for (value += valuelen; *value; value ++) -+ if (!_cups_isspace(*value) || *value != ',') -+ break; -+ } -+ } - else if (!_cups_strcasecmp(line, "PrintcapFormat") && value) - { - /* -@@ -3581,6 +3590,46 @@ read_cups_files_conf(cups_file_t *fp) /* I - File to read from */ - return (0); - } - } -+ else if (!_cups_strcasecmp(line, "SetEnv") && value) -+ { -+ /* -+ * SetEnv variable value -+ */ -+ -+ char *valueptr; /* Pointer to environment variable value */ -+ -+ for (valueptr = value; *valueptr && !isspace(*valueptr & 255); valueptr ++); -+ -+ if (*valueptr) -+ { -+ /* -+ * Found a value... -+ */ -+ -+ while (isspace(*valueptr & 255)) -+ *valueptr++ = '\0'; -+ -+ for (i = 0; i < (int)(sizeof(prohibited_env) / sizeof(prohibited_env[0])); i ++) -+ { -+ if (!strcmp(value, prohibited_env[i])) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Environment variable \"%s\" cannot be set on line %d of %s.", value, linenum, CupsFilesFile); -+ -+ if (FatalErrors & CUPSD_FATAL_CONFIG) -+ return (0); -+ else -+ break; -+ } -+ } -+ -+ if (i >= (int)(sizeof(prohibited_env) / sizeof(prohibited_env[0]))) -+ cupsdSetEnv(value, valueptr); -+ } -+ else -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Missing value for SetEnv directive on line %d of %s.", -+ linenum, ConfigurationFile); -+ } - else if (!_cups_strcasecmp(line, "SystemGroup") && value) - { - /* -diff --git a/scheduler/job.c b/scheduler/job.c -index 61cda44e2..5ced0b9d1 100644 ---- a/scheduler/job.c -+++ b/scheduler/job.c -@@ -4779,6 +4779,18 @@ start_job(cupsd_job_t *job, /* I - Job ID */ - job->profile = cupsdCreateProfile(job->id, 0); - job->bprofile = cupsdCreateProfile(job->id, 1); - -+#ifdef HAVE_SANDBOX_H -+ if ((!job->profile || !job->bprofile) && UseSandboxing && Sandboxing != CUPSD_SANDBOXING_OFF) -+ { -+ /* -+ * Failure to create the sandbox profile means something really bad has -+ * happened and we need to shutdown immediately. -+ */ -+ -+ return; -+ } -+#endif /* HAVE_SANDBOX_H */ -+ - /* - * Create the status pipes and buffer... - */ -diff --git a/scheduler/process.c b/scheduler/process.c -index b8d49d8f0..3c1c6ba4f 100644 ---- a/scheduler/process.c -+++ b/scheduler/process.c -@@ -98,9 +98,13 @@ cupsdCreateProfile(int job_id, /* I - Job ID or 0 for none */ - - if ((fp = cupsTempFile2(profile, sizeof(profile))) == NULL) - { -+ /* -+ * This should never happen, and is fatal when sandboxing is enabled. -+ */ -+ - cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCreateProfile(job_id=%d, allow_networking=%d) = NULL", job_id, allow_networking); -- cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create security profile: %s", -- strerror(errno)); -+ cupsdLogMessage(CUPSD_LOG_EMERG, "Unable to create security profile: %s", strerror(errno)); -+ kill(getpid(), SIGTERM); - return (NULL); - } - -@@ -197,10 +201,8 @@ cupsdCreateProfile(int job_id, /* I - Job ID or 0 for none */ - " #\"^%s/\"" /* TempDir/... */ - " #\"^%s$\"" /* CacheDir */ - " #\"^%s/\"" /* CacheDir/... */ -- " #\"^%s$\"" /* StateDir */ -- " #\"^%s/\"" /* StateDir/... */ - "))\n", -- temp, temp, cache, cache, state, state); -+ temp, temp, cache, cache); - /* Read common folders */ - cupsFilePrintf(fp, - "(allow file-read-data file-read-metadata\n" -@@ -242,8 +244,10 @@ cupsdCreateProfile(int job_id, /* I - Job ID or 0 for none */ - " #\"^%s/\"" /* ServerBin/... */ - " #\"^%s$\"" /* ServerRoot */ - " #\"^%s/\"" /* ServerRoot/... */ -+ " #\"^%s$\"" /* StateDir */ -+ " #\"^%s/\"" /* StateDir/... */ - "))\n", -- request, request, bin, bin, root, root); -+ request, request, bin, bin, root, root, state, state); - if (Sandboxing == CUPSD_SANDBOXING_RELAXED) - { - /* Limited write access to /Library/Printers/... */ -diff --git a/scheduler/server.c b/scheduler/server.c -index cecbabe67..a4033791b 100644 ---- a/scheduler/server.c -+++ b/scheduler/server.c -@@ -34,16 +34,28 @@ void - cupsdStartServer(void) - { - /* -- * Start color management (as needed)... -+ * Create the default security profile... - */ - -- cupsdStartColor(); -+ DefaultProfile = cupsdCreateProfile(0, 1); -+ -+#ifdef HAVE_SANDBOX_H -+ if (!DefaultProfile && UseSandboxing && Sandboxing != CUPSD_SANDBOXING_OFF) -+ { -+ /* -+ * Failure to create the sandbox profile means something really bad has -+ * happened and we need to shutdown immediately. -+ */ -+ -+ return; -+ } -+#endif /* HAVE_SANDBOX_H */ - - /* -- * Create the default security profile... -+ * Start color management (as needed)... - */ - -- DefaultProfile = cupsdCreateProfile(0, 1); -+ cupsdStartColor(); - - /* - * Startup all the networking stuff... -diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh -index 7eb269a67..f83bd5d91 100755 ---- a/test/run-stp-tests.sh -+++ b/test/run-stp-tests.sh -@@ -489,11 +489,6 @@ StrictConformance Yes - Browsing Off - Listen localhost:$port - Listen $BASE/sock --PassEnv DYLD_LIBRARY_PATH --PassEnv LD_LIBRARY_PATH --PassEnv LD_PRELOAD --PassEnv LOCALEDIR --PassEnv SHLIB_PATH - MaxSubscriptions 3 - MaxLogSize 0 - AccessLogLevel actions -@@ -529,6 +524,12 @@ TempDir $BASE/spool/temp - AccessLog $BASE/log/access_log - ErrorLog $BASE/log/error_log - PageLog $BASE/log/page_log -+ -+PassEnv DYLD_LIBRARY_PATH -+PassEnv LD_LIBRARY_PATH -+PassEnv LD_PRELOAD -+PassEnv LOCALEDIR -+PassEnv SHLIB_PATH - EOF - - if test $ssltype != 0 -a `uname` = Darwin; then --- -2.17.1 - diff --git a/SOURCES/0001-Fix-lpadmin-with-cupsIPPSupplies-and-cupsSNMPSupplie.patch b/SOURCES/0001-Fix-lpadmin-with-cupsIPPSupplies-and-cupsSNMPSupplie.patch deleted file mode 100644 index 8f8fa71..0000000 --- a/SOURCES/0001-Fix-lpadmin-with-cupsIPPSupplies-and-cupsSNMPSupplie.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 9539c53065170e97836503074e770d7b5fbf9f83 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Tue, 16 Jul 2019 09:27:13 -0400 -Subject: [PATCH] Fix lpadmin with cupsIPPSupplies and cupsSNMPSupplies (Issue - #5610) - ---- - CHANGES.md | 2 ++ - systemv/lpadmin.c | 9 +++++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c -index f428368d4..ca6d386b2 100644 ---- a/systemv/lpadmin.c -+++ b/systemv/lpadmin.c -@@ -1467,6 +1467,7 @@ set_printer_options( - (boolval = cupsGetOption("cupsIPPSupplies", num_options, - options)) != NULL) - { -+ ppdchanged = 1; - wrote_ipp_supplies = 1; - cupsFilePrintf(out, "*cupsIPPSupplies: %s\n", - (!_cups_strcasecmp(boolval, "true") || -@@ -1477,6 +1478,7 @@ set_printer_options( - (boolval = cupsGetOption("cupsSNMPSupplies", num_options, - options)) != NULL) - { -+ ppdchanged = 1; - wrote_snmp_supplies = 1; - cupsFilePrintf(out, "*cupsSNMPSupplies: %s\n", - (!_cups_strcasecmp(boolval, "true") || -@@ -1537,6 +1539,8 @@ set_printer_options( - (boolval = cupsGetOption("cupsIPPSupplies", num_options, - options)) != NULL) - { -+ ppdchanged = 1; -+ - cupsFilePrintf(out, "*cupsIPPSupplies: %s\n", - (!_cups_strcasecmp(boolval, "true") || - !_cups_strcasecmp(boolval, "yes") || -@@ -1547,6 +1551,8 @@ set_printer_options( - (boolval = cupsGetOption("cupsSNMPSupplies", num_options, - options)) != NULL) - { -+ ppdchanged = 1; -+ - cupsFilePrintf(out, "*cupsSNMPSupplies: %s\n", - (!_cups_strcasecmp(boolval, "true") || - !_cups_strcasecmp(boolval, "yes") || -@@ -1561,8 +1567,7 @@ set_printer_options( - * Do the request... - */ - -- ippDelete(cupsDoFileRequest(http, request, "/admin/", -- ppdchanged ? tempfile : file)); -+ ippDelete(cupsDoFileRequest(http, request, "/admin/", ppdchanged ? tempfile : file)); - - /* - * Clean up temp files... (TODO: catch signals in case we CTRL-C during --- -2.31.1 - diff --git a/SOURCES/0001-Fix-memory-leaks-found-by-Coverity-Issue-5375.patch b/SOURCES/0001-Fix-memory-leaks-found-by-Coverity-Issue-5375.patch deleted file mode 100644 index ec224c3..0000000 --- a/SOURCES/0001-Fix-memory-leaks-found-by-Coverity-Issue-5375.patch +++ /dev/null @@ -1,206 +0,0 @@ -diff --git a/backend/ipp.c b/backend/ipp.c -index 32eb3aaa4..2a880bd75 100644 ---- a/backend/ipp.c -+++ b/backend/ipp.c -@@ -3612,6 +3612,8 @@ update_reasons(ipp_attribute_t *attr, /* I - printer-state-reasons or NULL */ - } - } - -+ cupsArrayDelete(new_reasons); -+ - _cupsMutexUnlock(&report_mutex); - - /* -diff --git a/cgi-bin/search.c b/cgi-bin/search.c -index 3956afc33..ad1f5ed0e 100644 ---- a/cgi-bin/search.c -+++ b/cgi-bin/search.c -@@ -361,4 +362,5 @@ void - cgiFreeSearch(void *search) /* I - Search context */ - { - regfree((regex_t *)search); -+ free(search); - } -diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c -index 5d510140b..688901a7d 100644 ---- a/cups/http-addrlist.c -+++ b/cups/http-addrlist.c -@@ -612,6 +613,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p - if (!temp) - { - httpAddrFreeList(first); -+ freeaddrinfo(results); - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0); - return (NULL); - } -diff --git a/cups/http.c b/cups/http.c -index a9235b087..d9332cc83 100644 ---- a/cups/http.c -+++ b/cups/http.c -@@ -3915,7 +3915,7 @@ http_create( - if ((http = calloc(sizeof(http_t), 1)) == NULL) - { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0); -- httpAddrFreeList(addrlist); -+ httpAddrFreeList(myaddrlist); - return (NULL); - } - -diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx -index be24cebae..4e8cba7bb 100644 ---- a/ppdc/ppdc-source.cxx -+++ b/ppdc/ppdc-source.cxx -@@ -2665,6 +2666,7 @@ ppdcSource::scan_file(ppdcFile *fp, // I - File to read - // Add it to the current option... - if (!o) - { -+ c->release(); - _cupsLangPrintf(stderr, - _("ppdc: Choice found on line %d of %s with no " - "Option."), fp->line, fp->filename); -diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx -index 657eee0a0..b518a9325 100644 ---- a/scheduler/cups-driverd.cxx -+++ b/scheduler/cups-driverd.cxx -@@ -153,7 +153,7 @@ static ppd_info_t *add_ppd(const char *filename, const char *name, - size_t size, int model_number, int type, - const char *scheme); - static int cat_drv(const char *name, int request_id); --static int cat_ppd(const char *name, int request_id); -+static void cat_ppd(const char *name, int request_id); - static int cat_static(const char *name, int request_id); - static int cat_tar(const char *name, int request_id); - static int compare_inodes(struct stat *a, struct stat *b); -@@ -163,12 +163,12 @@ static int compare_names(const ppd_info_t *p0, - const ppd_info_t *p1); - static int compare_ppds(const ppd_info_t *p0, - const ppd_info_t *p1); --static int dump_ppds_dat(const char *filename); -+static void dump_ppds_dat(const char *filename); - static void free_array(cups_array_t *a); - static cups_file_t *get_file(const char *name, int request_id, - const char *subdir, char *buffer, - size_t bufsize, char **subfile); --static int list_ppds(int request_id, int limit, const char *opt); -+static void list_ppds(int request_id, int limit, const char *opt); - static int load_drivers(cups_array_t *include, - cups_array_t *exclude); - static int load_drv(const char *filename, const char *name, -@@ -204,13 +204,13 @@ main(int argc, /* I - Number of command-line args */ - */ - - if (argc == 3 && !strcmp(argv[1], "cat")) -- return (cat_ppd(argv[2], 0)); -+ cat_ppd(argv[2], 0); - else if ((argc == 2 || argc == 3) && !strcmp(argv[1], "dump")) -- return (dump_ppds_dat(argv[2])); -+ dump_ppds_dat(argv[2]); - else if (argc == 4 && !strcmp(argv[1], "get")) -- return (cat_ppd(argv[3], atoi(argv[2]))); -+ cat_ppd(argv[3], atoi(argv[2])); - else if (argc == 5 && !strcmp(argv[1], "list")) -- return (list_ppds(atoi(argv[2]), atoi(argv[3]), argv[4])); -+ list_ppds(atoi(argv[2]), atoi(argv[3]), argv[4]); - else - { - fputs("Usage: cups-driverd cat ppd-name\n", stderr); -@@ -428,7 +428,7 @@ cat_drv(const char *name, /* I - PPD name */ - * 'cat_ppd()' - Copy a PPD file to stdout. - */ - --static int /* O - Exit code */ -+static void - cat_ppd(const char *name, /* I - PPD name */ - int request_id) /* I - Request ID for response? */ - { -@@ -445,7 +445,7 @@ cat_ppd(const char *name, /* I - PPD name */ - if (strstr(name, "../")) - { - fputs("ERROR: Invalid PPD name.\n", stderr); -- return (1); -+ exit(1); - } - - strlcpy(scheme, name, sizeof(scheme)); -@@ -475,11 +475,11 @@ cat_ppd(const char *name, /* I - PPD name */ - puts("Content-Type: application/ipp\n"); - - if (!scheme[0]) -- return (cat_static(name, request_id)); -+ exit(cat_static(name, request_id)); - else if (!strcmp(scheme, "drv")) -- return (cat_drv(name, request_id)); -+ exit(cat_drv(name, request_id)); - else if (!strcmp(scheme, "file")) -- return (cat_tar(name, request_id)); -+ exit(cat_tar(name, request_id)); - else - { - /* -@@ -517,7 +517,7 @@ cat_ppd(const char *name, /* I - PPD name */ - cupsdSendIPPTrailer(); - } - -- return (1); -+ exit(1); - } - - /* -@@ -547,15 +547,15 @@ cat_ppd(const char *name, /* I - PPD name */ - - fprintf(stderr, "ERROR: [cups-driverd] Unable to execute \"%s\" - %s\n", - line, strerror(errno)); -- return (1); -+ exit(1); - } - } - - /* -- * Return with no errors... -+ * Exit with no errors... - */ - -- return (0); -+ exit(0); - } - - -@@ -778,7 +778,7 @@ compare_ppds(const ppd_info_t *p0, /* I - First PPD file */ - * 'dump_ppds_dat()' - Dump the contents of the ppds.dat file. - */ - --static int /* O - Exit status */ -+static void - dump_ppds_dat(const char *filename) /* I - Filename */ - { - char temp[1024]; /* ppds.dat filename */ -@@ -810,7 +810,7 @@ dump_ppds_dat(const char *filename) /* I - Filename */ - ppd->record.make_and_model, ppd->record.device_id, - ppd->record.scheme); - -- return (0); -+ exit(0); - } - - -@@ -1004,7 +1004,7 @@ get_file(const char *name, /* I - Name */ - * 'list_ppds()' - List PPD files. - */ - --static int /* O - Exit code */ -+static void - list_ppds(int request_id, /* I - Request ID */ - int limit, /* I - Limit */ - const char *opt) /* I - Option argument */ -@@ -1566,7 +1566,7 @@ list_ppds(int request_id, /* I - Request ID */ - if (request_id) - cupsdSendIPPTrailer(); - -- return (0); -+ exit(0); - } - - --- -2.17.1 - diff --git a/SOURCES/0001-Fix-stuck-multi-file-jobs-Issue-5359-Issue-5413.patch b/SOURCES/0001-Fix-stuck-multi-file-jobs-Issue-5359-Issue-5413.patch deleted file mode 100644 index 2d7ca02..0000000 --- a/SOURCES/0001-Fix-stuck-multi-file-jobs-Issue-5359-Issue-5413.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/backend/socket.c b/backend/socket.c -index 675061dd9..68379e95b 100644 ---- a/backend/socket.c -+++ b/backend/socket.c -@@ -397,8 +397,10 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ - lseek(print_fd, 0, SEEK_SET); - } - -- tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addrlist->addr), 1, -- 0, backendNetworkSideCB); -+ if ((bytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addrlist->addr), 1, 0, backendNetworkSideCB)) < 0) -+ tbytes = -1; -+ else -+ tbytes = bytes; - - if (print_fd != 0 && tbytes >= 0) - _cupsLangPrintFilter(stderr, "INFO", _("Print file sent.")); -@@ -406,7 +408,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ - - fputs("STATE: +cups-waiting-for-job-completed\n", stderr); - -- if (waiteof) -+ if (waiteof && tbytes >= 0) - { - /* - * Shutdown the socket and wait for the other end to finish... -@@ -443,7 +445,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ - if (print_fd != 0) - close(print_fd); - -- return (CUPS_BACKEND_OK); -+ return (tbytes >= 0 ? CUPS_BACKEND_OK : CUPS_BACKEND_FAILED); - } - - -diff --git a/scheduler/main.c b/scheduler/main.c -index 4b3914ade..472b9946d 100644 ---- a/scheduler/main.c -+++ b/scheduler/main.c -@@ -1472,9 +1472,16 @@ process_children(void) - (!job->filters[i] && WIFEXITED(old_status))) - { /* Backend and filter didn't crash */ - if (job->filters[i]) -+ { - job->status = status; /* Filter failed */ -+ } - else -+ { - job->status = -status; /* Backend failed */ -+ -+ if (job->current_file < job->num_files) -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_FORCE, "Canceling multi-file job due to backend failure."); -+ } - } - - if (job->state_value == IPP_JOB_PROCESSING && diff --git a/SOURCES/0001-Log-result-of-httpGetHostname-BEFORE-closing-the-con.patch b/SOURCES/0001-Log-result-of-httpGetHostname-BEFORE-closing-the-con.patch deleted file mode 100644 index 7c647bf..0000000 --- a/SOURCES/0001-Log-result-of-httpGetHostname-BEFORE-closing-the-con.patch +++ /dev/null @@ -1,64 +0,0 @@ -From ffd290b4ab247f82722927ba9b21358daa16dbf1 Mon Sep 17 00:00:00 2001 -From: Rose <83477269+AtariDreams@users.noreply.github.com> -Date: Thu, 1 Jun 2023 11:33:39 -0400 -Subject: [PATCH] Log result of httpGetHostname BEFORE closing the connection - -httpClose frees the memory of con->http. This is problematic because httpGetHostname then tries to access the memory it points to. - -We have to log the hostname first. ---- - scheduler/client.c | 16 +++++++--------- - 1 file changed, 7 insertions(+), 9 deletions(-) - -diff --git a/scheduler/client.c b/scheduler/client.c -index 91e441188..327473a4d 100644 ---- a/scheduler/client.c -+++ b/scheduler/client.c -@@ -193,13 +193,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ - /* - * Can't have an unresolved IP address with double-lookups enabled... - */ -- -- httpClose(con->http); -- - cupsdLogClient(con, CUPSD_LOG_WARN, -- "Name lookup failed - connection from %s closed!", -+ "Name lookup failed - closing connection from %s!", - httpGetHostname(con->http, NULL, 0)); - -+ httpClose(con->http); - free(con); - return; - } -@@ -235,11 +233,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ - * with double-lookups enabled... - */ - -- httpClose(con->http); -- - cupsdLogClient(con, CUPSD_LOG_WARN, -- "IP lookup failed - connection from %s closed!", -+ "IP lookup failed - closing connection from %s!", - httpGetHostname(con->http, NULL, 0)); -+ -+ httpClose(con->http); - free(con); - return; - } -@@ -256,11 +254,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ - - if (!hosts_access(&wrap_req)) - { -- httpClose(con->http); -- - cupsdLogClient(con, CUPSD_LOG_WARN, - "Connection from %s refused by /etc/hosts.allow and " - "/etc/hosts.deny rules.", httpGetHostname(con->http, NULL, 0)); -+ -+ httpClose(con->http); - free(con); - return; - } --- -2.41.0 - diff --git a/SOURCES/0001-Multiple-security-disclosure-issues.patch b/SOURCES/0001-Multiple-security-disclosure-issues.patch deleted file mode 100644 index 88f81f9..0000000 --- a/SOURCES/0001-Multiple-security-disclosure-issues.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 2c030c7a06e0c2b8227c7e85f5c58dfb339731d0 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Thu, 15 Aug 2019 14:06:47 -0400 -Subject: [PATCH] Multiple security/disclosure issues: - -- CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows (rdar://51685251) -- Fixed IPP buffer overflow (rdar://50035411) -- Fixed memory disclosure issue in the scheduler (rdar://51373853) -- Fixed DoS issues in the scheduler (rdar://51373929) - -diff --git a/cups/http.c b/cups/http.c -index 266a15791..fbb1bf13c 100644 ---- a/cups/http.c -+++ b/cups/http.c -@@ -1860,7 +1860,7 @@ httpPrintf(http_t *http, /* I - HTTP connection */ - ...) /* I - Additional args as needed */ - { - ssize_t bytes; /* Number of bytes to write */ -- char buf[16384]; /* Buffer for formatted string */ -+ char buf[65536]; /* Buffer for formatted string */ - va_list ap; /* Variable argument pointer */ - - -@@ -1872,7 +1872,12 @@ httpPrintf(http_t *http, /* I - HTTP connection */ - - DEBUG_printf(("3httpPrintf: (" CUPS_LLFMT " bytes) %s", CUPS_LLCAST bytes, buf)); - -- if (http->data_encoding == HTTP_ENCODING_FIELDS) -+ if (bytes > (ssize_t)(sizeof(buf) - 1)) -+ { -+ http->error = ENOMEM; -+ return (-1); -+ } -+ else if (http->data_encoding == HTTP_ENCODING_FIELDS) - return ((int)httpWrite2(http, buf, (size_t)bytes)); - else - { -diff --git a/cups/ipp.c b/cups/ipp.c -index 6fae52a00..1bd59cef1 100644 ---- a/cups/ipp.c -+++ b/cups/ipp.c -@@ -4550,9 +4550,7 @@ ippSetValueTag( - break; - - case IPP_TAG_NAME : -- if (temp_tag != IPP_TAG_KEYWORD && temp_tag != IPP_TAG_URI && -- temp_tag != IPP_TAG_URISCHEME && temp_tag != IPP_TAG_LANGUAGE && -- temp_tag != IPP_TAG_MIMETYPE) -+ if (temp_tag != IPP_TAG_KEYWORD) - return (0); - - (*attr)->value_tag = (ipp_tag_t)(IPP_TAG_NAME | ((*attr)->value_tag & IPP_TAG_CUPS_CONST)); -@@ -4560,10 +4558,7 @@ ippSetValueTag( - - case IPP_TAG_NAMELANG : - case IPP_TAG_TEXTLANG : -- if (value_tag == IPP_TAG_NAMELANG && -- (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD && -- temp_tag != IPP_TAG_URI && temp_tag != IPP_TAG_URISCHEME && -- temp_tag != IPP_TAG_LANGUAGE && temp_tag != IPP_TAG_MIMETYPE)) -+ if (value_tag == IPP_TAG_NAMELANG && (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD)) - return (0); - - if (value_tag == IPP_TAG_TEXTLANG && temp_tag != IPP_TAG_TEXT) -diff --git a/cups/snmp.c b/cups/snmp.c -index 5cefee454..1d9da01f2 100644 ---- a/cups/snmp.c -+++ b/cups/snmp.c -@@ -1233,6 +1233,9 @@ asn1_get_integer( - int value; /* Integer value */ - - -+ if (*buffer >= bufend) -+ return (0); -+ - if (length > sizeof(int)) - { - (*buffer) += length; -@@ -1259,6 +1262,9 @@ asn1_get_length(unsigned char **buffer, /* IO - Pointer in buffer */ - unsigned length; /* Length */ - - -+ if (*buffer >= bufend) -+ return (0); -+ - length = **buffer; - (*buffer) ++; - -@@ -1301,6 +1307,9 @@ asn1_get_oid( - int number; /* OID number */ - - -+ if (*buffer >= bufend) -+ return (0); -+ - valend = *buffer + length; - oidptr = oid; - oidend = oid + oidsize - 1; -@@ -1349,9 +1358,12 @@ asn1_get_packed( - int value; /* Value */ - - -+ if (*buffer >= bufend) -+ return (0); -+ - value = 0; - -- while ((**buffer & 128) && *buffer < bufend) -+ while (*buffer < bufend && (**buffer & 128)) - { - value = (value << 7) | (**buffer & 127); - (*buffer) ++; -@@ -1379,6 +1391,9 @@ asn1_get_string( - char *string, /* I - String buffer */ - size_t strsize) /* I - String buffer size */ - { -+ if (*buffer >= bufend) -+ return (NULL); -+ - if (length > (unsigned)(bufend - *buffer)) - length = (unsigned)(bufend - *buffer); - -@@ -1421,6 +1436,9 @@ asn1_get_type(unsigned char **buffer, /* IO - Pointer in buffer */ - int type; /* Type */ - - -+ if (*buffer >= bufend) -+ return (0); -+ - type = **buffer; - (*buffer) ++; - -diff --git a/scheduler/client.c b/scheduler/client.c -index 923a6e67a..f693e7c49 100644 ---- a/scheduler/client.c -+++ b/scheduler/client.c -@@ -564,6 +564,17 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */ - - cupsdLogClient(con, CUPSD_LOG_DEBUG2, "cupsdReadClient: error=%d, used=%d, state=%s, data_encoding=HTTP_ENCODING_%s, data_remaining=" CUPS_LLFMT ", request=%p(%s), file=%d", httpError(con->http), (int)httpGetReady(con->http), httpStateString(httpGetState(con->http)), httpIsChunked(con->http) ? "CHUNKED" : "LENGTH", CUPS_LLCAST httpGetRemaining(con->http), con->request, con->request ? ippStateString(ippGetState(con->request)) : "", con->file); - -+ if (httpError(con->http) == EPIPE && !httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1) -+ { -+ /* -+ * Connection closed... -+ */ -+ -+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF."); -+ cupsdCloseClient(con); -+ return; -+ } -+ - if (httpGetState(con->http) == HTTP_STATE_GET_SEND || - httpGetState(con->http) == HTTP_STATE_POST_SEND || - httpGetState(con->http) == HTTP_STATE_STATUS) -@@ -573,17 +584,6 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */ - * connection and we need to shut it down... - */ - -- if (!httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1) -- { -- /* -- * Connection closed... -- */ -- -- cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF."); -- cupsdCloseClient(con); -- return; -- } -- - cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on unexpected HTTP read state %s.", httpStateString(httpGetState(con->http))); - cupsdCloseClient(con); - return; -@@ -1950,6 +1950,7 @@ cupsdSendError(cupsd_client_t *con, /* I - Connection */ - strlcpy(location, httpGetField(con->http, HTTP_FIELD_LOCATION), sizeof(location)); - - httpClearFields(con->http); -+ httpClearCookie(con->http); - - httpSetField(con->http, HTTP_FIELD_LOCATION, location); - --- -2.21.0 - diff --git a/SOURCES/0001-Printing-to-old-CUPS-servers-has-been-fixed-Issue-52.patch b/SOURCES/0001-Printing-to-old-CUPS-servers-has-been-fixed-Issue-52.patch deleted file mode 100644 index de7ef28..0000000 --- a/SOURCES/0001-Printing-to-old-CUPS-servers-has-been-fixed-Issue-52.patch +++ /dev/null @@ -1,562 +0,0 @@ -diff --git a/cups/cups-private.h b/cups/cups-private.h -index 6fd66a9..1f66fd7 100644 ---- a/cups/cups-private.h -+++ b/cups/cups-private.h -@@ -237,13 +237,9 @@ extern void _cupsBufferRelease(char *b); - - extern http_t *_cupsConnect(void); - extern char *_cupsCreateDest(const char *name, const char *info, const char *device_id, const char *device_uri, char *uri, size_t urisize); --extern int _cupsGet1284Values(const char *device_id, -- cups_option_t **values); --extern const char *_cupsGetDestResource(cups_dest_t *dest, char *resource, -- size_t resourcesize); --extern int _cupsGetDests(http_t *http, ipp_op_t op, -- const char *name, cups_dest_t **dests, -- cups_ptype_t type, cups_ptype_t mask); -+extern int _cupsGet1284Values(const char *device_id, cups_option_t **values); -+extern const char *_cupsGetDestResource(cups_dest_t *dest, unsigned flags, char *resource, size_t resourcesize); -+extern int _cupsGetDests(http_t *http, ipp_op_t op, const char *name, cups_dest_t **dests, cups_ptype_t type, cups_ptype_t mask); - extern const char *_cupsGetPassword(const char *prompt); - extern void _cupsGlobalLock(void); - extern _cups_globals_t *_cupsGlobals(void); -@@ -253,13 +249,10 @@ extern const char *_cupsGSSServiceName(void); - # endif /* HAVE_GSSAPI */ - extern int _cupsNextDelay(int current, int *previous); - extern void _cupsSetDefaults(void); --extern void _cupsSetError(ipp_status_t status, const char *message, -- int localize); -+extern void _cupsSetError(ipp_status_t status, const char *message, int localize); - extern void _cupsSetHTTPError(http_status_t status); - # ifdef HAVE_GSSAPI --extern int _cupsSetNegotiateAuthString(http_t *http, -- const char *method, -- const char *resource); -+extern int _cupsSetNegotiateAuthString(http_t *http, const char *method, const char *resource); - # endif /* HAVE_GSSAPI */ - extern char *_cupsUserDefault(char *name, size_t namesize); - -diff --git a/cups/dest-options.c b/cups/dest-options.c -index 51705a5..cfa28ce 100644 ---- a/cups/dest-options.c -+++ b/cups/dest-options.c -@@ -572,6 +572,7 @@ cupsCopyDestInfo( - cups_dest_t *dest) /* I - Destination */ - { - cups_dinfo_t *dinfo; /* Destination information */ -+ unsigned dflags; /* Destination flags */ - ipp_t *request, /* Get-Printer-Attributes request */ - *response; /* Supported attributes */ - int tries, /* Number of tries so far */ -@@ -581,6 +582,7 @@ cupsCopyDestInfo( - char resource[1024]; /* Resource path */ - int version; /* IPP version */ - ipp_status_t status; /* Status of request */ -+ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */ - static const char * const requested_attrs[] = - { /* Requested attributes */ - "job-template", -@@ -589,14 +591,25 @@ cupsCopyDestInfo( - }; - - -- DEBUG_printf(("cupsCopyDestSupported(http=%p, dest=%p(%s))", (void *)http, (void *)dest, dest ? dest->name : "")); -+ DEBUG_printf(("cupsCopyDestInfo(http=%p, dest=%p(%s))", (void *)http, (void *)dest, dest ? dest->name : "")); - - /* - * Get the default connection as needed... - */ - - if (!http) -- http = _cupsConnect(); -+ { -+ http = _cupsConnect(); -+ dflags = CUPS_DEST_FLAGS_NONE; -+ } -+#ifdef AF_LOCAL -+ else if (strcmp(http->hostname, cg->server) || (httpAddrFamily(http->hostaddr) != AF_LOCAL && cg->ipp_port != httpAddrPort(http->hostaddr))) -+#else -+ else if (strcmp(http->hostname, cg->server) || cg->ipp_port != httpAddrPort(http->hostaddr)) -+#endif /* AF_LOCAL */ -+ dflags = CUPS_DEST_FLAGS_DEVICE; -+ else -+ dflags = CUPS_DEST_FLAGS_NONE; - - /* - * Range check input... -@@ -609,8 +622,11 @@ cupsCopyDestInfo( - * Get the printer URI and resource path... - */ - -- if ((uri = _cupsGetDestResource(dest, resource, sizeof(resource))) == NULL) -+ if ((uri = _cupsGetDestResource(dest, dflags, resource, sizeof(resource))) == NULL) -+ { -+ DEBUG_puts("1cupsCopyDestInfo: Unable to get resource."); - return (NULL); -+ } - - /* - * Get the supported attributes... -@@ -628,28 +644,25 @@ cupsCopyDestInfo( - */ - - request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); -- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, -- uri); -- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, -- "requesting-user-name", NULL, cupsUser()); -- ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, -- "requested-attributes", -- (int)(sizeof(requested_attrs) / sizeof(requested_attrs[0])), -- NULL, requested_attrs); -+ -+ ippSetVersion(request, version / 10, version % 10); -+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); -+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser()); -+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (int)(sizeof(requested_attrs) / sizeof(requested_attrs[0])), NULL, requested_attrs); - response = cupsDoRequest(http, request, resource); - status = cupsLastError(); - - if (status > IPP_STATUS_OK_IGNORED_OR_SUBSTITUTED) - { -- DEBUG_printf(("cupsCopyDestSupported: Get-Printer-Attributes for '%s' " -- "returned %s (%s)", dest->name, ippErrorString(status), -- cupsLastErrorString())); -+ DEBUG_printf(("1cupsCopyDestInfo: Get-Printer-Attributes for '%s' returned %s (%s)", dest->name, ippErrorString(status), cupsLastErrorString())); - - ippDelete(response); - response = NULL; - -- if (status == IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED && version > 11) -+ if ((status == IPP_STATUS_ERROR_BAD_REQUEST || status == IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED) && version > 11) -+ { - version = 11; -+ } - else if (status == IPP_STATUS_ERROR_BUSY) - { - sleep((unsigned)delay); -@@ -665,7 +678,10 @@ cupsCopyDestInfo( - while (!response && tries < 10); - - if (!response) -+ { -+ DEBUG_puts("1cupsCopyDestInfo: Unable to get printer attributes."); - return (NULL); -+ } - - /* - * Allocate a cups_dinfo_t structure and return it... -@@ -678,6 +694,8 @@ cupsCopyDestInfo( - return (NULL); - } - -+ DEBUG_printf(("1cupsCopyDestInfo: version=%d, uri=\"%s\", resource=\"%s\".", version, uri, resource)); -+ - dinfo->version = version; - dinfo->uri = uri; - dinfo->resource = _cupsStrAlloc(resource); -diff --git a/cups/dest.c b/cups/dest.c -index 57a8dc9..3537572 100644 ---- a/cups/dest.c -+++ b/cups/dest.c -@@ -1103,13 +1103,16 @@ cupsGetDest(const char *name, /* I - Destination name or @code NULL@ for the d - * '_cupsGetDestResource()' - Get the resource path and URI for a destination. - */ - --const char * /* O - Printer URI */ -+const char * /* O - URI */ - _cupsGetDestResource( - cups_dest_t *dest, /* I - Destination */ -+ unsigned flags, /* I - Destination flags */ - char *resource, /* I - Resource buffer */ - size_t resourcesize) /* I - Size of resource buffer */ - { -- const char *uri; /* Printer URI */ -+ const char *uri, /* URI */ -+ *device_uri, /* Device URI */ -+ *printer_uri; /* Printer URI */ - char scheme[32], /* URI scheme */ - userpass[256], /* Username and password (unused) */ - hostname[256]; /* Hostname */ -@@ -1132,25 +1135,46 @@ _cupsGetDestResource( - } - - /* -- * Grab the printer URI... -+ * Grab the printer and device URIs... - */ - -- if ((uri = cupsGetOption("printer-uri-supported", dest->num_options, dest->options)) == NULL) -+ device_uri = cupsGetOption("device-uri", dest->num_options, dest->options); -+ printer_uri = cupsGetOption("printer-uri-supported", dest->num_options, dest->options); -+ -+ DEBUG_printf(("1_cupsGetDestResource: device-uri=\"%s\", printer-uri-supported=\"%s\".", device_uri, printer_uri)); -+ -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if (((flags & CUPS_DEST_FLAGS_DEVICE) || !printer_uri) && strstr(device_uri, "._tcp")) - { -- if ((uri = cupsGetOption("device-uri", dest->num_options, dest->options)) != NULL) -+ if ((device_uri = cups_dnssd_resolve(dest, device_uri, 5000, NULL, NULL, NULL)) != NULL) - { --#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -- if (strstr(uri, "._tcp")) -- uri = cups_dnssd_resolve(dest, uri, 5000, NULL, NULL, NULL); --#endif /* HAVE_DNSSD || HAVE_AVAHI */ -+ DEBUG_printf(("1_cupsGetDestResource: Resolved device-uri=\"%s\".", device_uri)); - } -- -- if (uri) -+ else - { -- DEBUG_printf(("1_cupsGetDestResource: Resolved printer-uri-supported=\"%s\"", uri)); -+ DEBUG_puts("1_cupsGetDestResource: Unable to resolve device."); - -- uri = _cupsCreateDest(dest->name, cupsGetOption("printer-info", dest->num_options, dest->options), NULL, uri, resource, resourcesize); -+ if (resource) -+ *resource = '\0'; -+ -+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOENT), 0); -+ -+ return (NULL); - } -+ } -+#endif /* HAVE_DNSSD || HAVE_AVAHI */ -+ -+ if (flags & CUPS_DEST_FLAGS_DEVICE) -+ { -+ uri = device_uri; -+ } -+ else if (printer_uri) -+ { -+ uri = printer_uri; -+ } -+ else -+ { -+ uri = _cupsCreateDest(dest->name, cupsGetOption("printer-info", dest->num_options, dest->options), NULL, device_uri, resource, resourcesize); - - if (uri) - { -@@ -1160,30 +1184,24 @@ _cupsGetDestResource( - - uri = cupsGetOption("printer-uri-supported", dest->num_options, dest->options); - } -- else -- { -- DEBUG_puts("1_cupsGetDestResource: No printer-uri-supported found."); -+ } - -- if (resource) -- *resource = '\0'; -+ if (!uri) -+ { -+ DEBUG_puts("1_cupsGetDestResource: No printer-uri-supported or device-uri found."); - -- _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOENT), 0); -+ if (resource) -+ *resource = '\0'; - -- return (NULL); -- } -+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOENT), 0); -+ -+ return (NULL); - } -- else -+ else if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, (int)resourcesize) < HTTP_URI_STATUS_OK) - { -- DEBUG_printf(("1_cupsGetDestResource: printer-uri-supported=\"%s\"", uri)); -+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad URI."), 1); - -- if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), -- userpass, sizeof(userpass), hostname, sizeof(hostname), -- &port, resource, (int)resourcesize) < HTTP_URI_STATUS_OK) -- { -- _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad printer-uri."), 1); -- -- return (NULL); -- } -+ return (NULL); - } - - DEBUG_printf(("1_cupsGetDestResource: resource=\"%s\"", resource)); -diff --git a/cups/testdest.c b/cups/testdest.c -index c5c2052..27060f6 100644 ---- a/cups/testdest.c -+++ b/cups/testdest.c -@@ -43,9 +43,12 @@ int /* O - Exit status */ - main(int argc, /* I - Number of command-line arguments */ - char *argv[]) /* I - Command-line arguments */ - { -+ int i; /* Looping var */ - http_t *http; /* Connection to destination */ - cups_dest_t *dest = NULL; /* Destination */ - cups_dinfo_t *dinfo; /* Destination info */ -+ unsigned dflags = CUPS_DEST_FLAGS_NONE; -+ /* Destination flags */ - - - if (argc < 2) -@@ -103,9 +106,17 @@ main(int argc, /* I - Number of command-line arguments */ - - return (0); - } -- else if (!strncmp(argv[1], "ipp://", 6) || !strncmp(argv[1], "ipps://", 7)) -- dest = cupsGetDestWithURI(NULL, argv[1]); -- else if (!strcmp(argv[1], "default")) -+ -+ i = 1; -+ if (!strcmp(argv[i], "--device")) -+ { -+ dflags = CUPS_DEST_FLAGS_DEVICE; -+ i ++; -+ } -+ -+ if (!strncmp(argv[i], "ipp://", 6) || !strncmp(argv[i], "ipps://", 7)) -+ dest = cupsGetDestWithURI(NULL, argv[i]); -+ else if (!strcmp(argv[i], "default")) - { - dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL); - if (dest && dest->instance) -@@ -114,67 +125,70 @@ main(int argc, /* I - Number of command-line arguments */ - printf("default is \"%s\".\n", dest->name); - } - else -- dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, argv[1], NULL); -+ dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, argv[i], NULL); - - if (!dest) - { -- printf("testdest: Unable to get destination \"%s\": %s\n", argv[1], cupsLastErrorString()); -+ printf("testdest: Unable to get destination \"%s\": %s\n", argv[i], cupsLastErrorString()); - return (1); - } - -- if ((http = cupsConnectDest(dest, CUPS_DEST_FLAGS_NONE, 30000, NULL, NULL, 0, NULL, NULL)) == NULL) -+ i ++; -+ -+ if ((http = cupsConnectDest(dest, dflags, 30000, NULL, NULL, 0, NULL, NULL)) == NULL) - { -- printf("testdest: Unable to connect to destination \"%s\": %s\n", argv[1], cupsLastErrorString()); -+ printf("testdest: Unable to connect to destination \"%s\": %s\n", dest->name, cupsLastErrorString()); - return (1); - } - - if ((dinfo = cupsCopyDestInfo(http, dest)) == NULL) - { -- printf("testdest: Unable to get information for destination \"%s\": %s\n", argv[1], cupsLastErrorString()); -+ printf("testdest: Unable to get information for destination \"%s\": %s\n", dest->name, cupsLastErrorString()); - return (1); - } - -- if (argc == 2 || (!strcmp(argv[2], "supported") && argc < 6)) -+ if (i == argc || !strcmp(argv[i], "supported")) - { -- if (argc > 3) -- show_supported(http, dest, dinfo, argv[3], argv[4]); -+ i ++; -+ -+ if ((i + 1) < argc) -+ show_supported(http, dest, dinfo, argv[i], argv[i + 1]); - else if (argc > 2) -- show_supported(http, dest, dinfo, argv[3], NULL); -+ show_supported(http, dest, dinfo, argv[i], NULL); - else - show_supported(http, dest, dinfo, NULL, NULL); - } -- else if (!strcmp(argv[2], "conflicts") && argc > 3) -+ else if (!strcmp(argv[i], "conflicts") && (i + 1) < argc) - { -- int i, /* Looping var */ -- num_options = 0;/* Number of options */ -+ int num_options = 0;/* Number of options */ - cups_option_t *options = NULL;/* Options */ - -- for (i = 3; i < argc; i ++) -+ for (i ++; i < argc; i ++) - num_options = cupsParseOptions(argv[i], num_options, &options); - - show_conflicts(http, dest, dinfo, num_options, options); - } -- else if (!strcmp(argv[2], "default") && argc == 4) -+ else if (!strcmp(argv[i], "default") && (i + 1) < argc) - { -- show_default(http, dest, dinfo, argv[3]); -+ show_default(http, dest, dinfo, argv[i + 1]); - } -- else if (!strcmp(argv[2], "localize") && argc < 6) -+ else if (!strcmp(argv[i], "localize")) - { -- if (argc > 3) -- localize(http, dest, dinfo, argv[3], argv[4]); -+ i ++; -+ if ((i + 1) < argc) -+ localize(http, dest, dinfo, argv[i], argv[i + 1]); - else if (argc > 2) -- localize(http, dest, dinfo, argv[3], NULL); -+ localize(http, dest, dinfo, argv[i], NULL); - else - localize(http, dest, dinfo, NULL, NULL); - } -- else if (!strcmp(argv[2], "media")) -+ else if (!strcmp(argv[i], "media")) - { -- int i; /* Looping var */ - const char *name = NULL; /* Media name, if any */ - unsigned flags = CUPS_MEDIA_FLAGS_DEFAULT; - /* Media selection flags */ - -- for (i = 3; i < argc; i ++) -+ for (i ++; i < argc; i ++) - { - if (!strcmp(argv[i], "borderless")) - flags = CUPS_MEDIA_FLAGS_BORDERLESS; -@@ -192,19 +206,19 @@ main(int argc, /* I - Number of command-line arguments */ - - show_media(http, dest, dinfo, flags, name); - } -- else if (!strcmp(argv[2], "print") && argc > 3) -+ else if (!strcmp(argv[i], "print") && (i + 1) < argc) - { -- int i, /* Looping var */ -- num_options = 0;/* Number of options */ -+ int num_options = 0;/* Number of options */ - cups_option_t *options = NULL;/* Options */ -+ const char *filename = argv[i + 1]; - -- for (i = 4; i < argc; i ++) -+ for (i += 2; i < argc; i ++) - num_options = cupsParseOptions(argv[i], num_options, &options); - -- print_file(http, dest, dinfo, argv[3], num_options, options); -+ print_file(http, dest, dinfo, filename, num_options, options); - } - else -- usage(argv[2]); -+ usage(argv[i]); - - return (0); - } -@@ -740,9 +754,9 @@ usage(const char *arg) /* I - Argument for usage message */ - printf("testdest: Unknown option \"%s\".\n", arg); - - puts("Usage:"); -- puts(" ./testdest name [operation ...]"); -- puts(" ./testdest ipp://... [operation ...]"); -- puts(" ./testdest ipps://... [operation ...]"); -+ puts(" ./testdest [--device] name [operation ...]"); -+ puts(" ./testdest [--device] ipp://... [operation ...]"); -+ puts(" ./testdest [--device] ipps://... [operation ...]"); - puts(" ./testdest --enum [grayscale] [color] [duplex] [staple] [small]\n" - " [medium] [large]"); - puts(""); -diff --git a/test/ippserver.c b/test/ippserver.c -index 38b304f..c593d3a 100644 ---- a/test/ippserver.c -+++ b/test/ippserver.c -@@ -461,6 +461,7 @@ static AvahiClient *DNSSDClient = NULL; - #endif /* HAVE_DNSSD */ - - static int KeepFiles = 0, -+ MaxVersion = 20, - Verbosity = 0; - - -@@ -533,6 +534,23 @@ main(int argc, /* I - Number of command-line args */ - pin = 1; - break; - -+ case 'V' : /* -V max-version */ -+ i ++; -+ if (i >= argc) -+ usage(1); -+ -+ if (!strcmp(argv[i], "2.2")) -+ MaxVersion = 22; -+ else if (!strcmp(argv[i], "2.1")) -+ MaxVersion = 21; -+ else if (!strcmp(argv[i], "2.0")) -+ MaxVersion = 20; -+ else if (!strcmp(argv[i], "1.1")) -+ MaxVersion = 11; -+ else -+ usage(1); -+ break; -+ - case 'a' : /* -a attributes-file */ - i ++; - if (i >= argc) -@@ -1324,9 +1342,10 @@ create_printer(const char *servername, /* I - Server hostname (NULL for default) - }; - static const char * const versions[] =/* ipp-versions-supported values */ - { -- "1.0", - "1.1", -- "2.0" -+ "2.0", -+ "2.1", -+ "2.2" - }; - static const char * const features[] =/* ipp-features-supported values */ - { -@@ -1738,7 +1757,12 @@ create_printer(const char *servername, /* I - Server hostname (NULL for default) - - /* ipp-versions-supported */ - if (!ippFindAttribute(printer->attrs, "ipp-versions-supported", IPP_TAG_ZERO)) -- ippAddStrings(printer->attrs, IPP_TAG_PRINTER, IPP_CONST_TAG(IPP_TAG_KEYWORD), "ipp-versions-supported", sizeof(versions) / sizeof(versions[0]), NULL, versions); -+ { -+ int num_versions = MaxVersion == 11 ? 1 : MaxVersion == 20 ? 2 : MaxVersion == 21 ? 3 : 4; -+ /* Number of supported versions */ -+ -+ ippAddStrings(printer->attrs, IPP_TAG_PRINTER, IPP_CONST_TAG(IPP_TAG_KEYWORD), "ipp-versions-supported", num_versions, NULL, versions); -+ } - - /* job-account-id-default */ - if (!ippFindAttribute(printer->attrs, "job-account-id-default", IPP_TAG_ZERO)) -@@ -5800,15 +5824,24 @@ process_ipp(_ipp_client_t *client) /* I - Client */ - * Return an error, since we only support IPP 1.x and 2.x. - */ - -- respond_ipp(client, IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED, -- "Bad request version number %d.%d.", major, minor); -+ respond_ipp(client, IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED, "Bad request version number %d.%d.", major, minor); -+ } -+ else if ((major * 10 + minor) > MaxVersion) -+ { -+ if (httpGetState(client->http) != HTTP_STATE_POST_SEND) -+ httpFlush(client->http); /* Flush trailing (junk) data */ -+ -+ respond_http(client, HTTP_STATUS_BAD_REQUEST, NULL, NULL, 0); -+ return (0); - } - else if (ippGetRequestId(client->request) <= 0) -- respond_ipp(client, IPP_STATUS_ERROR_BAD_REQUEST, "Bad request-id %d.", -- ippGetRequestId(client->request)); -+ { -+ respond_ipp(client, IPP_STATUS_ERROR_BAD_REQUEST, "Bad request-id %d.", ippGetRequestId(client->request)); -+ } - else if (!ippFirstAttribute(client->request)) -- respond_ipp(client, IPP_STATUS_ERROR_BAD_REQUEST, -- "No attributes in request."); -+ { -+ respond_ipp(client, IPP_STATUS_ERROR_BAD_REQUEST, "No attributes in request."); -+ } - else - { - /* -@@ -6877,8 +6910,7 @@ usage(int status) /* O - Exit status */ - { - if (!status) - { -- puts(CUPS_SVERSION " - Copyright 2010-2015 by Apple Inc. All rights " -- "reserved."); -+ puts(CUPS_SVERSION " - Copyright (c) 2010-2018 by Apple Inc. All rights reserved."); - puts(""); - } - -@@ -6888,6 +6920,7 @@ usage(int status) /* O - Exit status */ - puts("-2 Supports 2-sided printing (default=1-sided)"); - puts("-M manufacturer Manufacturer name (default=Test)"); - puts("-P PIN printing mode"); -+ puts("-V max-version Set maximum supported IPP version"); - puts("-a attributes-file Load printer attributes from file"); - puts("-c command Run command for every print job"); - printf("-d spool-directory Spool directory " diff --git a/SOURCES/0001-Remove-web-log-buttons.patch b/SOURCES/0001-Remove-web-log-buttons.patch deleted file mode 100644 index a19d806..0000000 --- a/SOURCES/0001-Remove-web-log-buttons.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/templates/admin.tmpl b/templates/admin.tmpl -index 101f960..5ebd813 100644 ---- a/templates/admin.tmpl -+++ b/templates/admin.tmpl -@@ -27,9 +27,6 @@ - -

-

--
--
--
-

- - {SETTINGS_ERROR?

{SETTINGS_MESSAGE}

-diff --git a/templates/de/admin.tmpl b/templates/de/admin.tmpl -index fb2851a..f8ddeff 100644 ---- a/templates/de/admin.tmpl -+++ b/templates/de/admin.tmpl -@@ -27,9 +27,6 @@ - -

-

--
--
--
-

- - {SETTINGS_ERROR?

{SETTINGS_MESSAGE}

-diff --git a/templates/es/admin.tmpl b/templates/es/admin.tmpl -index 097c65c..b83b1a0 100644 ---- a/templates/es/admin.tmpl -+++ b/templates/es/admin.tmpl -@@ -27,9 +27,6 @@ - -

-

--
--
--
-

- - {SETTINGS_ERROR?

{SETTINGS_MESSAGE}

-diff --git a/templates/fr/admin.tmpl b/templates/fr/admin.tmpl -index 2fcd9c5..e365ff3 100644 ---- a/templates/fr/admin.tmpl -+++ b/templates/fr/admin.tmpl -@@ -27,9 +27,6 @@ - -

-

--
--
--
-

- - {SETTINGS_ERROR?

{SETTINGS_MESSAGE}

-diff --git a/templates/ja/admin.tmpl b/templates/ja/admin.tmpl -index 13d6f13..f5fa750 100644 ---- a/templates/ja/admin.tmpl -+++ b/templates/ja/admin.tmpl -@@ -27,9 +27,6 @@ - -

-

--
--
--
-

- - {SETTINGS_ERROR?

{SETTINGS_MESSAGE}

-diff --git a/templates/pt_BR/admin.tmpl b/templates/pt_BR/admin.tmpl -index b847bef..e11d889 100644 ---- a/templates/pt_BR/admin.tmpl -+++ b/templates/pt_BR/admin.tmpl -@@ -27,9 +27,6 @@ - -

-

--
--
--
-

- - {SETTINGS_ERROR?

{SETTINGS_MESSAGE}

-diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl -index 49a168c..44b1493 100644 ---- a/templates/ru/admin.tmpl -+++ b/templates/ru/admin.tmpl -@@ -26,9 +26,6 @@ - -

-

--
--
--
-

- - {SETTINGS_ERROR?

{SETTINGS_MESSAGE}

diff --git a/SOURCES/0001-Require-authentication-for-CUPS-Get-Document.patch b/SOURCES/0001-Require-authentication-for-CUPS-Get-Document.patch deleted file mode 100644 index e2852e1..0000000 --- a/SOURCES/0001-Require-authentication-for-CUPS-Get-Document.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a0c8b9c9556882f00c68b9727a95a1b6d1452913 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Tue, 6 Dec 2022 09:04:01 -0500 -Subject: [PATCH] Require authentication for CUPS-Get-Document. - ---- - conf/cupsd.conf.in | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in -index b25884907..a07536f3e 100644 ---- a/conf/cupsd.conf.in -+++ b/conf/cupsd.conf.in -@@ -68,7 +68,13 @@ IdleExitTimeout @EXIT_TIMEOUT@ - Order deny,allow - - -- -+ -+ Require user @OWNER @SYSTEM -+ Order deny,allow -+ -+ -+ -+ AuthType Default - Require user @OWNER @SYSTEM - Order deny,allow - --- -2.41.0 - diff --git a/SOURCES/0001-The-scheduler-could-crash-while-adding-an-IPP-Everyw.patch b/SOURCES/0001-The-scheduler-could-crash-while-adding-an-IPP-Everyw.patch deleted file mode 100644 index e5b9e9e..0000000 --- a/SOURCES/0001-The-scheduler-could-crash-while-adding-an-IPP-Everyw.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/scheduler/ipp.c b/scheduler/ipp.c -index 649995bb5..2396c9b58 100644 ---- a/scheduler/ipp.c -+++ b/scheduler/ipp.c -@@ -4873,6 +4873,8 @@ copy_printer_attrs( - * and document-format attributes that may be provided by the client. - */ - -+ _cupsRWLockRead(&printer->lock); -+ - curtime = time(NULL); - - if (!ra || cupsArrayFind(ra, "marker-change-time")) -@@ -5034,6 +5036,8 @@ copy_printer_attrs( - if (printer->ppd_attrs) - copy_attrs(con->response, printer->ppd_attrs, ra, IPP_TAG_ZERO, 0, NULL); - copy_attrs(con->response, CommonData, ra, IPP_TAG_ZERO, IPP_TAG_COPY, NULL); -+ -+ _cupsRWUnlock(&printer->lock); - } - - diff --git a/SOURCES/0001-Update-man-pages-for-h-option-Issue-357.patch b/SOURCES/0001-Update-man-pages-for-h-option-Issue-357.patch deleted file mode 100644 index c6ec7e5..0000000 --- a/SOURCES/0001-Update-man-pages-for-h-option-Issue-357.patch +++ /dev/null @@ -1,899 +0,0 @@ -From 4d6787bd98c2fac8dcc58f34125d299d82e622aa Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Mon, 2 May 2022 15:35:20 -0400 -Subject: [PATCH] Update man pages for -h option (Issue #357) - ---- - CHANGES.md | 1 + - doc/help/man-cancel.html | 7 ++++--- - doc/help/man-cupsctl.html | 7 ++++--- - doc/help/man-ipptool.html | 6 ++++++ - doc/help/man-lp.html | 9 +++++---- - doc/help/man-lpinfo.html | 9 +++++---- - doc/help/man-lpmove.html | 9 +++++---- - doc/help/man-lpoptions.html | 17 +++++++++-------- - doc/help/man-lpq.html | 5 +++-- - doc/help/man-lpr.html | 5 +++-- - doc/help/man-lprm.html | 6 +++--- - doc/help/man-lpstat.html | 5 +++-- - man/cancel.1 | 9 +++++---- - man/cupsctl.8 | 9 +++++---- - man/lp.1 | 11 ++++++----- - man/lpinfo.8 | 11 ++++++----- - man/lpmove.8 | 11 ++++++----- - man/lpoptions.1 | 19 ++++++++++--------- - man/lpq.1 | 7 ++++--- - man/lpr.1 | 7 ++++--- - man/lprm.1 | 8 ++++---- - man/lpstat.1 | 11 ++++++----- - 22 files changed, 107 insertions(+), 82 deletions(-) - -diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html -index d51bb2b91..a0b52369c 100644 ---- a/doc/help/man-cancel.html -+++ b/doc/help/man-cancel.html -@@ -12,6 +12,9 @@ cancel - cancel jobs -

Synopsis

- cancel - [ -+-h -+hostname[:port] -+] [ - -E - ] [ - -U -@@ -19,9 +22,6 @@ cancel - cancel jobs - ] [ - -a - ] [ ---h --hostname[:port] --] [ - -u - username - ] [ -@@ -46,6 +46,7 @@ destinations if none is provided. -
Forces encryption when connecting to the server. -
-h hostname[:port] -
Specifies an alternate server. -+Note: This option must occur before all others. -
-U username -
Specifies the username to use when connecting to the server. -
-u username -diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html -index b3f892ef9..e5c98dccb 100644 ---- a/doc/help/man-cupsctl.html -+++ b/doc/help/man-cupsctl.html -@@ -12,14 +12,14 @@ cupsctl - configure cupsd.conf options -

Synopsis

- cupsctl - [ -+-h -+server[:port] -+] [ - -E - ] [ - -U - username - ] [ ---h --server[:port] --] [ - --[no-]debug-logging - ] [ - --[no-]remote-admin -@@ -45,6 +45,7 @@ The following options are recognized: -
Specifies an alternate username to use when authenticating with the scheduler. -
-h server[:port] -
Specifies the server address. -+Note: This option must occur before all others. -
--[no-]debug-logging -
Enables (disables) debug logging to the error_log file. -
--[no-]remote-admin -diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html -index 81f67d77f..688454c69 100644 ---- a/doc/help/man-ipptool.html -+++ b/doc/help/man-ipptool.html -@@ -59,6 +59,8 @@ ipptool - perform internet printing protocol requests - -i - seconds - ] [ -+-j -+] [ - -n - repeat-count - ] [ -@@ -150,6 +152,10 @@ This option is incompatible with the -i (interval) and -n (repeat- - testfile - should be repeated at the specified interval. - This option is incompatible with the -X (XML plist output) option. -+
-j -+
Specifies that -+ipptool -+will produce JSON output. -
-l -
Specifies that plain text output is desired. -
-n repeat-count -diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html -index f70c088d3..6442e900d 100644 ---- a/doc/help/man-lp.html -+++ b/doc/help/man-lp.html -@@ -12,6 +12,8 @@ lp - print files -

Synopsis

- lp - [ -+-h hostname[:port] -+] [ - -E - ] [ - -U -@@ -21,8 +23,6 @@ lp - print files - ] [ - -d destination[/instance] - ] [ ---h hostname[:port] --] [ - -m - ] [ - -n -@@ -51,6 +51,8 @@ lp - print files -
- lp - [ -+-h hostname[:port] -+] [ - -E - ] [ - -U -@@ -58,8 +60,6 @@ lp - print files - ] [ - -c - ] [ ---h hostname[:port] --] [ - -i - job-id - ] [ -@@ -106,6 +106,7 @@ In CUPS, print files are always sent to the scheduler via IPP which has the same -
Prints files to the named printer. -
-h hostname[:port] -
Chooses an alternate server. -+Note: This option must occur before all others. -
-i job-id -
Specifies an existing job to modify. -
-m -diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html -index a1aed9421..30df7691c 100644 ---- a/doc/help/man-lpinfo.html -+++ b/doc/help/man-lpinfo.html -@@ -12,10 +12,10 @@ lpinfo - show available devices or drivers (deprecated) -

Synopsis

- lpinfo - [ ---E --] [ - -h server[:port] - ] [ -+-E -+] [ - -l - ] [ - --device-id -@@ -40,10 +40,10 @@ lpinfo - show available devices or drivers (deprecated) -
- lpinfo - [ ---E --] [ - -h server[:port] - ] [ -+-E -+] [ - -l - ] [ - --exclude-schemes -@@ -66,6 +66,7 @@ The first form (-m) lists the available drivers, while the second form (< -
Forces encryption when connecting to the server. -
-h server[:port] -
Selects an alternate server. -+Note: This option must occur before all others. -
-l -
Shows a "long" listing of devices or drivers. -
--device-id device-id-string -diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html -index d8019ee25..b0db753f9 100644 ---- a/doc/help/man-lpmove.html -+++ b/doc/help/man-lpmove.html -@@ -12,10 +12,10 @@ lpmove - move a job or all jobs to a new destination -

Synopsis

- lpmove - [ ---E --] [ - -h server[:port] - ] [ -+-E -+] [ - -U - username - ] -@@ -24,10 +24,10 @@ lpmove - move a job or all jobs to a new destination -
- lpmove - [ ---E --] [ - -h server[:port] - ] [ -+-E -+] [ - -U - username - ] -@@ -44,6 +44,7 @@ The lpmove command supports the following options: -
Specifies an alternate username. -
-h server[:port] -
Specifies an alternate server. -+Note: This option must occur before all others. - -

Examples

- Move job 123 from "oldprinter" to "newprinter": -diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html -index 6dda87f64..6af78290b 100644 ---- a/doc/help/man-lpoptions.html -+++ b/doc/help/man-lpoptions.html -@@ -12,12 +12,12 @@ -

Synopsis

- lpoptions - [ ---E --] [ ---U --username --] [ - -h server[:port] -+] [ -+-E -+] [ -+-U -+username - ] - -d destination[/instance] - [ -@@ -26,26 +26,26 @@ -
- lpoptions - [ ---E --] [ ---U --username --] [ - -h server[:port] - ] [ -+-E -+] [ -+-U -+username -+] [ - -p destination[/instance] - ] - -o option[=value] ... -
- lpoptions - [ ---E --] [ ---U --username --] [ - -h server[:port] - ] [ -+-E -+] [ -+-U -+username -+] [ - -p destination[/instance] - ] - -r -@@ -53,12 +53,12 @@ -
- lpoptions - [ ---E --] [ ---U --username --] [ - -h server[:port] -+] [ -+-E -+] [ -+-U -+username - ] - -x destination[/instance] -

Description

-@@ -84,6 +84,7 @@ - This option overrides the system default printer for the current user. -
-h server[:port] -
Uses an alternate server. -+Note: This option must occur before all others. -
-l -
Lists the printer specific options and their current settings. -
-o option[=value] -@@ -119,7 +120,7 @@ - lprm(1), - CUPS Online Help (http://localhost:631/help) -

Copyright

--Copyright © 2007-2017 by Apple Inc. -+Copyright © 2021-2022 by OpenPrinting. - - - -diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html -index 1c9e704ff..19e536d3c 100644 ---- a/doc/help/man-lpq.html -+++ b/doc/help/man-lpq.html -@@ -12,13 +12,13 @@ lpq - show printer queue status -

Synopsis

- lpq - [ -+-h server[:port] -+] [ - -E - ] [ - -U - username - ] [ ---h server[:port] --] [ - -P destination[/instance] - ] [ - -a -@@ -44,6 +44,7 @@ Jobs queued on the default destination will be shown if no printer or class is s -
Reports jobs on all printers. -
-h server[:port] -
Specifies an alternate server. -+Note: This option must occur before all others. -
-l -
Requests a more verbose (long) reporting format. - -diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html -index d044ab1a8..f9b19e1fe 100644 ---- a/doc/help/man-lpr.html -+++ b/doc/help/man-lpr.html -@@ -12,10 +12,10 @@ lpr - print files -

Synopsis

- lpr - [ ---E --] [ - -H server[:port] - ] [ -+-E -+] [ - -U - username - ] [ -@@ -67,6 +67,7 @@ The following options are recognized by lpr: -
Forces encryption when connecting to the server. -
-H server[:port] -
Specifies an alternate server. -+Note: This option must occur before all others. -
-C "name" -
-J "name" -
-T "name" -diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html -index 7410320a3..dbe7f20de 100644 ---- a/doc/help/man-lprm.html -+++ b/doc/help/man-lprm.html -@@ -12,14 +12,13 @@ lprm - cancel print jobs -

Synopsis

- lprm - [ -+-h hostname[:port] -+] [ - -E - ] [ - -U - username - ] [ ---h --server[:port] --] [ - -P - destination[/instance] - ] [ -@@ -45,6 +44,7 @@ command supports the following options: -
Specifies an alternate username. -
-h server[:port] -
Specifies an alternate server. -+Note: This option must occur before all others. - -

Conforming To

- The CUPS version of -diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html -index f23089bbe..2c5dedc7c 100644 ---- a/doc/help/man-lpstat.html -+++ b/doc/help/man-lpstat.html -@@ -12,6 +12,8 @@ lpstat - print cups status information -

Synopsis

- lpstat - [ -+-h hostname[:port] -+] [ - -E - ] [ - -H -@@ -19,8 +21,6 @@ lpstat - print cups status information - -U - username - ] [ ---h hostname[:port] --] [ - -l - ] [ - -W -@@ -91,6 +91,7 @@ If no classes are specified then all classes are listed. -
Shows all available destinations on the local network. -
-h server[:port] -
Specifies an alternate server. -+Note: This option must occur before all others. -
-l -
Shows a long listing of printers, classes, or jobs. -
-o [destination(s)] -diff --git a/man/cancel.man b/man/cancel.man -index 34a5d9fc0..caea0ed69 100644 ---- a/man/cancel.man -+++ b/man/cancel.man -@@ -10,12 +10,15 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH cancel 1 "CUPS" "15 April 2014" "Apple Inc." -+.TH cancel 1 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - cancel \- cancel jobs - .SH SYNOPSIS - .B cancel - [ -+.B \-h -+.I hostname[:port] -+] [ - .B \-E - ] [ - .B \-U -@@ -23,9 +26,6 @@ - ] [ - .B \-a - ] [ --.B \-h --.I hostname[:port] --] [ - .B \-u - .I username - ] [ -@@ -52,6 +52,7 @@ - .TP 5 - \fB\-h \fIhostname\fR[\fI:port\fR] - Specifies an alternate server. -+Note: This option must occur before all others. - .TP 5 - \fB\-U \fIusername\fR - Specifies the username to use when connecting to the server. -diff --git a/man/cupsctl.man b/man/cupsctl.man -index 1b1ff4183..7e50d07ac 100644 ---- a/man/cupsctl.man -+++ b/man/cupsctl.man -@@ -10,20 +10,20 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH cupsctl 8 "CUPS" "30 May 2016" "Apple Inc." -+.TH cupsctl 8 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - cupsctl \- configure cupsd.conf options - .SH SYNOPSIS - .B cupsctl - [ -+.B \-h -+\fIserver\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-U - .I username - ] [ --.B \-h --\fIserver\fR[\fB:\fIport\fR] --] [ - \fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR - ] [ - \fB\-\-\fR[\fBno\-\fR]\fBremote\-admin\fR -@@ -51,6 +51,7 @@ - .TP 5 - \fB\-h \fIserver\fR[\fB:\fIport\fR] - Specifies the server address. -+Note: This option must occur before all others. - .TP 5 - \fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR - Enables (disables) debug logging to the \fIerror_log\fR file. -diff --git a/man/lp.man b/man/lp.man -index a54f904a5..4bdd2de7b 100644 ---- a/man/lp.man -+++ b/man/lp.man -@@ -10,12 +10,14 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH lp 1 "CUPS" "2 May 2016" "Apple Inc." -+.TH lp 1 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - lp \- print files - .SH SYNOPSIS - .B lp - [ -+\fB\-h \fIhostname\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-U -@@ -25,8 +27,6 @@ - ] [ - \fB\-d \fIdestination\fR[\fB/\fIinstance\fR] - ] [ --\fB\-h \fIhostname\fR[\fB:\fIport\fR] --] [ - .B \-m - ] [ - .B \-n -@@ -55,6 +55,8 @@ - .br - .B lp - [ -+\fB\-h \fIhostname\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-U -@@ -62,8 +64,6 @@ - ] [ - .B \-c - ] [ --\fB\-h \fIhostname\fR[\fB:\fIport\fR] --] [ - .B \-i - .I job-id - ] [ -@@ -115,6 +115,7 @@ - .TP 5 - \fB\-h \fIhostname\fR[\fB:\fIport\fR] - Chooses an alternate server. -+Note: This option must occur before all others. - .TP 5 - \fB\-i \fIjob-id\fR - Specifies an existing job to modify. -diff --git a/man/lpinfo.man b/man/lpinfo.man -index d238f9a60..d44b568d2 100644 ---- a/man/lpinfo.man -+++ b/man/lpinfo.man -@@ -10,16 +10,16 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH lpinfo 8 "CUPS" "12 June 2014" "Apple Inc." -+.TH lpinfo 8 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - lpinfo \- show available devices or drivers - .SH SYNOPSIS - .B lpinfo - [ --.B \-E --] [ - \fB\-h \fIserver\fR[\fB:\fIport\fR] - ] [ -+.B \-E -+] [ - .B \-l - ] [ - .B \-\-device\-id -@@ -44,10 +44,10 @@ - .br - .B lpinfo - [ --.B \-E --] [ - \fB\-h \fIserver\fR[\fB:\fIport\fR] - ] [ -+.B \-E -+] [ - .B \-l - ] [ - .B \-\-exclude\-schemes -@@ -71,6 +71,7 @@ - .TP 5 - \fB\-h \fIserver\fR[\fB:\fIport\fR] - Selects an alternate server. -+Note: This option must occur before all others. - .TP 5 - .B \-l - Shows a "long" listing of devices or drivers. -diff --git a/man/lpmove.man b/man/lpmove.man -index af3c6b63c..62adba654 100644 ---- a/man/lpmove.man -+++ b/man/lpmove.man -@@ -10,16 +10,16 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH lpmove 8 "CUPS" "26 May 2016" "Apple Inc." -+.TH lpmove 8 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - lpmove \- move a job or all jobs to a new destination - .SH SYNOPSIS - .B lpmove - [ --.B \-E --] [ - \fB\-h \fIserver\fR[\fB:\fIport\fR] - ] [ -+.B \-E -+] [ - .B \-U - .I username - ] -@@ -28,10 +28,10 @@ - .br - .B lpmove - [ --.B \-E --] [ - \fB\-h \fIserver\fR[\fB:\fIport\fR] - ] [ -+.B \-E -+] [ - .B \-U - .I username - ] -@@ -50,6 +50,7 @@ - .TP 5 - \fB\-h \fIserver\fR[\fB:\fIport\fR] - Specifies an alternate server. -+Note: This option must occur before all others. - .SH EXAMPLES - Move job 123 from "oldprinter" to "newprinter": - .nf -diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in -index 372f46a37..2eb5b6010 100644 ---- a/man/lpoptions.man.in -+++ b/man/lpoptions.man.in -@@ -10,18 +10,18 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH lpoptions 1 "CUPS" "12 June 2014" "Apple Inc." -+.TH lpoptions 1 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - lpoptions \- display or set printer options and defaults - .SH SYNOPSIS - .B lpoptions - [ -+\fB\-h \fIserver\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-U - .I username --] [ --\fB\-h \fIserver\fR[\fB:\fIport\fR] - ] - \fB\-d \fIdestination\fR[\fB/\fIinstance\fR] - [ -@@ -30,13 +30,13 @@ - .br - .B lpoptions - [ -+\fB\-h \fIserver\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-U - .I username - ] [ --\fB\-h \fIserver\fR[\fB:\fIport\fR] --] [ - \fB\-p \fIdestination\fR[\fB/\fIinstance\fR] - ] - \fB\-o \fIoption\fR[\fB=\fIvalue\fR] ... -@@ -43,13 +43,13 @@ - .br - .B lpoptions - [ -+\fB\-h \fIserver\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-U - .I username - ] [ --\fB\-h \fIserver\fR[\fB:\fIport\fR] --] [ - \fB\-p \fIdestination\fR[\fB/\fIinstance\fR] - ] - .B \-r -@@ -57,12 +57,12 @@ - .br - .B lpoptions - [ -+\fB\-h \fIserver\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-U - .I username --] [ --\fB\-h \fIserver\fR[\fB:\fIport\fR] - ] - \fB\-x \fIdestination\fR[\fB/\fIinstance\fR] - .SH DESCRIPTION -@@ -96,6 +96,7 @@ - .TP 5 - \fB\-h \fIserver\fR[\fB:\fIport\fR] - Uses an alternate server. -+Note: This option must occur before all others. - .TP 5 - .B \-l - Lists the printer specific options and their current settings. -diff --git a/man/lpq.man b/man/lpq.man -index ce23a6c81..a81633ecb 100644 ---- a/man/lpq.man -+++ b/man/lpq.man -@@ -10,19 +10,19 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH lpq 1 "CUPS" "12 June 2014" "Apple Inc." -+.TH lpq 1 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - lpq \- show printer queue status - .SH SYNOPSIS - .B lpq - [ -+\fB\-h \fIserver\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-U - .I username - ] [ --\fB\-h \fIserver\fR[\fB:\fIport\fR] --] [ - \fB\-P \fIdestination\fR[\fB/\fIinstance\fR] - ] [ - .B \-a -@@ -53,6 +53,7 @@ - .TP 5 - \fB\-h \fIserver\fR[\fB:\fIport\fR] - Specifies an alternate server. -+Note: This option must occur before all others. - .TP 5 - .B \-l - Requests a more verbose (long) reporting format. -diff --git a/man/lpr.man b/man/lpr.man -index e5f9f9018..77a62b305 100644 ---- a/man/lpr.man -+++ b/man/lpr.man -@@ -10,16 +10,16 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH lpr 1 "CUPS" "2 May 2016" "Apple Inc." -+.TH lpr 1 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - lpr \- print files - .SH SYNOPSIS - .B lpr - [ --.B \-E --] [ - \fB\-H \fIserver\fR[\fB:\fIport\fR] - ] [ -+.B \-E -+] [ - .B \-U - .I username - ] [ -@@ -72,6 +72,7 @@ - .TP 5 - \fB\-H \fIserver\fR[\fB:\fIport\fR] - Specifies an alternate server. -+Note: This option must occur before all others. - .TP 5 - \fB\-C "\fIname\fB"\fR - .TP 5 -diff --git a/man/lprm.man b/man/lprm.man -index 094166539..0cf88ac51 100644 ---- a/man/lprm.man -+++ b/man/lprm.man -@@ -10,20 +10,19 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH lprm 1 "CUPS" "22 May 2014" "Apple Inc." -+.TH lprm 1 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - lprm \- cancel print jobs - .SH SYNOPSIS - .B lprm - [ -+\fB\-h \fIhostname\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-U - .I username - ] [ --.B \-h --.IR server [ :port ] --] [ - .B \-P - .IR destination [ /instance ] - ] [ -@@ -52,6 +51,7 @@ - .TP 5 - \fB\-h \fIserver\fR[\fI:port\fR] - Specifies an alternate server. -+Note: This option must occur before all others. - .SH CONFORMING TO - The CUPS version of - .B lprm -diff --git a/man/lpstat.man b/man/lpstat.man -index 0a10cd9bc..88acff7b3 100644 ---- a/man/lpstat.man -+++ b/man/lpstat.man -@@ -1,8 +1,8 @@ - .\" - .\" lpstat man page for CUPS. - .\" --.\" Copyright 2007-2017 by Apple Inc. --.\" Copyright 1997-2006 by Easy Software Products. -+.\" Copyright © 2007-2019 by Apple Inc. -+.\" Copyright © 1997-2006 by Easy Software Products. - .\" - .\" These coded instructions, statements, and computer programs are the - .\" property of Apple Inc. and are protected by Federal copyright -@@ -10,12 +10,14 @@ - .\" which should have been included with this file. If this file is - .\" file is missing or damaged, see the license at "http://www.cups.org/". - .\" --.TH lpstat 1 "CUPS" "26 May 2017" "Apple Inc." -+.TH lpstat 1 "CUPS" "2022-05-02" "OpenPrinting" - .SH NAME - lpstat \- print cups status information - .SH SYNOPSIS - .B lpstat - [ -+\fB\-h \fIhostname\fR[\fB:\fIport\fR] -+] [ - .B \-E - ] [ - .B \-H -@@ -23,8 +25,6 @@ - .B \-U - .I username - ] [ --\fB\-h \fIhostname\fR[\fB:\fIport\fR] --] [ - .B \-l - ] [ - .B \-W -@@ -104,6 +104,7 @@ - .TP 5 - \fB\-h \fIserver\fR[\fB:\fIport\fR] - Specifies an alternate server. -+Note: This option must occur before all others. - .TP 5 - .B \-l - Shows a long listing of printers, classes, or jobs. diff --git a/SOURCES/0001-Use-cupsGetNamedDest-for-legacy-printing-APIs-Issue-.patch b/SOURCES/0001-Use-cupsGetNamedDest-for-legacy-printing-APIs-Issue-.patch deleted file mode 100644 index 5e96f57..0000000 --- a/SOURCES/0001-Use-cupsGetNamedDest-for-legacy-printing-APIs-Issue-.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 7271db11d27fe436f0c743bed3be8a5c6f93f2c2 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Mon, 9 Apr 2018 09:50:19 -0400 -Subject: [PATCH] Use cupsGetNamedDest for legacy printing APIs (Issue #5288) - ---- - cups/util.c | 59 +++++----------------------- - xcode/CUPS.xcodeproj/project.pbxproj | 6 ++- - 2 files changed, 15 insertions(+), 50 deletions(-) - -diff --git a/cups/util.c b/cups/util.c -index ebc54d3cf..b15963e9e 100644 ---- a/cups/util.c -+++ b/cups/util.c -@@ -21,19 +22,6 @@ - #endif /* WIN32 || __EMX__ */ - - --/* -- * Enumeration data and callback... -- */ -- --typedef struct _cups_createdata_s --{ -- const char *name; /* Destination name */ -- cups_dest_t *dest; /* Matching destination */ --} _cups_createdata_t; -- --static int cups_create_cb(_cups_createdata_t *data, unsigned flags, cups_dest_t *dest); -- -- - /* - * 'cupsCancelJob()' - Cancel a print job on the default server. - * -@@ -168,7 +156,7 @@ cupsCreateJob( - { - int job_id = 0; /* job-id value */ - ipp_status_t status; /* Create-Job status */ -- _cups_createdata_t data; /* Enumeration data */ -+ cups_dest_t *dest; /* Destination */ - cups_dinfo_t *info; /* Destination information */ - - -@@ -188,12 +176,7 @@ cupsCreateJob( - * Lookup the destination... - */ - -- data.name = name; -- data.dest = NULL; -- -- cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_create_cb, &data); -- -- if (!data.dest) -+ if ((dest = cupsGetNamedDest(http, name, NULL)) == NULL) - { - DEBUG_puts("1cupsCreateJob: Destination not found."); - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOENT), 0); -@@ -205,18 +188,18 @@ cupsCreateJob( - */ - - DEBUG_puts("1cupsCreateJob: Querying destination info."); -- if ((info = cupsCopyDestInfo(http, data.dest)) == NULL) -+ if ((info = cupsCopyDestInfo(http, dest)) == NULL) - { - DEBUG_puts("1cupsCreateJob: Query failed."); -- cupsFreeDests(1, data.dest); -+ cupsFreeDests(1, dest); - return (0); - } - -- status = cupsCreateDestJob(http, data.dest, info, &job_id, title, num_options, options); -+ status = cupsCreateDestJob(http, dest, info, &job_id, title, num_options, options); - DEBUG_printf(("1cupsCreateJob: cupsCreateDestJob returned %04x (%s)", status, ippErrorString(status))); - - cupsFreeDestInfo(info); -- cupsFreeDests(1, data.dest); -+ cupsFreeDests(1, dest); - - /* - * Return the job... -@@ -968,25 +951,3 @@ cupsStartDocument( - return (status); - } - -- --/* -- * 'cups_create_cb()' - Find the destination for printing. -- */ -- --static int /* O - 0 on match */ --cups_create_cb( -- _cups_createdata_t *data, /* I - Data from cupsCreateJob call */ -- unsigned flags, /* I - Enumeration flags */ -- cups_dest_t *dest) /* I - Destination */ --{ -- DEBUG_printf(("2cups_create_cb(data=%p(%s), flags=%08x, dest=%p(%s))", (void *)data, data->name, flags, (void *)dest, dest->name)); -- -- (void)flags; -- -- if (dest->instance || strcasecmp(data->name, dest->name)) -- return (1); -- -- cupsCopyDest(dest, 0, &data->dest); -- -- return (0); --} --- -2.35.1 - diff --git a/SOURCES/0001-Use-purge-job-instead-of-purge-jobs-when-canceling-a.patch b/SOURCES/0001-Use-purge-job-instead-of-purge-jobs-when-canceling-a.patch deleted file mode 100644 index fe5d29e..0000000 --- a/SOURCES/0001-Use-purge-job-instead-of-purge-jobs-when-canceling-a.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c5ad7aaf6c8063a39974c6b4a3cf59b7f912daae Mon Sep 17 00:00:00 2001 -From: Bryan Mason -Date: Tue, 27 Jun 2023 04:18:46 -0700 -Subject: [PATCH 1/2] Use "purge-job" instead of "purge-jobs" when canceling a - single job (#742) - -The command "cancel -x " adds "purge-jobs true" to the Cancel-Job -operation; however, the correct attribute to use for Cancel-job is -"purge-job" (singular), not "purge-jobs" (plural). As a result, job -files are not removed from /var/spool/cups when "cancel -x " is -executed. - -This patch resolves the issue by adding "purge-job" when the IPP -operation is Cancel-Job and "purge-jobs" for other IPP operations -(Purge-Jobs, Cancel-Jobs, and Cancel-My-Jobs) ---- - systemv/cancel.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/systemv/cancel.c b/systemv/cancel.c -index 572f413e1..f5b8e12b5 100644 ---- a/systemv/cancel.c -+++ b/systemv/cancel.c -@@ -260,6 +260,7 @@ main(int argc, /* I - Number of command-line arguments */ - * attributes-natural-language - * printer-uri + job-id *or* job-uri - * [requesting-user-name] -+ * [purge-job] or [purge-jobs] - */ - - request = ippNewRequest(op); -@@ -294,7 +295,12 @@ main(int argc, /* I - Number of command-line arguments */ - "requesting-user-name", NULL, cupsUser()); - - if (purge) -- ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", (char)purge); -+ { -+ if (op == IPP_CANCEL_JOB) -+ ippAddBoolean(request, IPP_TAG_OPERATION, "purge-job", (char)purge); -+ else -+ ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", (char)purge); -+ } - - /* - * Do the request and get back a response... --- -2.41.0 - diff --git a/SOURCES/0001-cgi-bin-ipp-var.c-Use-guest-user-for-Move-Job-when-n.patch b/SOURCES/0001-cgi-bin-ipp-var.c-Use-guest-user-for-Move-Job-when-n.patch deleted file mode 100644 index d2c0716..0000000 --- a/SOURCES/0001-cgi-bin-ipp-var.c-Use-guest-user-for-Move-Job-when-n.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c -index 92f1501..7edc058 100644 ---- a/cgi-bin/ipp-var.c -+++ b/cgi-bin/ipp-var.c -@@ -275,10 +275,7 @@ cgiMoveJobs(http_t *http, /* I - Connection to server */ - */ - - if ((user = getenv("REMOTE_USER")) == NULL) -- { -- puts("Status: 401\n"); -- exit(0); -- } -+ user = "guest"; - - /* - * See if the user has already selected a new destination... diff --git a/SOURCES/0001-cups-dests.c-cupsGetNamedDest-set-IPP_STATUS_ERROR_N.patch b/SOURCES/0001-cups-dests.c-cupsGetNamedDest-set-IPP_STATUS_ERROR_N.patch deleted file mode 100644 index 3d12cc0..0000000 --- a/SOURCES/0001-cups-dests.c-cupsGetNamedDest-set-IPP_STATUS_ERROR_N.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 4ddeb8544e2e5c63a405d9e093ac24704f3deb03 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Tue, 21 Jul 2020 12:54:22 +0200 -Subject: [PATCH] cups/dests.c: cupsGetNamedDest() - set - IPP_STATUS_ERROR_NOT_FOUND error if queue was not found lp.c/lpr.c: check for - IPP_STATUS_ERROR_NOT_FOUND and generate a proper message if hit - ---- - berkeley/lpr.c | 6 ++++++ - cups/dest.c | 3 +++ - systemv/lp.c | 6 ++++++ - 3 files changed, 15 insertions(+) - -diff --git a/berkeley/lpr.c b/berkeley/lpr.c -index 627fa6a4e..a8f78b881 100644 ---- a/berkeley/lpr.c -+++ b/berkeley/lpr.c -@@ -234,6 +234,12 @@ main(int argc, /* I - Number of command-line arguments */ - _cupsLangPrintf(stderr, _("%s: Error - add '/version=1.1' to server name."), argv[0]); - return (1); - } -+ else if (cupsLastError() == IPP_STATUS_ERROR_NOT_FOUND) -+ { -+ _cupsLangPrintf(stderr, -+ _("%s: Error - The printer or class does not exist."), argv[0]); -+ return (1); -+ } - break; - - case '#' : /* Number of copies */ -diff --git a/cups/dest.c b/cups/dest.c -index cde987a09..2017792a7 100644 ---- a/cups/dest.c -+++ b/cups/dest.c -@@ -1839,7 +1839,10 @@ cupsGetNamedDest(http_t *http, /* I - Connection to server or @code CUPS_HTT - cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_name_cb, &data); - - if (!data.dest) -+ { -+ _cupsSetError(IPP_STATUS_ERROR_NOT_FOUND, _("The printer or class does not exist."), 1); - return (NULL); -+ } - - dest = data.dest; - } -diff --git a/systemv/lp.c b/systemv/lp.c -index 298c15825..d918b4b14 100644 ---- a/systemv/lp.c -+++ b/systemv/lp.c -@@ -161,6 +161,12 @@ main(int argc, /* I - Number of command-line arguments */ - "name."), argv[0]); - return (1); - } -+ else if (cupsLastError() == IPP_STATUS_ERROR_NOT_FOUND) -+ { -+ _cupsLangPrintf(stderr, -+ _("%s: Error - The printer or class does not exist."), argv[0]); -+ return (1); -+ } - break; - - case 'f' : /* Form */ --- -2.31.1 - diff --git a/SOURCES/0001-cups-http-addr.c-Set-listen-backlog-size-to-INT_MAX-.patch b/SOURCES/0001-cups-http-addr.c-Set-listen-backlog-size-to-INT_MAX-.patch deleted file mode 100644 index d30c243..0000000 --- a/SOURCES/0001-cups-http-addr.c-Set-listen-backlog-size-to-INT_MAX-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 876fdc1c90a885a58644c8757bc1283c9fd5bcb7 Mon Sep 17 00:00:00 2001 -From: Vasilis Liaskovitis -Date: Wed, 1 Mar 2023 13:46:28 +0100 -Subject: [PATCH] cups/http-addr.c: Set listen backlog size to INT_MAX (fixes - #308) - -Use a listen queue size of INT_MAX, which should default to the maximum -supported queue size on the system. - -This avoids the problem of the listening backlog queue getting full when -there are too many requests at the same time. The problem was observed -with the previous backlog size (128) by customers when submitting large -batches of print jobs, resulting in some jobs getting lost. - -Signed-off-by: Vasilis Liaskovitis ---- - cups/http-addr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cups/http-addr.c b/cups/http-addr.c -index a61ee0449..6aeeb8074 100644 ---- a/cups/http-addr.c -+++ b/cups/http-addr.c -@@ -249,7 +249,7 @@ httpAddrListen(http_addr_t *addr, /* I - Address to bind to */ - * Listen... - */ - -- if (listen(fd, 5)) -+ if (listen(fd, INT_MAX)) - { - _cupsSetHTTPError(HTTP_STATUS_ERROR); - --- -2.41.0 - diff --git a/SOURCES/0001-cups-strlcpy-handle-zero-size.patch b/SOURCES/0001-cups-strlcpy-handle-zero-size.patch deleted file mode 100644 index 45d36ad..0000000 --- a/SOURCES/0001-cups-strlcpy-handle-zero-size.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5e3107e734f06d410a490e8bc923dc3119f17671 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Wed, 17 May 2023 12:59:57 -0400 -Subject: [PATCH] Consensus fix. - ---- - cups/string.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/cups/string.c b/cups/string.c -index 00454203c..b4fc12050 100644 ---- a/cups/string.c -+++ b/cups/string.c -@@ -730,6 +731,9 @@ _cups_strlcpy(char *dst, /* O - Destination string */ - size_t srclen; /* Length of source string */ - - -+ if (size == 0) -+ return (0); -+ - /* - * Figure out how much room is needed... - */ --- -2.40.1 - diff --git a/SOURCES/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch b/SOURCES/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch deleted file mode 100644 index 67e2edc..0000000 --- a/SOURCES/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bdb1ca45454d90410031c4c2054005a995f76180 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Wed, 6 Apr 2022 15:04:45 +0200 -Subject: [PATCH] cups/tls-gnutls.c: Use always GNUTLS_SHUT_WR - -The current mode for `gnutls_bye()` in client use cases strictly -follows TLS v1.2 standard, which in this particular part says: - -``` -Unless some other fatal alert has been transmitted, each party is -required to send a close_notify alert before closing the write -side of the connection. The other party MUST respond with a -close_notify alert of its own and close down the connection immediately, -discarding any pending writes. It is not required for the initiator -of the close to wait for the responding close_notify alert before -closing the read side of the connection. -``` - -and waits for the other side of TLS connection to confirm the close. - -Unfortunately it can undesired for reasons: -- we support switching of TLS versions in CUPS, and this mode strictly - follows TLS v1.2 - so for older version this behavior is not expected - and can cause delays -- even some TLS v1.2 implementations (like Windows Server 2016) don't - comply TLS v1.2 behavior even if it says it does - in that case, - encrypted printing takes 30s till HTTP timeout is reached, because the - other side didn't send confirmation -- AFAIU openssl's SSL_shutdown() doesn't make this TLS v1.2 difference, - so we could end up with two TLS implementations in CUPS which will - behave differently - -Since the standard defines that waiting for confirmation is not required -and due the problems above, I would propose using GNUTLS_SHUT_WR mode -regardless of HTTP mode. ---- - cups/tls-gnutls.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c -index c55995b2b..f87b4f4df 100644 ---- a/cups/tls-gnutls.c -+++ b/cups/tls-gnutls.c -@@ -1667,7 +1667,7 @@ _httpTLSStop(http_t *http) /* I - Connection to server */ - int error; /* Error code */ - - -- error = gnutls_bye(http->tls, http->mode == _HTTP_MODE_CLIENT ? GNUTLS_SHUT_RDWR : GNUTLS_SHUT_WR); -+ error = gnutls_bye(http->tls, GNUTLS_SHUT_WR); - if (error != GNUTLS_E_SUCCESS) - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gnutls_strerror(errno), 0); - --- -2.35.1 - diff --git a/SOURCES/0001-httpAddrConnect2-Check-for-error-if-POLLHUP-is-in-va.patch b/SOURCES/0001-httpAddrConnect2-Check-for-error-if-POLLHUP-is-in-va.patch deleted file mode 100644 index a280b4f..0000000 --- a/SOURCES/0001-httpAddrConnect2-Check-for-error-if-POLLHUP-is-in-va.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up cups-2.2.6/cups/http-addrlist.c.cupsgetjobs-pollhup cups-2.2.6/cups/http-addrlist.c ---- cups-2.2.6/cups/http-addrlist.c.cupsgetjobs-pollhup 2023-12-19 18:25:15.484637450 +0100 -+++ cups-2.2.6/cups/http-addrlist.c 2023-12-19 18:28:57.129163387 +0100 -@@ -313,6 +313,39 @@ httpAddrConnect2( - { - # ifdef HAVE_POLL - DEBUG_printf(("pfds[%d].revents=%x\n", i, pfds[i].revents)); -+ -+# ifdef _WIN32 -+ if (((WSAGetLastError() == WSAEINPROGRESS) && (pfds[i].revents & POLLIN) && (pfds[i].revents & POLLOUT)) || -+ ((pfds[i].revents & POLLHUP) && (pfds[i].revents & (POLLIN|POLLOUT)))) -+# else -+ if (((errno == EINPROGRESS) && (pfds[i].revents & POLLIN) && (pfds[i].revents & POLLOUT)) || -+ ((pfds[i].revents & POLLHUP) && (pfds[i].revents & (POLLIN|POLLOUT)))) -+# endif /* _WIN32 */ -+ { -+ // Some systems generate POLLIN or POLLOUT together with POLLHUP when doing -+ // asynchronous connections. The solution seems to be to use getsockopt to -+ // check the SO_ERROR value and ignore the POLLHUP if there is no error or -+ // the error is EINPROGRESS. -+ -+ int sres, /* Return value from getsockopt() - 0, or -1 if error */ -+ serr; /* Option SO_ERROR value */ -+ socklen_t slen = sizeof(serr); /* Option value size */ -+ -+ sres = getsockopt(fds[i], SOL_SOCKET, SO_ERROR, &serr, &slen); -+ -+ if (sres || serr) -+ { -+ pfds[i].revents |= POLLERR; -+# ifdef DEBUG -+ DEBUG_printf(("1httpAddrConnect2: getsockopt returned: %d with error: %s", sres, strerror(serr))); -+# endif -+ } -+ else if (pfds[i].revents && (pfds[i].revents & POLLHUP) && (pfds[i].revents & (POLLIN | POLLOUT))) -+ { -+ pfds[i].revents &= ~POLLHUP; -+ } -+ } -+ - if (pfds[i].revents && !(pfds[i].revents & (POLLERR | POLLHUP))) - # else - if (FD_ISSET(fds[i], &input_set) && !FD_ISSET(fds[i], &error_set)) diff --git a/SOURCES/0001-mirror-ipp-everywhere-printer-changes-from-master.patch b/SOURCES/0001-mirror-ipp-everywhere-printer-changes-from-master.patch deleted file mode 100644 index 20b090e..0000000 --- a/SOURCES/0001-mirror-ipp-everywhere-printer-changes-from-master.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/scheduler/ipp.c b/scheduler/ipp.c -index 728d164..5089172 100644 ---- a/scheduler/ipp.c -+++ b/scheduler/ipp.c -@@ -5773,6 +5773,18 @@ create_local_bg_thread( - cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: IPP/1.1 Get-Printer-Attributes returned %s (%s)", printer->name, ippErrorString(cupsLastError()), cupsLastErrorString()); - } - -+ // Validate response from printer... -+ if (!ippValidateAttributes(response)) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "%s: The printer contains invalid attributes.", printer->name); -+ -+ if (response) -+ ippDelete(response); -+ -+ httpClose(http); -+ return (NULL); -+ } -+ - // TODO: Grab printer icon file... - httpClose(http); - -diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c -index daf24d5..eba7551 100644 ---- a/systemv/lpadmin.c -+++ b/systemv/lpadmin.c -@@ -1226,6 +1226,12 @@ get_printer_ppd( - ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(pattrs) / sizeof(pattrs[0]), NULL, pattrs); - response = cupsDoRequest(http, request, resource); - -+ if (response && !ippValidateAttributes(response)) -+ { -+ _cupsLangPrintf(stderr, _("%s: The printer \"%s\" contains invalid IPP attributes."), "lpadmin", uri); -+ return (NULL); -+ } -+ - if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE) - { - _cupsLangPrintf(stderr, _("%s: Unable to query printer: %s"), "lpadmin", cupsLastErrorString()); diff --git a/SOURCES/0001-ppdize-preset-and-template-names.patch b/SOURCES/0001-ppdize-preset-and-template-names.patch deleted file mode 100644 index cf327ba..0000000 --- a/SOURCES/0001-ppdize-preset-and-template-names.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e0630cd18f76340d302000f2bf6516e99602b844 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Mon, 9 Sep 2024 15:59:57 -0400 -Subject: [PATCH] PPDize preset and template names. - ---- - cups/ppd-cache.c | 33 ++++++++++++++++++++++++--------- - 1 file changed, 24 insertions(+), 9 deletions(-) - -diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c -index 986c64f73..18c38d0ee 100644 ---- a/cups/ppd-cache.c -+++ b/cups/ppd-cache.c -@@ -5543,7 +5552,7 @@ pwg_ppdize_name(const char *ipp, /* I - IPP keyword */ - *end; /* End of name buffer */ - - -- if (!ipp) -+ if (!ipp || !_cups_isalnum(*ipp)) - { - *name = '\0'; - return; -@@ -5558,8 +5567,14 @@ pwg_ppdize_name(const char *ipp, /* I - IPP keyword */ - ipp ++; - *ptr++ = (char)toupper(*ipp++ & 255); - } -- else -+ else if (*ipp == '_' || *ipp == '.' || *ipp == '-' || _cups_isalnum(*ipp)) -+ { - *ptr++ = *ipp++; -+ } -+ else -+ { -+ ipp ++; -+ } - } - - *ptr = '\0'; --- -2.46.1 - diff --git a/SOURCES/0001-scheduler-cert.c-Fix-string-comparison-fixes-CVE-202.patch b/SOURCES/0001-scheduler-cert.c-Fix-string-comparison-fixes-CVE-202.patch deleted file mode 100644 index 0aa9c99..0000000 --- a/SOURCES/0001-scheduler-cert.c-Fix-string-comparison-fixes-CVE-202.patch +++ /dev/null @@ -1,35 +0,0 @@ -From de4f8c196106033e4c372dce3e91b9d42b0b9444 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Thu, 26 May 2022 06:27:04 +0200 -Subject: [PATCH] scheduler/cert.c: Fix string comparison (fixes - CVE-2022-26691) - -The previous algorithm didn't expect the strings can have a different -length, so one string can be a substring of the other and such substring -was reported as equal to the longer string. ---- - CHANGES.md | 1 + - scheduler/cert.c | 9 ++++++++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/scheduler/cert.c b/scheduler/cert.c -index b268bf1b2..9b65b96c9 100644 ---- a/scheduler/cert.c -+++ b/scheduler/cert.c -@@ -444,5 +444,12 @@ ctcompare(const char *a, /* I - First string */ - b ++; - } - -- return (result); -+ /* -+ * The while loop finishes when *a == '\0' or *b == '\0' -+ * so after the while loop either both *a and *b == '\0', -+ * or one points inside a string, so when we apply bitwise OR on *a, -+ * *b and result, we get a non-zero return value if the compared strings don't match. -+ */ -+ -+ return (result | *a | *b); - } --- -2.36.1 - diff --git a/SOURCES/0001-scheduler-conf.c-Print-to-stderr-if-we-don-t-open-cu.patch b/SOURCES/0001-scheduler-conf.c-Print-to-stderr-if-we-don-t-open-cu.patch deleted file mode 100644 index 0c7f8c3..0000000 --- a/SOURCES/0001-scheduler-conf.c-Print-to-stderr-if-we-don-t-open-cu.patch +++ /dev/null @@ -1,36 +0,0 @@ -From db9cecdd932e58c51d2d659f63415ad47d151717 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Fri, 1 Sep 2023 17:11:54 +0200 -Subject: [PATCH] scheduler/conf.c: Print to stderr if we don't open - cups-files.conf - -In case cupsd can't open the cups-files.conf, the error message is lost -if journal and syslog don't exist or work on system (usually in -containers). - -Log the error into stderr at this place to get the error message if -needed. ---- - scheduler/conf.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/scheduler/conf.c b/scheduler/conf.c -index b18535162..4fa7eb1df 100644 ---- a/scheduler/conf.c -+++ b/scheduler/conf.c -@@ -811,11 +811,7 @@ cupsdReadConfiguration(void) - cupsdLogMessage(CUPSD_LOG_INFO, "No %s, using defaults.", CupsFilesFile); - else - { --#ifdef HAVE_SYSTEMD_SD_JOURNAL_H -- sd_journal_print(LOG_ERR, "Unable to open \"%s\" - %s", CupsFilesFile, strerror(errno)); --#else -- syslog(LOG_LPR, "Unable to open \"%s\" - %s", CupsFilesFile, strerror(errno)); --#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */ -+ fprintf(stderr, "Unable to read \"%s\" - %s\n", CupsFilesFile, strerror(errno)); - - return (0); - } --- -2.41.0 - diff --git a/SOURCES/0001-scheduler-job.c-use-gziptoany-for-raw-files-not-just.patch b/SOURCES/0001-scheduler-job.c-use-gziptoany-for-raw-files-not-just.patch deleted file mode 100644 index 025361f..0000000 --- a/SOURCES/0001-scheduler-job.c-use-gziptoany-for-raw-files-not-just.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 08e9b6e1f8497a8159d6bd7cd6dc96ae79a2e704 Mon Sep 17 00:00:00 2001 -From: Bryan Mason -Date: Thu, 15 Jul 2021 16:26:27 -0700 -Subject: [PATCH] scheduler/job.c: use gziptoany for raw files (not just raw - printers) - ---- - scheduler/job.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/scheduler/job.c b/scheduler/job.c -index d8c2efcc6..b448acda5 100644 ---- a/scheduler/job.c -+++ b/scheduler/job.c -@@ -501,6 +501,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ - int backroot; /* Run backend as root? */ - int pid; /* Process ID of new filter process */ - int banner_page; /* 1 if banner page, 0 otherwise */ -+ int raw_file; /* 1 if file type is vnd.cups-raw */ - int filterfds[2][2] = { { -1, -1 }, { -1, -1 } }; - /* Pipes used between filters */ - int envc; /* Number of environment variables */ -@@ -746,8 +747,11 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ - * Add decompression/raw filter as needed... - */ - -+ raw_file = !strcmp(job->filetypes[job->current_file]->super, "application") && -+ !strcmp(job->filetypes[job->current_file]->type, "vnd.cups-raw"); -+ - if ((job->compressions[job->current_file] && (!job->printer->remote || job->num_files == 1)) || -- (!job->printer->remote && job->printer->raw && job->num_files > 1)) -+ (!job->printer->remote && (job->printer->raw || raw_file) && job->num_files > 1)) - { - /* - * Add gziptoany filter to the front of the list... --- -2.31.1 - diff --git a/SOURCES/cups-autostart-when-enabled.patch b/SOURCES/cups-autostart-when-enabled.patch deleted file mode 100644 index 1cdefb6..0000000 --- a/SOURCES/cups-autostart-when-enabled.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in -index 307d69b..add238b 100644 ---- a/scheduler/org.cups.cupsd.service.in -+++ b/scheduler/org.cups.cupsd.service.in -@@ -10,4 +10,4 @@ Restart=on-failure - - [Install] - Also=cups.socket cups.path --WantedBy=printer.target -+WantedBy=printer.target multi-user.target diff --git a/SOURCES/cups-avahi-address.patch b/SOURCES/cups-avahi-address.patch deleted file mode 100644 index b8090ea..0000000 --- a/SOURCES/cups-avahi-address.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -up cups-2.2b2/cups/http-support.c.avahi-address cups-2.2b2/cups/http-support.c ---- cups-2.2b2/cups/http-support.c.avahi-address 2016-06-24 17:43:35.000000000 +0200 -+++ cups-2.2b2/cups/http-support.c 2016-06-27 15:31:34.201361844 +0200 -@@ -2340,7 +2340,7 @@ http_resolve_cb( - const char *type, /* I - Registration type */ - const char *domain, /* I - Domain (unused) */ - const char *hostTarget, /* I - Hostname */ -- const AvahiAddress *address, /* I - Address (unused) */ -+ const AvahiAddress *address, /* I - Address */ - uint16_t port, /* I - Port number */ - AvahiStringList *txt, /* I - TXT record */ - AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */ -@@ -2493,39 +2493,62 @@ http_resolve_cb( - * getting the IP address of the .local name and then do reverse-lookups... - */ - -- http_addrlist_t *addrlist, /* List of addresses */ -- *addr; /* Current address */ -+ http_addr_t addr; -+ size_t addrlen; -+ int error; - - DEBUG_printf(("5http_resolve_cb: Looking up \"%s\".", hostTarget)); - -- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); -- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) -+ switch (address->proto) - { -- for (addr = addrlist; addr; addr = addr->next) -+ case AVAHI_PROTO_INET: -+ addr.ipv4.sin_family = AF_INET; -+ addrlen = sizeof (addr.ipv4.sin_addr); -+ memcpy (&addr.ipv4.sin_addr, &address->data, addrlen); -+ break; -+ case AVAHI_PROTO_INET6: -+ addr.ipv6.sin6_family = AF_INET6; -+ addrlen = sizeof (addr.ipv6.sin6_addr); -+ memcpy (&addr.ipv6.sin6_addr, &address->data, addrlen); -+ break; -+ default: -+ DEBUG_printf(("8http_resolve_cb: unknown address family %d", -+ address->proto)); -+ addrlen = 0; -+ } -+ -+ if (addrlen > 0) { -+ error = getnameinfo(&addr.addr, httpAddrLength (&addr), -+ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); -+ -+ if (!error) - { -- int error = getnameinfo(&(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr)), fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); -+ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); - -- if (!error) -- { -- DEBUG_printf(("5http_resolve_cb: Found \"%s\".", fqdn)); -+ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || -+ _cups_strcasecmp(hostptr, ".local")) - -- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || -- _cups_strcasecmp(hostptr, ".local")) -- { -- hostTarget = fqdn; -- break; -- } -+ { -+ hostTarget = fqdn; - } -+ } else { -+ avahi_address_snprint (fqdn, sizeof (fqdn), address); -+ hostTarget = fqdn; -+ - #ifdef DEBUG -- else -- DEBUG_printf(("5http_resolve_cb: \"%s\" did not resolve: %d", -- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), -- error)); -+ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", -+ fqdn, error)); - #endif /* DEBUG */ - } - -- httpAddrFreeList(addrlist); - } -+ } else { -+ /* -+ * Use the IP address that responded... -+ */ -+ -+ avahi_address_snprint (fqdn, sizeof (fqdn), address); -+ hostTarget = fqdn; - } - - /* diff --git a/SOURCES/cups-avahi-no-threaded.patch b/SOURCES/cups-avahi-no-threaded.patch deleted file mode 100644 index 942bbf5..0000000 --- a/SOURCES/cups-avahi-no-threaded.patch +++ /dev/null @@ -1,1025 +0,0 @@ -diff -up cups-2.2.5/scheduler/avahi.c.avahi-no-threaded cups-2.2.5/scheduler/avahi.c ---- cups-2.2.5/scheduler/avahi.c.avahi-no-threaded 2017-10-17 19:03:00.760881016 +0200 -+++ cups-2.2.5/scheduler/avahi.c 2017-10-17 19:03:00.760881016 +0200 -@@ -0,0 +1,441 @@ -+/* -+ * "$Id$" -+ * -+ * Avahi poll implementation for the CUPS scheduler. -+ * -+ * Copyright (C) 2010, 2011 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * Contents: -+ * -+ * watch_read_cb - Read callback for file descriptor -+ * watch_write_cb - Write callback for file descriptor -+ * watched_fd_add_select() - Call cupsdAddSelect() as needed -+ * watch_new() - Create a new file descriptor watch -+ * watch_free() - Free a file descriptor watch -+ * watch_update() - Update watched events for a file descriptor -+ * watch_get_events() - Get events that happened for a file descriptor -+ * timeout_cb() - Run a timed Avahi callback -+ * timeout_new() - Set a wakeup time -+ * timeout_update() - Update the expiration time for a timeout -+ * timeout_free() - Free a timeout -+ * compare_watched_fds() - Compare watched file descriptors for array sorting -+ * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS -+ * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS -+ * avahi_cups_poll_get() - Get the abstract poll API structure -+ */ -+ -+#include -+ -+#ifdef HAVE_AVAHI /* Applies to entire file... */ -+ -+/* -+ * Include necessary headers... -+ */ -+ -+#include "cupsd.h" -+ -+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) -+# include -+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -+ -+#ifdef HAVE_AVAHI -+# include -+#endif /* HAVE_AVAHI */ -+ -+ -+typedef struct -+{ -+ AvahiCupsPoll *cups_poll; -+ -+ int fd; -+ AvahiWatchEvent occurred; -+ cups_array_t *watches; -+} cupsd_watched_fd_t; -+ -+struct AvahiWatch -+{ -+ cupsd_watched_fd_t *watched_fd; -+ -+ AvahiWatchEvent events; -+ AvahiWatchCallback callback; -+ void *userdata; -+}; -+ -+struct AvahiTimeout -+{ -+ AvahiCupsPoll *cups_poll; -+ AvahiTimeoutCallback callback; -+ void *userdata; -+ cupsd_timeout_t *cupsd_timeout; -+}; -+ -+/* -+ * Local functions... -+ */ -+ -+static AvahiWatch * watch_new(const AvahiPoll *api, -+ int fd, -+ AvahiWatchEvent events, -+ AvahiWatchCallback callback, -+ void *userdata); -+static void watch_free(AvahiWatch *watch); -+static void watch_update(AvahiWatch *watch, -+ AvahiWatchEvent events); -+static AvahiWatchEvent watch_get_events(AvahiWatch *watch); -+ -+ -+/* -+ * 'watch_read_cb' - Read callback for file descriptor -+ */ -+ -+static void -+watch_read_cb (void *userdata) -+{ -+ AvahiWatch *watch; -+ cupsd_watched_fd_t *watched_fd = userdata; -+ watched_fd->occurred |= AVAHI_WATCH_IN; -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) -+ { -+ if (watch->events & watched_fd->occurred) -+ { -+ (watch->callback) (watch, watched_fd->fd, -+ AVAHI_WATCH_IN, watch->userdata); -+ watched_fd->occurred &= ~AVAHI_WATCH_IN; -+ break; -+ } -+ } -+} -+ -+ -+/* -+ * 'watch_write_cb' - Write callback for file descriptor -+ */ -+ -+static void -+watch_write_cb (void *userdata) -+{ -+ AvahiWatch *watch; -+ cupsd_watched_fd_t *watched_fd = userdata; -+ watched_fd->occurred |= AVAHI_WATCH_OUT; -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) -+ { -+ if (watch->events & watched_fd->occurred) -+ { -+ (watch->callback) (watch, watched_fd->fd, -+ AVAHI_WATCH_OUT, watch->userdata); -+ watched_fd->occurred &= ~AVAHI_WATCH_OUT; -+ break; -+ } -+ } -+} -+ -+ -+/* -+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed -+ */ -+ -+static int /* O - Watches? */ -+watched_fd_add_select (cupsd_watched_fd_t *watched_fd) -+{ -+ AvahiWatch *watch; -+ cupsd_selfunc_t read_cb = NULL, write_cb = NULL; -+ int any_watches = 0; -+ -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) -+ { -+ any_watches = 1; -+ if (watch->events & (AVAHI_WATCH_IN | -+ AVAHI_WATCH_ERR | -+ AVAHI_WATCH_HUP)) -+ { -+ read_cb = (cupsd_selfunc_t)watch_read_cb; -+ if (write_cb != NULL) -+ break; -+ } -+ -+ if (watch->events & AVAHI_WATCH_OUT) -+ { -+ write_cb = (cupsd_selfunc_t)watch_write_cb; -+ if (read_cb != NULL) -+ break; -+ } -+ } -+ -+ if (read_cb || write_cb) -+ cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd); -+ else -+ cupsdRemoveSelect (watched_fd->fd); -+ -+ return (any_watches); -+} -+ -+/* -+ * 'watch_new' - Create a new file descriptor watch -+ */ -+ -+static AvahiWatch * -+watch_new (const AvahiPoll *api, -+ int fd, -+ AvahiWatchEvent events, -+ AvahiWatchCallback callback, -+ void *userdata) -+{ -+ cupsd_watched_fd_t key, *watched_fd; -+ AvahiCupsPoll *cups_poll = api->userdata; -+ AvahiWatch *watch = malloc(sizeof(AvahiWatch)); -+ if (watch == NULL) -+ return (NULL); -+ -+ watch->events = events; -+ watch->callback = callback; -+ watch->userdata = userdata; -+ -+ key.fd = fd; -+ watched_fd = cupsArrayFind (cups_poll->watched_fds, &key); -+ if (watched_fd == NULL) -+ { -+ watched_fd = malloc(sizeof(cupsd_watched_fd_t)); -+ if (watched_fd == NULL) -+ { -+ free (watch); -+ return (NULL); -+ } -+ -+ watched_fd->fd = fd; -+ watched_fd->occurred = 0; -+ watched_fd->cups_poll = cups_poll; -+ watched_fd->watches = cupsArrayNew (NULL, NULL); -+ cupsArrayAdd (cups_poll->watched_fds, watched_fd); -+ } -+ -+ watch->watched_fd = watched_fd; -+ cupsArrayAdd(watched_fd->watches, watch); -+ watched_fd_add_select (watched_fd); -+ return (watch); -+} -+ -+ -+/* -+ * 'watch_free' - Free a file descriptor watch -+ */ -+ -+static void -+watch_free (AvahiWatch *watch) -+{ -+ cupsd_watched_fd_t *watched_fd = watch->watched_fd; -+ AvahiCupsPoll *cups_poll = watched_fd->cups_poll; -+ -+ cupsArrayRemove (watched_fd->watches, watch); -+ free (watch); -+ -+ if (!watched_fd_add_select (watched_fd)) -+ { -+ /* No more watches */ -+ cupsArrayRemove (cups_poll->watched_fds, watched_fd); -+ free (watched_fd); -+ } -+} -+ -+ -+/* -+ * 'watch_update' - Update watched events for a file descriptor -+ */ -+ -+static void -+watch_update (AvahiWatch *watch, -+ AvahiWatchEvent events) -+{ -+ watch->events = events; -+ watched_fd_add_select (watch->watched_fd); -+} -+ -+ -+/* -+ * 'watch_get_events' - Get events that happened for a file descriptor -+ */ -+ -+static AvahiWatchEvent -+watch_get_events (AvahiWatch *watch) -+{ -+ return (watch->watched_fd->occurred); -+} -+ -+ -+/* -+ * 'timeout_cb()' - Run a timed Avahi callback -+ */ -+ -+static void -+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata) -+{ -+ AvahiTimeout *timeout = userdata; -+ (timeout->callback) (timeout, timeout->userdata); -+} -+ -+ -+/* -+ * 'timeout_new' - Set a wakeup time -+ */ -+ -+static AvahiTimeout * -+timeout_new (const AvahiPoll *api, -+ const struct timeval *tv, -+ AvahiTimeoutCallback callback, -+ void *userdata) -+{ -+ AvahiTimeout *timeout; -+ AvahiCupsPoll *cups_poll = api->userdata; -+ -+ timeout = malloc(sizeof(AvahiTimeout)); -+ if (timeout == NULL) -+ return (NULL); -+ -+ timeout->cups_poll = cups_poll; -+ timeout->callback = callback; -+ timeout->userdata = userdata; -+ timeout->cupsd_timeout = cupsdAddTimeout (tv, -+ (cupsd_timeoutfunc_t)timeout_cb, -+ timeout); -+ cupsArrayAdd (cups_poll->timeouts, timeout); -+ return (timeout); -+} -+ -+ -+/* -+ * 'timeout_update' - Update the expiration time for a timeout -+ */ -+ -+static void -+timeout_update (AvahiTimeout *timeout, -+ const struct timeval *tv) -+{ -+ cupsdUpdateTimeout (timeout->cupsd_timeout, tv); -+} -+ -+ -+/* -+ * ' timeout_free' - Free a timeout -+ */ -+ -+static void -+timeout_free (AvahiTimeout *timeout) -+{ -+ cupsArrayRemove (timeout->cups_poll->timeouts, timeout); -+ cupsdRemoveTimeout (timeout->cupsd_timeout); -+ free (timeout); -+} -+ -+ -+/* -+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting -+ */ -+static int -+compare_watched_fds(cupsd_watched_fd_t *p0, -+ cupsd_watched_fd_t *p1) -+{ -+ /* -+ * Compare by fd (no two elements have the same fd) -+ */ -+ -+ if (p0->fd == p1->fd) -+ return 0; -+ -+ return (p0->fd < p1->fd ? -1 : 1); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS -+ */ -+ -+AvahiCupsPoll * -+avahi_cups_poll_new (void) -+{ -+ AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll)); -+ if (cups_poll == NULL) -+ return (NULL); -+ -+ cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds, -+ NULL); -+ cups_poll->timeouts = cupsArrayNew (NULL, NULL); -+ -+ cups_poll->api.userdata = cups_poll; -+ cups_poll->api.watch_new = watch_new; -+ cups_poll->api.watch_free = watch_free; -+ cups_poll->api.watch_update = watch_update; -+ cups_poll->api.watch_get_events = watch_get_events; -+ -+ cups_poll->api.timeout_new = timeout_new; -+ cups_poll->api.timeout_update = timeout_update; -+ cups_poll->api.timeout_free = timeout_free; -+ -+ return (cups_poll); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS -+ */ -+void -+avahi_cups_poll_free (AvahiCupsPoll *cups_poll) -+{ -+ cupsd_watched_fd_t *watched_fd; -+ -+ for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds); -+ watched_fd; -+ watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)) -+ cupsArrayClear (watched_fd->watches); -+ -+ cupsArrayClear (cups_poll->watched_fds); -+ cupsArrayClear (cups_poll->timeouts); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_get' - Get the abstract poll API structure -+ */ -+ -+const AvahiPoll * -+avahi_cups_poll_get (AvahiCupsPoll *cups_poll) -+{ -+ return (&cups_poll->api); -+} -+ -+ -+#endif /* HAVE_AVAHI ... from top of file */ -+ -+/* -+ * End of "$Id$". -+ */ -diff -up cups-2.2.5/scheduler/avahi.h.avahi-no-threaded cups-2.2.5/scheduler/avahi.h ---- cups-2.2.5/scheduler/avahi.h.avahi-no-threaded 2017-10-17 19:03:00.760881016 +0200 -+++ cups-2.2.5/scheduler/avahi.h 2017-10-17 19:03:00.760881016 +0200 -@@ -0,0 +1,69 @@ -+/* -+ * "$Id$" -+ * -+ * Avahi poll implementation for the CUPS scheduler. -+ * -+ * Copyright (C) 2010, 2011 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include -+ -+#ifdef HAVE_AVAHI -+# include -+# include -+#endif /* HAVE_AVAHI */ -+ -+#ifdef HAVE_AUTHORIZATION_H -+# include -+#endif /* HAVE_AUTHORIZATION_H */ -+ -+ -+#ifdef HAVE_AVAHI -+typedef struct -+{ -+ AvahiPoll api; -+ cups_array_t *watched_fds; -+ cups_array_t *timeouts; -+} AvahiCupsPoll; -+#endif /* HAVE_AVAHI */ -+ -+/* -+ * Prototypes... -+ */ -+ -+#ifdef HAVE_AVAHI -+extern AvahiCupsPoll * avahi_cups_poll_new(void); -+extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll); -+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll); -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * End of "$Id$". -+ */ -diff -up cups-2.2.5/scheduler/cupsd.h.avahi-no-threaded cups-2.2.5/scheduler/cupsd.h ---- cups-2.2.5/scheduler/cupsd.h.avahi-no-threaded 2017-10-13 20:22:26.000000000 +0200 -+++ cups-2.2.5/scheduler/cupsd.h 2017-10-17 19:03:00.760881016 +0200 -@@ -118,6 +118,7 @@ extern const char *cups_hstrerror(int); - #include "colorman.h" - #include "conf.h" - #include "banners.h" -+#include "avahi.h" - #include "dirsvc.h" - #include "network.h" - #include "subscriptions.h" -@@ -138,6 +139,15 @@ extern const char *cups_hstrerror(int); - - typedef void (*cupsd_selfunc_t)(void *data); - -+#ifdef HAVE_AVAHI -+/* -+ * Timeout callback function type... -+ */ -+ -+typedef struct _cupsd_timeout_s cupsd_timeout_t; -+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data); -+#endif /* HAVE_AVAHI */ -+ - - /* - * Globals... -@@ -162,6 +172,9 @@ VAR int OnDemand VALUE(0); - /* Launched on demand */ - #endif /* HAVE_ONDEMAND */ - -+#ifdef HAVE_AVAHI -+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */ -+#endif /* HAVE_AVAHI */ - - /* - * Prototypes... -@@ -224,3 +237,15 @@ extern void cupsdStopSelect(void); - /* server.c */ - extern void cupsdStartServer(void); - extern void cupsdStopServer(void); -+ -+#ifdef HAVE_AVAHI -+extern void cupsdInitTimeouts(void); -+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv, -+ cupsd_timeoutfunc_t cb, -+ void *data); -+extern cupsd_timeout_t *cupsdNextTimeout (long *delay); -+extern void cupsdRunTimeout (cupsd_timeout_t *timeout); -+extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout, -+ const struct timeval *tv); -+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout); -+#endif /* HAVE_AVAHI */ -\ No newline at end of file -diff -up cups-2.2.5/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.5/scheduler/dirsvc.c ---- cups-2.2.5/scheduler/dirsvc.c.avahi-no-threaded 2017-10-13 20:22:26.000000000 +0200 -+++ cups-2.2.5/scheduler/dirsvc.c 2017-10-17 19:05:35.938592292 +0200 -@@ -193,7 +193,7 @@ cupsdStartBrowsing(void) - cupsdUpdateDNSSDName(); - - # else /* HAVE_AVAHI */ -- if ((DNSSDMaster = avahi_threaded_poll_new()) == NULL) -+ if ((DNSSDMaster = avahi_cups_poll_new()) == NULL) - { - cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create DNS-SD thread."); - -@@ -204,7 +204,7 @@ cupsdStartBrowsing(void) - { - int error; /* Error code, if any */ - -- DNSSDClient = avahi_client_new(avahi_threaded_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error); -+ DNSSDClient = avahi_client_new(avahi_cups_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error); - - if (DNSSDClient == NULL) - { -@@ -215,11 +215,9 @@ cupsdStartBrowsing(void) - if (FatalErrors & CUPSD_FATAL_BROWSE) - cupsdEndProcess(getpid(), 0); - -- avahi_threaded_poll_free(DNSSDMaster); -+ avahi_cups_poll_free(DNSSDMaster); - DNSSDMaster = NULL; - } -- else -- avahi_threaded_poll_start(DNSSDMaster); - } - # endif /* HAVE_DNSSD */ - } -@@ -635,7 +633,7 @@ dnssdClientCallback( - * Renew Avahi client... - */ - -- DNSSDClient = avahi_client_new(avahi_threaded_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error); -+ DNSSDClient = avahi_client_new(avahi_cups_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error); - - if (!DNSSDClient) - { -@@ -701,13 +699,7 @@ dnssdDeregisterInstance( - # else /* HAVE_AVAHI */ - if (*srv) - { -- if (!from_callback) -- avahi_threaded_poll_lock(DNSSDMaster); -- - avahi_entry_group_free(*srv); -- -- if (!from_callback) -- avahi_threaded_poll_unlock(DNSSDMaster); - } - # endif /* HAVE_DNSSD */ - -@@ -1029,16 +1021,10 @@ dnssdRegisterInstance( - (void)commit; - - # else /* HAVE_AVAHI */ -- if (!from_callback) -- avahi_threaded_poll_lock(DNSSDMaster); -- - if (!*srv) - *srv = avahi_entry_group_new(DNSSDClient, dnssdRegisterCallback, NULL); - if (!*srv) - { -- if (!from_callback) -- avahi_threaded_poll_unlock(DNSSDMaster); -- - cupsdLogMessage(CUPSD_LOG_WARN, "DNS-SD registration of \"%s\" failed: %s", - name, dnssdErrorString(avahi_client_errno(DNSSDClient))); - return (0); -@@ -1153,9 +1139,6 @@ dnssdRegisterInstance( - cupsdLogMessage(CUPSD_LOG_DEBUG, "DNS-SD commit of \"%s\" failed.", - name); - } -- -- if (!from_callback) -- avahi_threaded_poll_unlock(DNSSDMaster); - # endif /* HAVE_DNSSD */ - - if (error) -@@ -1326,9 +1309,6 @@ dnssdStop(void) - DNSSDMaster = NULL; - - # else /* HAVE_AVAHI */ -- if (DNSSDMaster) -- avahi_threaded_poll_stop(DNSSDMaster); -- - if (DNSSDClient) - { - avahi_client_free(DNSSDClient); -@@ -1337,7 +1317,7 @@ dnssdStop(void) - - if (DNSSDMaster) - { -- avahi_threaded_poll_free(DNSSDMaster); -+ avahi_cups_poll_free(DNSSDMaster); - DNSSDMaster = NULL; - } - # endif /* HAVE_DNSSD */ -diff -up cups-2.2.5/scheduler/dirsvc.h.avahi-no-threaded cups-2.2.5/scheduler/dirsvc.h ---- cups-2.2.5/scheduler/dirsvc.h.avahi-no-threaded 2017-10-13 20:22:26.000000000 +0200 -+++ cups-2.2.5/scheduler/dirsvc.h 2017-10-17 19:03:00.761881007 +0200 -@@ -49,7 +49,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU - VAR DNSServiceRef DNSSDMaster VALUE(NULL); - /* Master DNS-SD service reference */ - # else /* HAVE_AVAHI */ --VAR AvahiThreadedPoll *DNSSDMaster VALUE(NULL); -+VAR AvahiCupsPoll *DNSSDMaster VALUE(NULL); - /* Master polling interface for Avahi */ - VAR AvahiClient *DNSSDClient VALUE(NULL); - /* Client information */ -diff -up cups-2.2.5/scheduler/main.c.avahi-no-threaded cups-2.2.5/scheduler/main.c ---- cups-2.2.5/scheduler/main.c.avahi-no-threaded 2017-10-17 19:03:00.753881074 +0200 -+++ cups-2.2.5/scheduler/main.c 2017-10-17 19:03:00.761881007 +0200 -@@ -131,7 +131,10 @@ main(int argc, /* I - Number of comm - int service_idle_exit; - /* Idle exit on select timeout? */ - #endif /* HAVE_ONDEMAND */ -- -+#ifdef HAVE_AVAHI -+ cupsd_timeout_t *tmo; /* Next scheduled timed callback */ -+ long tmo_delay; /* Time before it must be called */ -+#endif /* HAVE_AVAHI */ - - #ifdef HAVE_GETEUID - /* -@@ -610,6 +613,14 @@ main(int argc, /* I - Number of comm - - httpInitialize(); - -+#ifdef HAVE_AVAHI -+ /* -+ * Initialize timed callback structures. -+ */ -+ -+ cupsdInitTimeouts(); -+#endif /* HAVE_AVAHI */ -+ - cupsdStartServer(); - - /* -@@ -928,6 +939,16 @@ main(int argc, /* I - Number of comm - } - #endif /* __APPLE__ */ - -+#ifdef HAVE_AVAHI -+ /* -+ * If a timed callback is due, run it. -+ */ -+ -+ tmo = cupsdNextTimeout (&tmo_delay); -+ if (tmo && tmo_delay == 0) -+ cupsdRunTimeout (tmo); -+#endif /* HAVE_AVAHI */ -+ - #ifndef __APPLE__ - /* - * Update the network interfaces once a minute... -@@ -1632,6 +1653,10 @@ select_timeout(int fds) /* I - Number - cupsd_job_t *job; /* Job information */ - cupsd_printer_t *printer; /* Printer information */ - const char *why; /* Debugging aid */ -+#ifdef HAVE_AVAHI -+ cupsd_timeout_t *tmo; /* Timed callback */ -+ long tmo_delay; /* Seconds before calling it */ -+#endif /* HAVE_AVAHI */ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld", -@@ -1677,6 +1702,19 @@ select_timeout(int fds) /* I - Number - } - #endif /* __APPLE__ */ - -+#ifdef HAVE_AVAHI -+ /* -+ * See if there are any scheduled timed callbacks to run. -+ */ -+ -+ if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL && -+ (now + tmo_delay) < timeout) -+ { -+ timeout = tmo_delay; -+ why = "run a timed callback"; -+ } -+#endif /* HAVE_AVAHI */ -+ - /* - * Check whether we are accepting new connections... - */ -diff -up cups-2.2.5/scheduler/Makefile.avahi-no-threaded cups-2.2.5/scheduler/Makefile ---- cups-2.2.5/scheduler/Makefile.avahi-no-threaded 2017-10-13 20:22:26.000000000 +0200 -+++ cups-2.2.5/scheduler/Makefile 2017-10-17 19:03:00.762880999 +0200 -@@ -15,6 +15,7 @@ include ../Makedefs - - CUPSDOBJS = \ - auth.o \ -+ avahi.o \ - banners.o \ - cert.o \ - classes.o \ -@@ -38,7 +39,8 @@ CUPSDOBJS = \ - server.o \ - statbuf.o \ - subscriptions.o \ -- sysman.o -+ sysman.o \ -+ timeout.o - LIBOBJS = \ - filter.o \ - mime.o \ -diff -up cups-2.2.5/scheduler/timeout.c.avahi-no-threaded cups-2.2.5/scheduler/timeout.c ---- cups-2.2.5/scheduler/timeout.c.avahi-no-threaded 2017-10-17 19:03:00.762880999 +0200 -+++ cups-2.2.5/scheduler/timeout.c 2017-10-17 19:03:00.762880999 +0200 -@@ -0,0 +1,235 @@ -+/* -+ * "$Id$" -+ * -+ * Timeout functions for the Common UNIX Printing System (CUPS). -+ * -+ * Copyright (C) 2010, 2011 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * Contents: -+ * -+ * cupsdInitTimeouts() - Initialise timeout structure. -+ * cupsdAddTimeout() - Add a timed callback. -+ * cupsdNextTimeout() - Find the next enabled timed callback. -+ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it. -+ * cupsdRemoveTimeout() - Discard a timed callback. -+ * compare_timeouts() - Compare timed callbacks for array sorting. -+ */ -+ -+#include -+ -+#ifdef HAVE_AVAHI /* Applies to entire file... */ -+ -+/* -+ * Include necessary headers... -+ */ -+ -+#include "cupsd.h" -+ -+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) -+# include -+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -+ -+#ifdef HAVE_AVAHI -+# include -+#endif /* HAVE_AVAHI */ -+ -+ -+struct _cupsd_timeout_s -+{ -+ struct timeval when; -+ int enabled; -+ cupsd_timeoutfunc_t callback; -+ void *data; -+}; -+ -+/* -+ * Local functions... -+ */ -+ -+/* -+ * 'compare_timeouts()' - Compare timed callbacks for array sorting. -+ */ -+ -+static int -+compare_addrs (void *p0, void *p1) -+{ -+ if (p0 == p1) -+ return (0); -+ if (p0 < p1) -+ return (-1); -+ return (1); -+} -+ -+static int -+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1) -+{ -+ int addrsdiff = compare_addrs (p0, p1); -+ int tvdiff; -+ -+ if (addrsdiff == 0) -+ return (0); -+ -+ if (!p0->enabled || !p1->enabled) -+ { -+ if (!p0->enabled && !p1->enabled) -+ return (addrsdiff); -+ -+ return (p0->enabled ? -1 : 1); -+ } -+ -+ tvdiff = avahi_timeval_compare (&p0->when, &p1->when); -+ if (tvdiff != 0) -+ return (tvdiff); -+ -+ return (addrsdiff); -+} -+ -+ -+/* -+ * 'cupsdInitTimeouts()' - Initialise timeout structures. -+ */ -+ -+void -+cupsdInitTimeouts(void) -+{ -+ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL); -+} -+ -+ -+/* -+ * 'cupsdAddTimeout()' - Add a timed callback. -+ */ -+ -+cupsd_timeout_t * /* O - Timeout handle */ -+cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */ -+ cupsd_timeoutfunc_t cb, /* I - Callback function */ -+ void *data) /* I - User data */ -+{ -+ cupsd_timeout_t *timeout; -+ -+ timeout = malloc (sizeof(cupsd_timeout_t)); -+ if (timeout != NULL) -+ { -+ timeout->enabled = (tv != NULL); -+ if (tv) -+ { -+ timeout->when.tv_sec = tv->tv_sec; -+ timeout->when.tv_usec = tv->tv_usec; -+ } -+ -+ timeout->callback = cb; -+ timeout->data = data; -+ cupsArrayAdd (Timeouts, timeout); -+ } -+ -+ return timeout; -+} -+ -+ -+/* -+ * 'cupsdNextTimeout()' - Find the next enabled timed callback. -+ */ -+ -+cupsd_timeout_t * /* O - Next enabled timeout or NULL */ -+cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */ -+{ -+ cupsd_timeout_t *first = cupsArrayFirst (Timeouts); -+ struct timeval curtime; -+ -+ if (first && !first->enabled) -+ first = NULL; -+ -+ if (first && delay) -+ { -+ gettimeofday (&curtime, NULL); -+ if (avahi_timeval_compare (&curtime, &first->when) > 0) -+ { -+ *delay = 0; -+ } else { -+ *delay = 1 + first->when.tv_sec - curtime.tv_sec; -+ if (first->when.tv_usec < curtime.tv_usec) -+ (*delay)--; -+ } -+ } -+ -+ return (first); -+} -+ -+ -+/* -+ * 'cupsdRunTimeout()' - Run a timed callback. -+ */ -+ -+void -+cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ -+{ -+ if (!timeout) -+ return; -+ timeout->enabled = 0; -+ if (!timeout->callback) -+ return; -+ timeout->callback (timeout, timeout->data); -+} -+ -+/* -+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it. -+ */ -+ -+void -+cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */ -+ const struct timeval *tv) /* I - Absolute time or NULL */ -+{ -+ cupsArrayRemove (Timeouts, timeout); -+ timeout->enabled = (tv != NULL); -+ if (tv) -+ { -+ timeout->when.tv_sec = tv->tv_sec; -+ timeout->when.tv_usec = tv->tv_usec; -+ } -+ cupsArrayAdd (Timeouts, timeout); -+} -+ -+ -+/* -+ * 'cupsdRemoveTimeout()' - Discard a timed callback. -+ */ -+ -+void -+cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ -+{ -+ cupsArrayRemove (Timeouts, timeout); -+ free (timeout); -+} -+ -+ -+#endif /* HAVE_AVAHI ... from top of file */ -+ -+/* -+ * End of "$Id$". -+ */ diff --git a/SOURCES/cups-check-for-listeners.patch b/SOURCES/cups-check-for-listeners.patch deleted file mode 100644 index ffbe8d2..0000000 --- a/SOURCES/cups-check-for-listeners.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/scheduler/conf.c b/scheduler/conf.c -index c113eb3..77ce179 100644 ---- a/scheduler/conf.c -+++ b/scheduler/conf.c -@@ -573,6 +573,18 @@ cupsdReadConfiguration(void) - - cupsdDeleteAllListeners(); - -+ /* -+ * Allocate Listeners array -+ */ -+ -+ Listeners = cupsArrayNew(NULL, NULL); -+ -+ if (!Listeners) -+ { -+ fprintf(stderr, "Unable to allocate memory for array Listeners.\n"); -+ return (0); -+ } -+ - old_remote_port = RemotePort; - RemotePort = 0; - -@@ -1080,28 +1092,6 @@ cupsdReadConfiguration(void) - } - } - -- /* -- * Check that we have at least one listen/port line; if not, report this -- * as an error and exit! -- */ -- -- if (cupsArrayCount(Listeners) == 0) -- { -- /* -- * No listeners! -- */ -- -- cupsdLogMessage(CUPSD_LOG_EMERG, -- "No valid Listen or Port lines were found in the " -- "configuration file."); -- -- /* -- * Commit suicide... -- */ -- -- cupsdEndProcess(getpid(), 0); -- } -- - /* - * Set the default locale using the language and charset... - */ -@@ -3162,17 +3152,6 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ - * Allocate another listener... - */ - -- if (!Listeners) -- Listeners = cupsArrayNew(NULL, NULL); -- -- if (!Listeners) -- { -- cupsdLogMessage(CUPSD_LOG_ERROR, -- "Unable to allocate %s at line %d - %s.", -- line, linenum, strerror(errno)); -- break; -- } -- - if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL) - { - cupsdLogMessage(CUPSD_LOG_ERROR, -diff --git a/scheduler/main.c b/scheduler/main.c -index a6e2c3a..b935c52 100644 ---- a/scheduler/main.c -+++ b/scheduler/main.c -@@ -2113,6 +2113,21 @@ service_checkin(void) - service_add_listener(fd, 0); - } - #endif /* HAVE_LAUNCHD */ -+ -+ if (cupsArrayCount(Listeners) == 0) -+ { -+ /* -+ * No listeners! -+ */ -+ -+ cupsdLogMessage(CUPSD_LOG_EMERG, "No listener sockets present."); -+ -+ /* -+ * Commit suicide... -+ */ -+ -+ cupsdEndProcess(getpid(), 0); -+ } - } diff --git a/SOURCES/cups-cupsd-too-chatty.patch b/SOURCES/cups-cupsd-too-chatty.patch deleted file mode 100644 index 777f78d..0000000 --- a/SOURCES/cups-cupsd-too-chatty.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Napur cups-2.2.6-old/scheduler/job.c cups-2.2.6-new/scheduler/job.c ---- cups-2.2.6-old/scheduler/job.c 2022-04-12 17:32:00.635282080 -0700 -+++ cups-2.2.6-new/scheduler/job.c 2022-04-12 17:33:34.349452614 -0700 -@@ -474,7 +474,7 @@ cupsdCleanJobs(void) - cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing from history."); - cupsdDeleteJob(job, CUPSD_JOB_PURGE); - } -- else if (job->file_time && job->file_time <= curtime) -+ else if (job->file_time && job->file_time <= curtime && job->num_files > 0) - { - cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing document files."); - remove_job_files(job); diff --git a/SOURCES/cups-cve202010001.patch b/SOURCES/cups-cve202010001.patch deleted file mode 100644 index efc6492..0000000 --- a/SOURCES/cups-cve202010001.patch +++ /dev/null @@ -1,61 +0,0 @@ -Fix for CVE-2020-10001, which is a bug in the CUPS ippReadIO function when it -reads tagged string values (nameWithLanguage and textWithLanguage). The -previous code verified that the length of the sub-strings (language identifier -and name/text value) did not exceed the size of the allocated buffer (1 byte -larger than the maximum IPP value size of 32767 bytes), but did not validate -against the length of the actual IPP value. - -The issues introduced by this vulnerability include: - -- Potential information disclosure by copying uninitialized areas of memory into - an IPP string value. -- Potential Denial of Service by supplying/using invalid string values when - strict validation has been disabled by the system administrator. - -This change ensures that: - -1. The language identifier does not extend beyond the end of the IPP value. -2. The length of the name/text string is within the IPP value. -3. The name/text string is within the IPP value. - -diff --git a/cups/ipp.c b/cups/ipp.c -index 3d529346c..adbb26fba 100644 ---- a/cups/ipp.c -+++ b/cups/ipp.c -@@ -2866,7 +2866,8 @@ ippReadIO(void *src, /* I - Data source */ - unsigned char *buffer, /* Data buffer */ - string[IPP_MAX_TEXT], - /* Small string buffer */ -- *bufptr; /* Pointer into buffer */ -+ *bufptr, /* Pointer into buffer */ -+ *bufend; /* End of buffer */ - ipp_attribute_t *attr; /* Current attribute */ - ipp_tag_t tag; /* Current tag */ - ipp_tag_t value_tag; /* Current value tag */ -@@ -3441,6 +3442,7 @@ ippReadIO(void *src, /* I - Data source */ - } - - bufptr = buffer; -+ bufend = buffer + n; - - /* - * text-with-language and name-with-language are composite -@@ -3454,7 +3456,7 @@ ippReadIO(void *src, /* I - Data source */ - - n = (bufptr[0] << 8) | bufptr[1]; - -- if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE) || n >= (int)sizeof(string)) -+ if ((bufptr + 2 + n + 2) > bufend || n >= (int)sizeof(string)) - { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, - _("IPP language length overflows value."), 1); -@@ -3481,7 +3483,7 @@ ippReadIO(void *src, /* I - Data source */ - bufptr += 2 + n; - n = (bufptr[0] << 8) | bufptr[1]; - -- if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE)) -+ if ((bufptr + 2 + n) > bufend) - { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, - _("IPP string length overflows value."), 1); - diff --git a/SOURCES/cups-dirtyclean.patch b/SOURCES/cups-dirtyclean.patch deleted file mode 100644 index 390ed19..0000000 --- a/SOURCES/cups-dirtyclean.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scheduler/main.c b/scheduler/main.c -index 592531a..a6e2c3a 100644 ---- a/scheduler/main.c -+++ b/scheduler/main.c -@@ -947,7 +947,7 @@ main(int argc, /* I - Number of command-line args */ - * Write dirty config/state files... - */ - -- if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0) -+ if (DirtyCleanTime && current_time >= DirtyCleanTime) - cupsdCleanDirty(); - - #ifdef __APPLE__ diff --git a/SOURCES/cups-dnssd-deviceid.patch b/SOURCES/cups-dnssd-deviceid.patch deleted file mode 100644 index 7bd2463..0000000 --- a/SOURCES/cups-dnssd-deviceid.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up cups-2.1.4/backend/dnssd.c.dnssd-deviceid cups-2.1.4/backend/dnssd.c ---- cups-2.1.4/backend/dnssd.c.dnssd-deviceid 2016-06-15 14:36:19.922353606 +0200 -+++ cups-2.1.4/backend/dnssd.c 2016-06-15 14:45:45.794966648 +0200 -@@ -1188,15 +1188,22 @@ query_callback( - if (device->device_id) - free(device->device_id); - -+if (device_id[0]) -+{ -+ /* Mark this as the real device ID. */ -+ ptr = device_id + strlen(device_id); -+ snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;"); -+} -+ - if (!device_id[0] && strcmp(model, "Unknown")) - { - if (make_and_model[0]) -- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;", -+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", - make_and_model, model); - else if (!_cups_strncasecmp(model, "designjet ", 10)) -- snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;", model + 10); -+ snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10); - else if (!_cups_strncasecmp(model, "stylus ", 7)) -- snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;", model + 7); -+ snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7); - else if ((ptr = strchr(model, ' ')) != NULL) - { - /* -@@ -1206,7 +1213,7 @@ query_callback( - memcpy(make_and_model, model, (size_t)(ptr - model)); - make_and_model[ptr - model] = '\0'; - -- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;", -+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", - make_and_model, ptr + 1); - } - } diff --git a/SOURCES/cups-do-not-advertise-http-methods.patch b/SOURCES/cups-do-not-advertise-http-methods.patch deleted file mode 100644 index 541da15..0000000 --- a/SOURCES/cups-do-not-advertise-http-methods.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scheduler/client.c b/scheduler/client.c -index bf284e6..0382b01 100644 ---- a/scheduler/client.c -+++ b/scheduler/client.c -@@ -1011,8 +1011,6 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */ - } - - httpClearFields(con->http); -- httpSetField(con->http, HTTP_FIELD_ALLOW, -- "GET, HEAD, OPTIONS, POST, PUT"); - httpSetField(con->http, HTTP_FIELD_CONTENT_LENGTH, "0"); - - if (!cupsdSendHeader(con, HTTP_STATUS_OK, NULL, CUPSD_AUTH_NONE)) diff --git a/SOURCES/cups-dymo-deviceid.patch b/SOURCES/cups-dymo-deviceid.patch deleted file mode 100644 index cc2995d..0000000 --- a/SOURCES/cups-dymo-deviceid.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cups-1.6.2/ppdc/sample.drv.dymo-deviceid cups-1.6.2/ppdc/sample.drv ---- cups-1.6.2/ppdc/sample.drv.dymo-deviceid 2013-06-18 16:57:02.110662953 +0100 -+++ cups-1.6.2/ppdc/sample.drv 2013-06-18 16:58:56.513989117 +0100 -@@ -125,6 +125,7 @@ Version "1.5" - { - Manufacturer "Dymo" - ModelName "Label Printer" -+ Attribute "1284DeviceID" "" "MFG:DYMO;MDL:LabelWriter 400;" - Attribute NickName "" "Dymo Label Printer" - PCFileName "dymo.ppd" - DriverType label diff --git a/SOURCES/cups-eggcups.patch b/SOURCES/cups-eggcups.patch deleted file mode 100644 index b1eb218..0000000 --- a/SOURCES/cups-eggcups.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -up cups-2.2.5/backend/ipp.c.eggcups cups-2.2.5/backend/ipp.c ---- cups-2.2.5/backend/ipp.c.eggcups 2017-10-13 20:22:26.000000000 +0200 -+++ cups-2.2.5/backend/ipp.c 2017-10-17 18:56:42.409024451 +0200 -@@ -149,6 +149,70 @@ static char tmpfilename[1024] = ""; - static char mandatory_attrs[1024] = ""; - /* cupsMandatory value */ - -+#if HAVE_DBUS -+#include -+ -+static DBusConnection *dbus_connection = NULL; -+ -+static int -+init_dbus (void) -+{ -+ DBusConnection *connection; -+ DBusError error; -+ -+ if (dbus_connection && -+ !dbus_connection_get_is_connected (dbus_connection)) { -+ dbus_connection_unref (dbus_connection); -+ dbus_connection = NULL; -+ } -+ -+ dbus_error_init (&error); -+ connection = dbus_bus_get (getuid () ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error); -+ if (connection == NULL) { -+ dbus_error_free (&error); -+ return -1; -+ } -+ -+ dbus_connection = connection; -+ return 0; -+} -+ -+int -+dbus_broadcast_queued_remote (const char *printer_uri, -+ ipp_status_t status, -+ unsigned int local_job_id, -+ unsigned int remote_job_id, -+ const char *username, -+ const char *printer_name) -+{ -+ DBusMessage *message; -+ DBusMessageIter iter; -+ const char *errstr; -+ -+ if (!dbus_connection || !dbus_connection_get_is_connected (dbus_connection)) { -+ if (init_dbus () || !dbus_connection) -+ return -1; -+ } -+ -+ errstr = ippErrorString (status); -+ message = dbus_message_new_signal ("/com/redhat/PrinterSpooler", -+ "com.redhat.PrinterSpooler", -+ "JobQueuedRemote"); -+ dbus_message_iter_init_append (message, &iter); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_uri); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &errstr); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &local_job_id); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &remote_job_id); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &username); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_name); -+ -+ dbus_connection_send (dbus_connection, message, NULL); -+ dbus_connection_flush (dbus_connection); -+ dbus_message_unref (message); -+ -+ return 0; -+} -+#endif /* HAVE_DBUS */ - - /* - * Local functions... -@@ -1743,6 +1807,15 @@ main(int argc, /* I - Number of comm - fprintf(stderr, "DEBUG: Print job accepted - job ID %d.\n", job_id); - } - -+#if HAVE_DBUS -+ dbus_broadcast_queued_remote (argv[0], -+ ipp_status, -+ atoi (argv[1]), -+ job_id, -+ argv[2], -+ getenv ("PRINTER")); -+#endif /* HAVE_DBUS */ -+ - ippDelete(response); - - if (job_canceled) -diff -up cups-2.2.5/backend/Makefile.eggcups cups-2.2.5/backend/Makefile ---- cups-2.2.5/backend/Makefile.eggcups 2017-10-17 18:56:42.409024451 +0200 -+++ cups-2.2.5/backend/Makefile 2017-10-17 18:59:11.696781116 +0200 -@@ -262,7 +262,7 @@ dnssd: dnssd.o ../cups/$(LIBCUPS) libbac - - ipp: ipp.o ../cups/$(LIBCUPS) libbackend.a - echo Linking $@... -- $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) -+ $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) $(SERVERLIBS) - $(RM) http - $(LN) ipp http - -diff -up cups-2.2.5/scheduler/subscriptions.c.eggcups cups-2.2.5/scheduler/subscriptions.c ---- cups-2.2.5/scheduler/subscriptions.c.eggcups 2017-10-13 20:22:26.000000000 +0200 -+++ cups-2.2.5/scheduler/subscriptions.c 2017-10-17 18:56:42.409024451 +0200 -@@ -1291,13 +1291,13 @@ cupsd_send_dbus(cupsd_eventmask_t event, - what = "PrinterAdded"; - else if (event & CUPSD_EVENT_PRINTER_DELETED) - what = "PrinterRemoved"; -- else if (event & CUPSD_EVENT_PRINTER_CHANGED) -- what = "QueueChanged"; - else if (event & CUPSD_EVENT_JOB_CREATED) - what = "JobQueuedLocal"; - else if ((event & CUPSD_EVENT_JOB_STATE) && job && - job->state_value == IPP_JOB_PROCESSING) - what = "JobStartedLocal"; -+ else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPSD_EVENT_PRINTER_STATE_CHANGED)) -+ what = "QueueChanged"; - else - return; - -@@ -1333,7 +1333,7 @@ cupsd_send_dbus(cupsd_eventmask_t event, - dbus_message_append_iter_init(message, &iter); - if (dest) - dbus_message_iter_append_string(&iter, dest->name); -- if (job) -+ if (job && strcmp (what, "QueueChanged") != 0) - { - dbus_message_iter_append_uint32(&iter, job->id); - dbus_message_iter_append_string(&iter, job->username); diff --git a/SOURCES/cups-etimedout.patch b/SOURCES/cups-etimedout.patch deleted file mode 100644 index 31defda..0000000 --- a/SOURCES/cups-etimedout.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c -index e4ffc3d..a989055 100644 ---- a/cups/http-addrlist.c -+++ b/cups/http-addrlist.c -@@ -240,7 +240,10 @@ httpAddrConnect2( - } - - if (!addrlist && nfds == 0) -+ { -+ errno = EHOSTDOWN; - break; -+ } - - /* - * See if we can connect to any of the addresses so far... -@@ -371,6 +374,9 @@ httpAddrConnect2( - remaining -= 250; - } - -+ if (remaining <= 0) -+ errno = ETIMEDOUT; -+ - while (nfds > 0) - { - nfds --; diff --git a/SOURCES/cups-filter-debug.patch b/SOURCES/cups-filter-debug.patch deleted file mode 100644 index 96c82da..0000000 --- a/SOURCES/cups-filter-debug.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up cups-1.6b1/scheduler/job.c.filter-debug cups-1.6b1/scheduler/job.c ---- cups-1.6b1/scheduler/job.c.filter-debug 2012-05-25 16:06:01.000000000 +0200 -+++ cups-1.6b1/scheduler/job.c 2012-05-25 16:07:46.309259511 +0200 -@@ -625,10 +625,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I - - if (!filters) - { -+ mime_filter_t *current; -+ - cupsdLogJob(job, CUPSD_LOG_ERROR, - "Unable to convert file %d to printable format.", - job->current_file); - -+ cupsdLogJob(job, CUPSD_LOG_ERROR, -+ "Required: %s/%s -> %s/%s", -+ job->filetypes[job->current_file]->super, -+ job->filetypes[job->current_file]->type, -+ job->printer->filetype->super, -+ job->printer->filetype->type); -+ -+ for (current = (mime_filter_t *)cupsArrayFirst(MimeDatabase->srcs); -+ current; -+ current = (mime_filter_t *)cupsArrayNext(MimeDatabase->srcs)) -+ cupsdLogJob(job, CUPSD_LOG_ERROR, -+ "Available: %s/%s -> %s/%s (%s)", -+ current->src->super, current->src->type, -+ current->dst->super, current->dst->type, -+ current->filter); -+ - abort_message = "Aborting job because it cannot be printed."; - abort_state = IPP_JOB_ABORTED; - diff --git a/SOURCES/cups-fips-compliance.patch b/SOURCES/cups-fips-compliance.patch deleted file mode 100644 index df13e75..0000000 --- a/SOURCES/cups-fips-compliance.patch +++ /dev/null @@ -1,371 +0,0 @@ -diff --git a/cups/cups.h b/cups/cups.h -index 8f5c818..9d8c3a3 100644 ---- a/cups/cups.h -+++ b/cups/cups.h -@@ -606,6 +606,9 @@ extern ssize_t cupsHashData(const char *algorithm, const void *data, size_t dat - extern int cupsAddIntegerOption(const char *name, int value, int num_options, cups_option_t **options) _CUPS_API_2_2_4; - extern int cupsGetIntegerOption(const char *name, int num_options, cups_option_t *options) _CUPS_API_2_2_4; - -+/* New in CUPS 2.3 */ -+extern const char *cupsHashString(const unsigned char *hash, size_t hashsize, char *buffer, size_t bufsize); -+ - # ifdef __cplusplus - } - # endif /* __cplusplus */ -diff --git a/cups/hash.c b/cups/hash.c -index ede5461..8ebe20b 100644 ---- a/cups/hash.c -+++ b/cups/hash.c -@@ -21,6 +21,8 @@ - # include - #elif defined(HAVE_GNUTLS) - # include -+#else -+# include "md5-private.h" - #endif /* __APPLE__ */ - - -@@ -171,7 +173,9 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */ - unsigned char temp[64]; /* Temporary hash buffer */ - size_t tempsize = 0; /* Truncate to this size? */ - -- if (!strcmp(algorithm, "sha")) -+ if (!strcmp(algorithm, "md5")) -+ alg = GNUTLS_DIG_MD5; -+ else if (!strcmp(algorithm, "sha")) - alg = GNUTLS_DIG_SHA1; - else if (!strcmp(algorithm, "sha2-224")) - alg = GNUTLS_DIG_SHA224; -@@ -219,10 +223,20 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */ - - #else - /* -- * No hash support without CommonCrypto or GNU TLS... -+ * No hash support beyond MD5 without CommonCrypto or GNU TLS... - */ - -- if (hashsize < 64) -+ if (!strcmp(algorithm, "md5")) -+ { -+ _cups_md5_state_t state; /* MD5 state info */ -+ -+ _cupsMD5Init(&state); -+ _cupsMD5Append(&state, data, datalen); -+ _cupsMD5Finish(&state, hash); -+ -+ return (16); -+ } -+ else if (hashsize < 64) - goto too_small; - #endif /* __APPLE__ */ - -@@ -243,3 +257,51 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */ - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Hash buffer too small."), 1); - return (-1); - } -+ -+ -+/* -+ * 'cupsHashString()' - Format a hash value as a hexadecimal string. -+ * -+ * The passed buffer must be at least 2 * hashsize + 1 characters in length. -+ */ -+ -+const char * /* O - Formatted string */ -+cupsHashString( -+ const unsigned char *hash, /* I - Hash */ -+ size_t hashsize, /* I - Size of hash */ -+ char *buffer, /* I - String buffer */ -+ size_t bufsize) /* I - Size of string buffer */ -+{ -+ char *bufptr = buffer; /* Pointer into buffer */ -+ static const char *hex = "0123456789abcdef"; -+ /* Hex characters (lowercase!) */ -+ -+ -+ /* -+ * Range check input... -+ */ -+ -+ if (!hash || hashsize < 1 || !buffer || bufsize < (2 * hashsize + 1)) -+ { -+ if (buffer) -+ *buffer = '\0'; -+ return (NULL); -+ } -+ -+ /* -+ * Loop until we've converted the whole hash... -+ */ -+ -+ while (hashsize > 0) -+ { -+ *bufptr++ = hex[*hash >> 4]; -+ *bufptr++ = hex[*hash & 15]; -+ -+ hash ++; -+ hashsize --; -+ } -+ -+ *bufptr = '\0'; -+ -+ return (buffer); -+} -diff --git a/cups/md5passwd.c b/cups/md5passwd.c -index a9817aa..c9ffe04 100644 ---- a/cups/md5passwd.c -+++ b/cups/md5passwd.c -@@ -17,6 +17,7 @@ - * Include necessary headers... - */ - -+#include - #include "http-private.h" - #include "string-private.h" - -@@ -31,7 +32,6 @@ httpMD5(const char *username, /* I - User name */ - const char *passwd, /* I - Password string */ - char md5[33]) /* O - MD5 string */ - { -- _cups_md5_state_t state; /* MD5 state info */ - unsigned char sum[16]; /* Sum data */ - char line[256]; /* Line to sum */ - -@@ -41,15 +41,13 @@ httpMD5(const char *username, /* I - User name */ - */ - - snprintf(line, sizeof(line), "%s:%s:%s", username, realm, passwd); -- _cupsMD5Init(&state); -- _cupsMD5Append(&state, (unsigned char *)line, (int)strlen(line)); -- _cupsMD5Finish(&state, sum); -+ cupsHashData("md5", (unsigned char *)line, strlen(line), sum, sizeof(sum)); - - /* - * Return the sum... - */ - -- return (httpMD5String(sum, md5)); -+ return ((char *)cupsHashString(sum, sizeof(sum), md5, 33)); - } - - -@@ -65,7 +63,6 @@ httpMD5Final(const char *nonce, /* I - Server nonce value */ - const char *resource, /* I - Resource path */ - char md5[33]) /* IO - MD5 sum */ - { -- _cups_md5_state_t state; /* MD5 state info */ - unsigned char sum[16]; /* Sum data */ - char line[1024]; /* Line of data */ - char a2[33]; /* Hash of method and resource */ -@@ -76,9 +73,7 @@ httpMD5Final(const char *nonce, /* I - Server nonce value */ - */ - - snprintf(line, sizeof(line), "%s:%s", method, resource); -- _cupsMD5Init(&state); -- _cupsMD5Append(&state, (unsigned char *)line, (int)strlen(line)); -- _cupsMD5Finish(&state, sum); -+ cupsHashData("md5", (unsigned char *)line, strlen(line), sum, sizeof(sum)); - httpMD5String(sum, a2); - - /* -@@ -88,12 +83,9 @@ httpMD5Final(const char *nonce, /* I - Server nonce value */ - */ - - snprintf(line, sizeof(line), "%s:%s:%s", md5, nonce, a2); -+ cupsHashData("md5", (unsigned char *)line, strlen(line), sum, sizeof(sum)); - -- _cupsMD5Init(&state); -- _cupsMD5Append(&state, (unsigned char *)line, (int)strlen(line)); -- _cupsMD5Finish(&state, sum); -- -- return (httpMD5String(sum, md5)); -+ return ((char *)cupsHashString(sum, sizeof(sum), md5, 33)); - } - - -@@ -106,23 +98,5 @@ httpMD5String(const unsigned char *sum, /* I - MD5 sum data */ - char md5[33]) - /* O - MD5 sum in hex */ - { -- int i; /* Looping var */ -- char *md5ptr; /* Pointer into MD5 string */ -- static const char hex[] = "0123456789abcdef"; -- /* Hex digits */ -- -- -- /* -- * Convert the MD5 sum to hexadecimal... -- */ -- -- for (i = 16, md5ptr = md5; i > 0; i --, sum ++) -- { -- *md5ptr++ = hex[*sum >> 4]; -- *md5ptr++ = hex[*sum & 15]; -- } -- -- *md5ptr = '\0'; -- -- return (md5); -+ return ((char *)cupsHashString(sum, 16, md5, 33)); - } -diff --git a/scheduler/auth.c b/scheduler/auth.c -index 71df9dc..e7d0006 100644 ---- a/scheduler/auth.c -+++ b/scheduler/auth.c -@@ -72,9 +72,6 @@ static int check_authref(cupsd_client_t *con, const char *right); - static int compare_locations(cupsd_location_t *a, - cupsd_location_t *b); - static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data); --#if !HAVE_LIBPAM --static char *cups_crypt(const char *pw, const char *salt); --#endif /* !HAVE_LIBPAM */ - static void free_authmask(cupsd_authmask_t *am, void *data); - #if HAVE_LIBPAM - static int pam_func(int, const struct pam_message **, -@@ -695,14 +692,14 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */ - * client... - */ - -- pass = cups_crypt(password, pw->pw_passwd); -+ pass = crypt(password, pw->pw_passwd); - - if (!pass || strcmp(pw->pw_passwd, pass)) - { - # ifdef HAVE_SHADOW_H - if (spw) - { -- pass = cups_crypt(password, spw->sp_pwdp); -+ pass = crypt(password, spw->sp_pwdp); - - if (pass == NULL || strcmp(spw->sp_pwdp, pass)) - { -@@ -1988,129 +1985,6 @@ copy_authmask(cupsd_authmask_t *mask, /* I - Existing auth mask */ - } - - --#if !HAVE_LIBPAM --/* -- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms, -- * as needed. -- */ -- --static char * /* O - Encrypted password */ --cups_crypt(const char *pw, /* I - Password string */ -- const char *salt) /* I - Salt (key) string */ --{ -- if (!strncmp(salt, "$1$", 3)) -- { -- /* -- * Use MD5 passwords without the benefit of PAM; this is for -- * Slackware Linux, and the algorithm was taken from the -- * old shadow-19990827/lib/md5crypt.c source code... :( -- */ -- -- int i; /* Looping var */ -- unsigned long n; /* Output number */ -- int pwlen; /* Length of password string */ -- const char *salt_end; /* End of "salt" data for MD5 */ -- char *ptr; /* Pointer into result string */ -- _cups_md5_state_t state; /* Primary MD5 state info */ -- _cups_md5_state_t state2; /* Secondary MD5 state info */ -- unsigned char digest[16]; /* MD5 digest result */ -- static char result[120]; /* Final password string */ -- -- -- /* -- * Get the salt data between dollar signs, e.g. $1$saltdata$md5. -- * Get a maximum of 8 characters of salt data after $1$... -- */ -- -- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++) -- if (*salt_end == '$') -- break; -- -- /* -- * Compute the MD5 sum we need... -- */ -- -- pwlen = strlen(pw); -- -- _cupsMD5Init(&state); -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt); -- -- _cupsMD5Init(&state2); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Finish(&state2, digest); -- -- for (i = pwlen; i > 0; i -= 16) -- _cupsMD5Append(&state, digest, i > 16 ? 16 : i); -- -- for (i = pwlen; i > 0; i >>= 1) -- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); -- -- _cupsMD5Finish(&state, digest); -- -- for (i = 0; i < 1000; i ++) -- { -- _cupsMD5Init(&state); -- -- if (i & 1) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- else -- _cupsMD5Append(&state, digest, 16); -- -- if (i % 3) -- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); -- -- if (i % 7) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- if (i & 1) -- _cupsMD5Append(&state, digest, 16); -- else -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- _cupsMD5Finish(&state, digest); -- } -- -- /* -- * Copy the final sum to the result string and return... -- */ -- -- memcpy(result, salt, (size_t)(salt_end - salt)); -- ptr = result + (salt_end - salt); -- *ptr++ = '$'; -- -- for (i = 0; i < 5; i ++, ptr += 4) -- { -- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8); -- -- if (i < 4) -- n |= (unsigned)digest[i + 12]; -- else -- n |= (unsigned)digest[5]; -- -- to64(ptr, n, 4); -- } -- -- to64(ptr, (unsigned)digest[11], 2); -- ptr += 2; -- *ptr = '\0'; -- -- return (result); -- } -- else -- { -- /* -- * Use the standard crypt() function... -- */ -- -- return (crypt(pw, salt)); -- } --} --#endif /* !HAVE_LIBPAM */ -- -- - /* - * 'free_authmask()' - Free function for auth masks. - */ diff --git a/SOURCES/cups-fix-preservejob-times.patch b/SOURCES/cups-fix-preservejob-times.patch deleted file mode 100644 index beed408..0000000 --- a/SOURCES/cups-fix-preservejob-times.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff --git a/scheduler/job.c b/scheduler/job.c -index 82ef2eb..5d5e3aa 100644 ---- a/scheduler/job.c -+++ b/scheduler/job.c -@@ -448,10 +448,20 @@ cupsdCleanJobs(void) - curtime = time(NULL); - JobHistoryUpdate = 0; - -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCleanJobs: curtime=%d", (int)curtime); -+ - for (job = (cupsd_job_t *)cupsArrayFirst(Jobs); - job; - job = (cupsd_job_t *)cupsArrayNext(Jobs)) - { -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCleanJobs: Job %d, state=%d, printer=%p, history_time=%d, file_time=%d", job->id, (int)job->state_value, (void *)job->printer, (int)job->history_time, (int)job->file_time); -+ -+ if ((job->history_time && job->history_time < JobHistoryUpdate) || !JobHistoryUpdate) -+ JobHistoryUpdate = job->history_time; -+ -+ if ((job->file_time && job->file_time < JobHistoryUpdate) || !JobHistoryUpdate) -+ JobHistoryUpdate = job->file_time; -+ - if (job->state_value >= IPP_JOB_CANCELED && !job->printer) - { - /* -@@ -462,26 +472,14 @@ cupsdCleanJobs(void) - (job->history_time && job->history_time <= curtime)) - { - cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing from history."); -- cupsdDeleteJob(job, CUPSD_JOB_PURGE); -+ cupsdDeleteJob(job, CUPSD_JOB_PURGE); - } - else if (job->file_time && job->file_time <= curtime) - { - cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing document files."); -- cupsdLogJob(job, CUPSD_LOG_DEBUG2, "curtime=%ld, job->file_time=%ld", (long)curtime, (long)job->file_time); - remove_job_files(job); - - cupsdMarkDirty(CUPSD_DIRTY_JOBS); -- -- if (job->history_time < JobHistoryUpdate || !JobHistoryUpdate) -- JobHistoryUpdate = job->history_time; -- } -- else -- { -- if (job->history_time < JobHistoryUpdate || !JobHistoryUpdate) -- JobHistoryUpdate = job->history_time; -- -- if (job->file_time < JobHistoryUpdate || !JobHistoryUpdate) -- JobHistoryUpdate = job->file_time; - } - } - } -@@ -1873,7 +1871,7 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ - job->completed_time = attr->values[0].integer; - - if (JobHistory < INT_MAX) -- job->history_time = attr->values[0].integer + JobHistory; -+ job->history_time = job->completed_time + JobHistory; - else - job->history_time = INT_MAX; - -@@ -1884,7 +1882,7 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ - JobHistoryUpdate = job->history_time; - - if (JobFiles < INT_MAX) -- job->file_time = attr->values[0].integer + JobFiles; -+ job->file_time = job->completed_time + JobFiles; - else - job->file_time = INT_MAX; - -@@ -3100,8 +3098,10 @@ cupsdUpdateJobs(void) - * Update history/file expiration times... - */ - -+ job->completed_time = attr->values[0].integer; -+ - if (JobHistory < INT_MAX) -- job->history_time = attr->values[0].integer + JobHistory; -+ job->history_time = job->completed_time + JobHistory; - else - job->history_time = INT_MAX; - -@@ -3115,7 +3115,7 @@ cupsdUpdateJobs(void) - JobHistoryUpdate = job->history_time; - - if (JobFiles < INT_MAX) -- job->file_time = attr->values[0].integer + JobFiles; -+ job->file_time = job->completed_time + JobFiles; - else - job->file_time = INT_MAX; - -@@ -4909,7 +4909,7 @@ set_time(cupsd_job_t *job, /* I - Job to update */ - job->completed_time = curtime; - - if (JobHistory < INT_MAX && attr) -- job->history_time = attr->values[0].integer + JobHistory; -+ job->history_time = job->completed_time + JobHistory; - else - job->history_time = INT_MAX; - -@@ -4917,7 +4917,7 @@ set_time(cupsd_job_t *job, /* I - Job to update */ - JobHistoryUpdate = job->history_time; - - if (JobFiles < INT_MAX && attr) -- job->file_time = curtime + JobFiles; -+ job->file_time = job->completed_time + JobFiles; - else - job->file_time = INT_MAX; - diff --git a/SOURCES/cups-hp-deviceid-oid.patch b/SOURCES/cups-hp-deviceid-oid.patch deleted file mode 100644 index da5136a..0000000 --- a/SOURCES/cups-hp-deviceid-oid.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.5b1/backend/snmp.c.hp-deviceid-oid cups-1.5b1/backend/snmp.c ---- cups-1.5b1/backend/snmp.c.hp-deviceid-oid 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/backend/snmp.c 2011-05-24 17:24:48.000000000 +0200 -@@ -187,6 +187,7 @@ static const int UriOID[] = { CUPS_OID_p - static const int LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 }; - static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 }; - static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 }; -+static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 }; - static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 }; - static cups_array_t *DeviceURIs = NULL; - static int HostNameLookups = 0; -@@ -1006,6 +1007,9 @@ read_snmp_response(int fd) /* I - SNMP - _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, - packet.community, CUPS_ASN1_GET_REQUEST, - DEVICE_PRODUCT, XeroxProductOID); -+ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, -+ packet.community, CUPS_ASN1_GET_REQUEST, -+ DEVICE_ID, HPDeviceIdOID); - break; - - case DEVICE_DESCRIPTION : diff --git a/SOURCES/cups-ippeve-web-support.patch b/SOURCES/cups-ippeve-web-support.patch deleted file mode 100644 index d799c23..0000000 --- a/SOURCES/cups-ippeve-web-support.patch +++ /dev/null @@ -1,315 +0,0 @@ -diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c -index a604a8a..e678f24 100644 ---- a/cgi-bin/admin.c -+++ b/cgi-bin/admin.c -@@ -974,6 +974,13 @@ do_am_printer(http_t *http, /* I - HTTP connection */ - - cgiSetVariable("TEMPLATE_NAME", template); - } -+ -+ /* -+ * Set DEVICE_URI to the actual device uri, without make and model from -+ * html form. -+ */ -+ -+ cgiSetVariable("DEVICE_URI", var); - } - } - -@@ -1137,6 +1144,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */ - else if (!file && - (!cgiGetVariable("PPD_NAME") || cgiGetVariable("SELECT_MAKE"))) - { -+ int ipp_everywhere = !strncmp(var, "ipp://", 6) || !strncmp(var, "ipps://", 7) || (!strncmp(var, "dnssd://", 8) && (strstr(var, "_ipp._tcp") || strstr(var, "_ipps._tcp"))); -+ - if (modify && !cgiGetVariable("SELECT_MAKE")) - { - /* -@@ -1282,9 +1291,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */ - cgiStartHTML(title); - if (!cgiGetVariable("PPD_MAKE")) - cgiSetVariable("PPD_MAKE", cgiGetVariable("CURRENT_MAKE")); -- if (!modify) -- cgiSetVariable("CURRENT_MAKE_AND_MODEL", -- cgiGetArray("PPD_MAKE_AND_MODEL", 0)); -+ if (ipp_everywhere) -+ cgiSetVariable("SHOW_IPP_EVERYWHERE", "1"); - cgiCopyTemplateLang("choose-model.tmpl"); - cgiEndHTML(); - } -@@ -4219,6 +4227,11 @@ get_printer_ppd(const char *uri, /* I - Printer URI */ - host[256], /* Hostname */ - resource[256]; /* Resource path */ - int port; /* Port number */ -+ static const char * const pattrs[] = /* Printer attributes we need */ -+ { -+ "all", -+ "media-col-database" -+ }; - - - /* -@@ -4259,6 +4272,7 @@ get_printer_ppd(const char *uri, /* I - Printer URI */ - - request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); -+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs); - response = cupsDoRequest(http, request, resource); - - if (!_ppdCreateFromIPP(buffer, bufsize, response)) -diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c -index e5f89ee..b8139c8 100644 ---- a/cups/ppd-cache.c -+++ b/cups/ppd-cache.c -@@ -3089,8 +3089,8 @@ _ppdCreateFromIPP(char *buffer, /* I - Filename buffer */ - cupsFilePrintf(fp, "*Manufacturer: \"%s\"\n", make); - cupsFilePrintf(fp, "*ModelName: \"%s\"\n", model); - cupsFilePrintf(fp, "*Product: \"(%s)\"\n", model); -- cupsFilePrintf(fp, "*NickName: \"%s\"\n", model); -- cupsFilePrintf(fp, "*ShortNickName: \"%s\"\n", model); -+ cupsFilePrintf(fp, "*NickName: \"%s - IPP Everywhere\"\n", model); -+ cupsFilePrintf(fp, "*ShortNickName: \"%s - IPP Everywhere\"\n", model); - - if ((attr = ippFindAttribute(response, "color-supported", IPP_TAG_BOOLEAN)) != NULL && ippGetBoolean(attr, 0)) - cupsFilePuts(fp, "*ColorDevice: True\n"); -diff --git a/scheduler/ipp.c b/scheduler/ipp.c -index 5e9a985..4ed3c39 100644 ---- a/scheduler/ipp.c -+++ b/scheduler/ipp.c -@@ -5829,6 +5829,12 @@ create_local_bg_thread( - ipp_t *request, /* Request to printer */ - *response; /* Response from printer */ - ipp_attribute_t *attr; /* Attribute in response */ -+ ipp_status_t status; /* Status code */ -+ static const char * const pattrs[] = /* Printer attributes we need */ -+ { -+ "all", -+ "media-col-database" -+ }; - - - /* -@@ -5861,12 +5867,35 @@ create_local_bg_thread( - cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Connected to %s:%d, sending Get-Printer-Attributes request...", printer->name, host, port); - - request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); -+ ippSetVersion(request, 2, 0); - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printer->device_uri); -- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", NULL, "all"); -+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs); - - response = cupsDoRequest(http, request, resource); -+ status = cupsLastError(); -+ -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Get-Printer-Attributes returned %s (%s)", printer->name, ippErrorString(cupsLastError()), cupsLastErrorString()); -+ -+ if (status == IPP_STATUS_ERROR_BAD_REQUEST || status == IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED) -+ { -+ /* -+ * Try request using IPP/1.1, in case we are talking to an old CUPS server or -+ * printer... -+ */ - -- cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Get-Printer-Attributes returned %s", printer->name, ippErrorString(cupsLastError())); -+ ippDelete(response); -+ -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Re-sending Get-Printer-Attributes request using IPP/1.1...", printer->name); -+ -+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); -+ ippSetVersion(request, 1, 1); -+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printer->device_uri); -+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", NULL, "all"); -+ -+ response = cupsDoRequest(http, request, resource); -+ -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: IPP/1.1 Get-Printer-Attributes returned %s (%s)", printer->name, ippErrorString(cupsLastError()), cupsLastErrorString()); -+ } - - // TODO: Grab printer icon file... - httpClose(http); -@@ -5877,6 +5906,8 @@ create_local_bg_thread( - - if (_ppdCreateFromIPP(fromppd, sizeof(fromppd), response)) - { -+ _cupsRWLockWrite(&printer->lock); -+ - if ((!printer->info || !*(printer->info)) && (attr = ippFindAttribute(response, "printer-info", IPP_TAG_TEXT)) != NULL) - cupsdSetString(&printer->info, ippGetString(attr, 0, NULL)); - -@@ -5886,6 +5917,8 @@ create_local_bg_thread( - if ((!printer->geo_location || !*(printer->geo_location)) && (attr = ippFindAttribute(response, "printer-geo-location", IPP_TAG_URI)) != NULL) - cupsdSetString(&printer->geo_location, ippGetString(attr, 0, NULL)); - -+ _cupsRWUnlock(&printer->lock); -+ - if ((from = cupsFileOpen(fromppd, "r")) == NULL) - { - cupsdLogMessage(CUPSD_LOG_ERROR, "%s: Unable to read generated PPD: %s", printer->name, strerror(errno)); -diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c -index bb53565..f3510ca 100644 ---- a/systemv/lpadmin.c -+++ b/systemv/lpadmin.c -@@ -33,7 +33,7 @@ static int delete_printer_from_class(http_t *http, char *printer, - static int delete_printer_option(http_t *http, char *printer, - char *option); - static int enable_printer(http_t *http, char *printer); --static char *get_printer_ppd(const char *uri, char *buffer, size_t bufsize); -+static char *get_printer_ppd(const char *uri, char *buffer, size_t bufsize, int *num_options, cups_option_t **options); - static cups_ptype_t get_printer_type(http_t *http, char *printer, char *uri, - size_t urisize); - static int set_printer_options(http_t *http, char *printer, -@@ -593,7 +593,7 @@ main(int argc, /* I - Number of command-line arguments */ - - if ((ppd_name = cupsGetOption("ppd-name", num_options, options)) != NULL && !strcmp(ppd_name, "everywhere") && (device_uri = cupsGetOption("device-uri", num_options, options)) != NULL) - { -- if ((file = get_printer_ppd(device_uri, evefile, sizeof(evefile))) == NULL) -+ if ((file = get_printer_ppd(device_uri, evefile, sizeof(evefile), &num_options, &options)) == NULL) - return (1); - - num_options = cupsRemoveOption("ppd-name", num_options, &options); -@@ -1144,20 +1144,29 @@ enable_printer(http_t *http, /* I - Server connection */ - * 'get_printer_ppd()' - Get an IPP Everywhere PPD file for the given URI. - */ - --static char * /* O - Filename or NULL */ --get_printer_ppd(const char *uri, /* I - Printer URI */ -- char *buffer, /* I - Filename buffer */ -- size_t bufsize) /* I - Size of filename buffer */ -+static char * /* O - Filename or NULL */ -+get_printer_ppd( -+ const char *uri, /* I - Printer URI */ -+ char *buffer, /* I - Filename buffer */ -+ size_t bufsize, /* I - Size of filename buffer */ -+ int *num_options, /* IO - Number of options */ -+ cups_option_t **options) /* IO - Options */ - { - http_t *http; /* Connection to printer */ - ipp_t *request, /* Get-Printer-Attributes request */ - *response; /* Get-Printer-Attributes response */ -+ ipp_attribute_t *attr; /* Attribute from response */ - char resolved[1024], /* Resolved URI */ - scheme[32], /* URI scheme */ - userpass[256], /* Username:password */ - host[256], /* Hostname */ - resource[256]; /* Resource path */ - int port; /* Port number */ -+ static const char * const pattrs[] = /* Attributes to use */ -+ { -+ "all", -+ "media-col-database" -+ }; - - - /* -@@ -1198,9 +1207,26 @@ get_printer_ppd(const char *uri, /* I - Printer URI */ - - request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); -+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(pattrs) / sizeof(pattrs[0]), NULL, pattrs); - response = cupsDoRequest(http, request, resource); - -- if (!_ppdCreateFromIPP(buffer, bufsize, response)) -+ if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE) -+ { -+ _cupsLangPrintf(stderr, _("%s: Unable to query printer: %s"), "lpadmin", cupsLastErrorString()); -+ buffer[0] = '\0'; -+ } -+ else if (_ppdCreateFromIPP(buffer, bufsize, response)) -+ { -+ if (!cupsGetOption("printer-geo-location", *num_options, *options) && (attr = ippFindAttribute(response, "printer-geo-location", IPP_TAG_URI)) != NULL) -+ *num_options = cupsAddOption("printer-geo-location", ippGetString(attr, 0, NULL), *num_options, options); -+ -+ if (!cupsGetOption("printer-info", *num_options, *options) && (attr = ippFindAttribute(response, "printer-info", IPP_TAG_TEXT)) != NULL) -+ *num_options = cupsAddOption("printer-info", ippGetString(attr, 0, NULL), *num_options, options); -+ -+ if (!cupsGetOption("printer-location", *num_options, *options) && (attr = ippFindAttribute(response, "printer-location", IPP_TAG_TEXT)) != NULL) -+ *num_options = cupsAddOption("printer-location", ippGetString(attr, 0, NULL), *num_options, options); -+ } -+ else - _cupsLangPrintf(stderr, _("%s: Unable to create PPD file: %s"), "lpadmin", strerror(errno)); - - ippDelete(response); -diff --git a/templates/choose-model.tmpl b/templates/choose-model.tmpl -index ee9338c..9c9b71f 100644 ---- a/templates/choose-model.tmpl -+++ b/templates/choose-model.tmpl -@@ -39,6 +39,7 @@ - - - -diff --git a/templates/de/choose-model.tmpl b/templates/de/choose-model.tmpl -index cb9b6f3..c73ccb2 100644 ---- a/templates/de/choose-model.tmpl -+++ b/templates/de/choose-model.tmpl -@@ -39,6 +39,7 @@ Drucker {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im Netzwerk fr - - - -diff --git a/templates/es/choose-model.tmpl b/templates/es/choose-model.tmpl -index 8a5a4ba..b5624f2 100644 ---- a/templates/es/choose-model.tmpl -+++ b/templates/es/choose-model.tmpl -@@ -39,6 +39,7 @@ - - - -diff --git a/templates/fr/choose-model.tmpl b/templates/fr/choose-model.tmpl -index a4e771c..07cf93c 100644 ---- a/templates/fr/choose-model.tmpl -+++ b/templates/fr/choose-model.tmpl -@@ -39,6 +39,7 @@ - - - -diff --git a/templates/ja/choose-model.tmpl b/templates/ja/choose-model.tmpl -index daf1375..6a6e4e4 100644 ---- a/templates/ja/choose-model.tmpl -+++ b/templates/ja/choose-model.tmpl -@@ -39,6 +39,7 @@ - - - -diff --git a/templates/pt_BR/choose-model.tmpl b/templates/pt_BR/choose-model.tmpl -index 55d8bd8..0ed6a3c 100644 ---- a/templates/pt_BR/choose-model.tmpl -+++ b/templates/pt_BR/choose-model.tmpl -@@ -39,6 +39,7 @@ - - - -diff --git a/templates/ru/choose-model.tmpl b/templates/ru/choose-model.tmpl -index 2f0d6d9..dedbd49 100644 ---- a/templates/ru/choose-model.tmpl -+++ b/templates/ru/choose-model.tmpl -@@ -39,6 +39,7 @@ - - - diff --git a/SOURCES/cups-kerberos.patch b/SOURCES/cups-kerberos.patch deleted file mode 100644 index 6d88c7f..0000000 --- a/SOURCES/cups-kerberos.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/backend/ipp.c b/backend/ipp.c -index f8bf7e1..8440d2f 100644 ---- a/backend/ipp.c -+++ b/backend/ipp.c -@@ -422,8 +422,7 @@ main(int argc, /* I - Number of command-line args */ - * that way. - */ - -- if (!getuid() && (value = getenv("AUTH_UID")) != NULL && -- !getenv("AUTH_PASSWORD")) -+ if (!getuid() && (value = getenv("AUTH_UID")) != NULL) - { - uid_t uid = (uid_t)atoi(value); - /* User ID */ -@@ -457,7 +456,7 @@ main(int argc, /* I - Number of command-line args */ - - # else /* No XPC, just try to run as the user ID */ - if (uid > 0) -- seteuid(uid); -+ setuid(uid); - # endif /* HAVE_XPC */ - } - #endif /* HAVE_GSSAPI */ diff --git a/SOURCES/cups-logrotate.patch b/SOURCES/cups-logrotate.patch deleted file mode 100644 index 6b8eb8c..0000000 --- a/SOURCES/cups-logrotate.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up cups-2.1b1/scheduler/log.c.logrotate cups-2.1b1/scheduler/log.c ---- cups-2.1b1/scheduler/log.c.logrotate 2015-06-04 20:00:31.000000000 +0200 -+++ cups-2.1b1/scheduler/log.c 2015-06-29 13:25:09.623350218 +0200 -@@ -26,6 +26,9 @@ - # include - #endif /* HAVE_ASL_H */ - #include -+#include -+#include -+#include - - - /* -@@ -135,12 +138,10 @@ cupsdCheckLogFile(cups_file_t **lf, /* I - } - - /* -- * Format the filename as needed... -+ * Format the filename... - */ - -- if (!*lf || -- (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize && -- MaxLogSize > 0)) -+ if (strncmp(logname, "/dev/", 5)) - { - /* - * Handle format strings... -@@ -254,6 +255,34 @@ cupsdCheckLogFile(cups_file_t **lf, /* I - /* - * Change ownership and permissions of non-device logs... - */ -+ -+ fchown(cupsFileNumber(*lf), RunUser, Group); -+ fchmod(cupsFileNumber(*lf), LogFilePerm); -+ } -+ } -+ -+ /* -+ * Has someone else (i.e. logrotate) already rotated the log for us? -+ */ -+ else if (strncmp(filename, "/dev/", 5)) -+ { -+ struct stat st; -+ if (stat(filename, &st) || st.st_size == 0) -+ { -+ /* File is either missing or has zero size. */ -+ -+ cupsFileClose(*lf); -+ if ((*lf = cupsFileOpen(filename, "a")) == NULL) -+ { -+ syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename, -+ strerror(errno)); -+ -+ return (0); -+ } -+ -+ /* -+ * Change ownership and permissions of non-device logs... -+ */ - - fchown(cupsFileNumber(*lf), RunUser, Group); - fchmod(cupsFileNumber(*lf), LogFilePerm); diff --git a/SOURCES/cups-logs.patch b/SOURCES/cups-logs.patch deleted file mode 100644 index 5698618..0000000 --- a/SOURCES/cups-logs.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/scheduler/log.c b/scheduler/log.c -index 33cdac6..d66bbf9 100644 ---- a/scheduler/log.c -+++ b/scheduler/log.c -@@ -597,51 +597,6 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ - if (level > LogLevel && LogDebugHistory <= 0) - return (1); - --#ifdef HAVE_SYSTEMD_SD_JOURNAL_H -- if (!strcmp(ErrorLog, "syslog")) -- { -- cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL; -- static const char * const job_states[] = -- { /* job-state strings */ -- "Pending", -- "PendingHeld", -- "Processing", -- "ProcessingStopped", -- "Canceled", -- "Aborted", -- "Completed" -- }; -- -- va_start(ap, message); -- -- do -- { -- va_copy(ap2, ap); -- status = format_log_line(message, ap2); -- va_end(ap2); -- } -- while (status == 0); -- -- va_end(ap); -- -- if (job) -- sd_journal_send("MESSAGE=%s", log_line, -- "PRIORITY=%i", log_levels[level], -- PWG_Event"=JobStateChanged", -- PWG_ServiceURI"=%s", printer ? printer->uri : "", -- PWG_JobID"=%d", job->id, -- PWG_JobState"=%s", job->state_value < IPP_JSTATE_PENDING ? "" : job_states[job->state_value - IPP_JSTATE_PENDING], -- PWG_JobImpressionsCompleted"=%d", ippGetInteger(job->impressions, 0), -- NULL); -- else -- sd_journal_send("MESSAGE=%s", log_line, -- "PRIORITY=%i", log_levels[level], -- NULL); -- -- return (1); -- } --#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */ -- - /* - * Format and write the log message... - */ -@@ -705,7 +660,43 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ - return (1); - } - else if (level <= LogLevel) -+ { -+#ifdef HAVE_SYSTEMD_SD_JOURNAL_H -+ if (!strcmp(ErrorLog, "syslog")) -+ { -+ cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL; -+ static const char * const job_states[] = -+ { /* job-state strings */ -+ "Pending", -+ "PendingHeld", -+ "Processing", -+ "ProcessingStopped", -+ "Canceled", -+ "Aborted", -+ "Completed" -+ }; -+ -+ if (job) -+ sd_journal_send("MESSAGE=%s", log_line, -+ "PRIORITY=%i", log_levels[level], -+ PWG_Event"=JobStateChanged", -+ PWG_ServiceURI"=%s", printer ? printer->uri : "", -+ PWG_JobID"=%d", job->id, -+ PWG_JobState"=%s", job->state_value < IPP_JSTATE_PENDING ? "" : job_states[job->state_value - IPP_JSTATE_PENDING], -+ PWG_JobImpressionsCompleted"=%d", ippGetInteger(job->impressions, 0), -+ NULL); -+ else -+ sd_journal_send("MESSAGE=%s", log_line, -+ "PRIORITY=%i", log_levels[level], -+ NULL); -+ -+ return (1); -+ } -+ else -+#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */ -+ - return (cupsdWriteErrorLog(level, log_line)); -+ } - else - return (1); - } diff --git a/SOURCES/cups-lpr-help.patch b/SOURCES/cups-lpr-help.patch deleted file mode 100644 index f025698..0000000 --- a/SOURCES/cups-lpr-help.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up cups-2.2b2/berkeley/lpr.c.lpr-help cups-2.2b2/berkeley/lpr.c ---- cups-2.2b2/berkeley/lpr.c.lpr-help 2016-06-24 17:43:35.000000000 +0200 -+++ cups-2.2b2/berkeley/lpr.c 2016-06-27 15:11:30.646348752 +0200 -@@ -18,6 +18,31 @@ - #include - - -+static void -+usage (const char *name) -+{ -+ _cupsLangPrintf(stdout, -+"Usage: %s [OPTION] [ file(s) ]\n" -+"Print files.\n\n" -+" -E force encryption\n" -+" -H server[:port] specify alternate server\n" -+" -C title, -J title, -T title\n" -+" set the job name\n\n" -+" -P destination/instance print to named printer\n" -+" -U username specify alternate username\n" -+" -# num-copies set number of copies\n" -+" -h disable banner printing\n" -+" -l print without filtering\n" -+" -m send email on completion\n" -+" -o option[=value] set a job option\n" -+" -p format text file with header\n" -+" -q hold job for printing\n" -+" -r delete files after printing\n" -+"\nWith no file given, read standard input.\n" -+, name); -+} -+ -+ - /* - * 'main()' - Parse options and send files for printing. - */ -@@ -281,6 +306,12 @@ main(int argc, /* I - Number of comm - break; - - default : -+ if (!strcmp (argv[i], "--help")) -+ { -+ usage (argv[0]); -+ return (0); -+ } -+ - _cupsLangPrintf(stderr, _("%s: Error - unknown option \"%c\"."), argv[0], *opt); - return (1); - } diff --git a/SOURCES/cups-memory-consumption.patch b/SOURCES/cups-memory-consumption.patch deleted file mode 100644 index 5ccfbba..0000000 --- a/SOURCES/cups-memory-consumption.patch +++ /dev/null @@ -1,1220 +0,0 @@ -diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c -index 925ab80..e5f89ee 100644 ---- a/cups/ppd-cache.c -+++ b/cups/ppd-cache.c -@@ -508,24 +508,20 @@ _ppdCacheCreateWithFile( - else if (!_cups_strcasecmp(line, "Filter")) - { - if (!pc->filters) -- pc->filters = cupsArrayNew3(NULL, NULL, NULL, 0, -- (cups_acopy_func_t)_cupsStrAlloc, -- (cups_afree_func_t)_cupsStrFree); -+ pc->filters = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free); - - cupsArrayAdd(pc->filters, value); - } - else if (!_cups_strcasecmp(line, "PreFilter")) - { - if (!pc->prefilters) -- pc->prefilters = cupsArrayNew3(NULL, NULL, NULL, 0, -- (cups_acopy_func_t)_cupsStrAlloc, -- (cups_afree_func_t)_cupsStrFree); -+ pc->prefilters = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free); - - cupsArrayAdd(pc->prefilters, value); - } - else if (!_cups_strcasecmp(line, "Product")) - { -- pc->product = _cupsStrAlloc(value); -+ pc->product = strdup(value); - } - else if (!_cups_strcasecmp(line, "SingleFile")) - { -@@ -625,8 +621,8 @@ _ppdCacheCreateWithFile( - } - - map = pc->bins + pc->num_bins; -- map->pwg = _cupsStrAlloc(pwg_keyword); -- map->ppd = _cupsStrAlloc(ppd_keyword); -+ map->pwg = strdup(pwg_keyword); -+ map->ppd = strdup(ppd_keyword); - - pc->num_bins ++; - } -@@ -680,8 +676,8 @@ _ppdCacheCreateWithFile( - goto create_error; - } - -- size->map.pwg = _cupsStrAlloc(pwg_keyword); -- size->map.ppd = _cupsStrAlloc(ppd_keyword); -+ size->map.pwg = strdup(pwg_keyword); -+ size->map.ppd = strdup(ppd_keyword); - - pc->num_sizes ++; - } -@@ -709,15 +705,15 @@ _ppdCacheCreateWithFile( - - pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), "custom", "max", - pc->custom_max_width, pc->custom_max_length, NULL); -- pc->custom_max_keyword = _cupsStrAlloc(pwg_keyword); -+ pc->custom_max_keyword = strdup(pwg_keyword); - - pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), "custom", "min", - pc->custom_min_width, pc->custom_min_length, NULL); -- pc->custom_min_keyword = _cupsStrAlloc(pwg_keyword); -+ pc->custom_min_keyword = strdup(pwg_keyword); - } - else if (!_cups_strcasecmp(line, "SourceOption")) - { -- pc->source_option = _cupsStrAlloc(value); -+ pc->source_option = strdup(value); - } - else if (!_cups_strcasecmp(line, "NumSources")) - { -@@ -764,8 +760,8 @@ _ppdCacheCreateWithFile( - } - - map = pc->sources + pc->num_sources; -- map->pwg = _cupsStrAlloc(pwg_keyword); -- map->ppd = _cupsStrAlloc(ppd_keyword); -+ map->pwg = strdup(pwg_keyword); -+ map->ppd = strdup(ppd_keyword); - - pc->num_sources ++; - } -@@ -813,8 +809,8 @@ _ppdCacheCreateWithFile( - } - - map = pc->types + pc->num_types; -- map->pwg = _cupsStrAlloc(pwg_keyword); -- map->ppd = _cupsStrAlloc(ppd_keyword); -+ map->pwg = strdup(pwg_keyword); -+ map->ppd = strdup(ppd_keyword); - - pc->num_types ++; - } -@@ -844,13 +840,13 @@ _ppdCacheCreateWithFile( - pc->presets[print_color_mode] + print_quality); - } - else if (!_cups_strcasecmp(line, "SidesOption")) -- pc->sides_option = _cupsStrAlloc(value); -+ pc->sides_option = strdup(value); - else if (!_cups_strcasecmp(line, "Sides1Sided")) -- pc->sides_1sided = _cupsStrAlloc(value); -+ pc->sides_1sided = strdup(value); - else if (!_cups_strcasecmp(line, "Sides2SidedLong")) -- pc->sides_2sided_long = _cupsStrAlloc(value); -+ pc->sides_2sided_long = strdup(value); - else if (!_cups_strcasecmp(line, "Sides2SidedShort")) -- pc->sides_2sided_short = _cupsStrAlloc(value); -+ pc->sides_2sided_short = strdup(value); - else if (!_cups_strcasecmp(line, "Finishings")) - { - if (!pc->finishings) -@@ -871,13 +867,13 @@ _ppdCacheCreateWithFile( - else if (!_cups_strcasecmp(line, "MaxCopies")) - pc->max_copies = atoi(value); - else if (!_cups_strcasecmp(line, "ChargeInfoURI")) -- pc->charge_info_uri = _cupsStrAlloc(value); -+ pc->charge_info_uri = strdup(value); - else if (!_cups_strcasecmp(line, "JobAccountId")) - pc->account_id = !_cups_strcasecmp(value, "true"); - else if (!_cups_strcasecmp(line, "JobAccountingUserId")) - pc->accounting_user_id = !_cups_strcasecmp(value, "true"); - else if (!_cups_strcasecmp(line, "JobPassword")) -- pc->password = _cupsStrAlloc(value); -+ pc->password = strdup(value); - else if (!_cups_strcasecmp(line, "Mandatory")) - { - if (pc->mandatory) -@@ -888,9 +884,7 @@ _ppdCacheCreateWithFile( - else if (!_cups_strcasecmp(line, "SupportFile")) - { - if (!pc->support_files) -- pc->support_files = cupsArrayNew3(NULL, NULL, NULL, 0, -- (cups_acopy_func_t)_cupsStrAlloc, -- (cups_afree_func_t)_cupsStrFree); -+ pc->support_files = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free); - - cupsArrayAdd(pc->support_files, value); - } -@@ -1130,8 +1124,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - */ - - new_size = old_size; -- _cupsStrFree(old_size->map.ppd); -- _cupsStrFree(old_size->map.pwg); -+ free(old_size->map.ppd); -+ free(old_size->map.pwg); - } - } - -@@ -1152,8 +1146,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - * Save this size... - */ - -- new_size->map.ppd = _cupsStrAlloc(ppd_size->name); -- new_size->map.pwg = _cupsStrAlloc(pwg_name); -+ new_size->map.ppd = strdup(ppd_size->name); -+ new_size->map.pwg = strdup(pwg_name); - new_size->width = new_width; - new_size->length = new_length; - new_size->left = new_left; -@@ -1173,14 +1167,14 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), "custom", "max", - PWG_FROM_POINTS(ppd->custom_max[0]), - PWG_FROM_POINTS(ppd->custom_max[1]), NULL); -- pc->custom_max_keyword = _cupsStrAlloc(pwg_keyword); -+ pc->custom_max_keyword = strdup(pwg_keyword); - pc->custom_max_width = PWG_FROM_POINTS(ppd->custom_max[0]); - pc->custom_max_length = PWG_FROM_POINTS(ppd->custom_max[1]); - - pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), "custom", "min", - PWG_FROM_POINTS(ppd->custom_min[0]), - PWG_FROM_POINTS(ppd->custom_min[1]), NULL); -- pc->custom_min_keyword = _cupsStrAlloc(pwg_keyword); -+ pc->custom_min_keyword = strdup(pwg_keyword); - pc->custom_min_width = PWG_FROM_POINTS(ppd->custom_min[0]); - pc->custom_min_length = PWG_FROM_POINTS(ppd->custom_min[1]); - -@@ -1199,7 +1193,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - - if (input_slot) - { -- pc->source_option = _cupsStrAlloc(input_slot->keyword); -+ pc->source_option = strdup(input_slot->keyword); - - if ((pc->sources = calloc((size_t)input_slot->num_choices, sizeof(pwg_map_t))) == NULL) - { -@@ -1251,8 +1245,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - "_"); - } - -- map->pwg = _cupsStrAlloc(pwg_name); -- map->ppd = _cupsStrAlloc(choice->choice); -+ map->pwg = strdup(pwg_name); -+ map->ppd = strdup(choice->choice); - } - } - -@@ -1315,8 +1309,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - "_"); - } - -- map->pwg = _cupsStrAlloc(pwg_name); -- map->ppd = _cupsStrAlloc(choice->choice); -+ map->pwg = strdup(pwg_name); -+ map->ppd = strdup(choice->choice); - } - } - -@@ -1342,8 +1336,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - { - pwg_unppdize_name(choice->choice, pwg_keyword, sizeof(pwg_keyword), "_"); - -- map->pwg = _cupsStrAlloc(pwg_keyword); -- map->ppd = _cupsStrAlloc(choice->choice); -+ map->pwg = strdup(pwg_keyword); -+ map->ppd = strdup(choice->choice); - } - } - -@@ -1558,7 +1552,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - - if (duplex) - { -- pc->sides_option = _cupsStrAlloc(duplex->keyword); -+ pc->sides_option = strdup(duplex->keyword); - - for (i = duplex->num_choices, choice = duplex->choices; - i > 0; -@@ -1566,16 +1560,16 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - { - if ((!_cups_strcasecmp(choice->choice, "None") || - !_cups_strcasecmp(choice->choice, "False")) && !pc->sides_1sided) -- pc->sides_1sided = _cupsStrAlloc(choice->choice); -+ pc->sides_1sided = strdup(choice->choice); - else if ((!_cups_strcasecmp(choice->choice, "DuplexNoTumble") || - !_cups_strcasecmp(choice->choice, "LongEdge") || - !_cups_strcasecmp(choice->choice, "Top")) && !pc->sides_2sided_long) -- pc->sides_2sided_long = _cupsStrAlloc(choice->choice); -+ pc->sides_2sided_long = strdup(choice->choice); - else if ((!_cups_strcasecmp(choice->choice, "DuplexTumble") || - !_cups_strcasecmp(choice->choice, "ShortEdge") || - !_cups_strcasecmp(choice->choice, "Bottom")) && - !pc->sides_2sided_short) -- pc->sides_2sided_short = _cupsStrAlloc(choice->choice); -+ pc->sides_2sided_short = strdup(choice->choice); - } - } - -@@ -1583,9 +1577,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - * Copy filters and pre-filters... - */ - -- pc->filters = cupsArrayNew3(NULL, NULL, NULL, 0, -- (cups_acopy_func_t)_cupsStrAlloc, -- (cups_afree_func_t)_cupsStrFree); -+ pc->filters = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free); - - cupsArrayAdd(pc->filters, - "application/vnd.cups-raw application/octet-stream 0 -"); -@@ -1642,9 +1634,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - - if ((ppd_attr = ppdFindAttr(ppd, "cupsPreFilter", NULL)) != NULL) - { -- pc->prefilters = cupsArrayNew3(NULL, NULL, NULL, 0, -- (cups_acopy_func_t)_cupsStrAlloc, -- (cups_afree_func_t)_cupsStrFree); -+ pc->prefilters = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free); - - do - { -@@ -1661,7 +1651,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - */ - - if (ppd->product) -- pc->product = _cupsStrAlloc(ppd->product); -+ pc->product = strdup(ppd->product); - - /* - * Copy finishings mapping data... -@@ -1818,7 +1808,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - */ - - if ((ppd_attr = ppdFindAttr(ppd, "cupsChargeInfoURI", NULL)) != NULL) -- pc->charge_info_uri = _cupsStrAlloc(ppd_attr->value); -+ pc->charge_info_uri = strdup(ppd_attr->value); - - if ((ppd_attr = ppdFindAttr(ppd, "cupsJobAccountId", NULL)) != NULL) - pc->account_id = !_cups_strcasecmp(ppd_attr->value, "true"); -@@ -1827,7 +1817,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - pc->accounting_user_id = !_cups_strcasecmp(ppd_attr->value, "true"); - - if ((ppd_attr = ppdFindAttr(ppd, "cupsJobPassword", NULL)) != NULL) -- pc->password = _cupsStrAlloc(ppd_attr->value); -+ pc->password = strdup(ppd_attr->value); - - if ((ppd_attr = ppdFindAttr(ppd, "cupsMandatory", NULL)) != NULL) - pc->mandatory = _cupsArrayNewStrings(ppd_attr->value, ' '); -@@ -1836,9 +1826,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */ - * Support files... - */ - -- pc->support_files = cupsArrayNew3(NULL, NULL, NULL, 0, -- (cups_acopy_func_t)_cupsStrAlloc, -- (cups_afree_func_t)_cupsStrFree); -+ pc->support_files = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free); - - for (ppd_attr = ppdFindAttr(ppd, "cupsICCProfile", NULL); - ppd_attr; -@@ -1894,8 +1882,8 @@ _ppdCacheDestroy(_ppd_cache_t *pc) /* I - PPD cache and mapping data */ - { - for (i = pc->num_bins, map = pc->bins; i > 0; i --, map ++) - { -- _cupsStrFree(map->pwg); -- _cupsStrFree(map->ppd); -+ free(map->pwg); -+ free(map->ppd); - } - - free(pc->bins); -@@ -1905,15 +1893,14 @@ _ppdCacheDestroy(_ppd_cache_t *pc) /* I - PPD cache and mapping data */ - { - for (i = pc->num_sizes, size = pc->sizes; i > 0; i --, size ++) - { -- _cupsStrFree(size->map.pwg); -- _cupsStrFree(size->map.ppd); -+ free(size->map.pwg); -+ free(size->map.ppd); - } - - free(pc->sizes); - } - -- if (pc->source_option) -- _cupsStrFree(pc->source_option); -+ free(pc->source_option); - - if (pc->sources) - { -@@ -1930,26 +1917,23 @@ _ppdCacheDestroy(_ppd_cache_t *pc) /* I - PPD cache and mapping data */ - { - for (i = pc->num_types, map = pc->types; i > 0; i --, map ++) - { -- _cupsStrFree(map->pwg); -- _cupsStrFree(map->ppd); -+ free(map->pwg); -+ free(map->ppd); - } - - free(pc->types); - } - -- if (pc->custom_max_keyword) -- _cupsStrFree(pc->custom_max_keyword); -- -- if (pc->custom_min_keyword) -- _cupsStrFree(pc->custom_min_keyword); -+ free(pc->custom_max_keyword); -+ free(pc->custom_min_keyword); - -- _cupsStrFree(pc->product); -+ free(pc->product); - cupsArrayDelete(pc->filters); - cupsArrayDelete(pc->prefilters); - cupsArrayDelete(pc->finishings); - -- _cupsStrFree(pc->charge_info_uri); -- _cupsStrFree(pc->password); -+ free(pc->charge_info_uri); -+ free(pc->password); - - cupsArrayDelete(pc->mandatory); - -diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c -index 464c09a..cb67468 100644 ---- a/cups/ppd-mark.c -+++ b/cups/ppd-mark.c -@@ -890,9 +890,9 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */ - case PPD_CUSTOM_PASSWORD : - case PPD_CUSTOM_STRING : - if (cparam->current.custom_string) -- _cupsStrFree(cparam->current.custom_string); -+ free(cparam->current.custom_string); - -- cparam->current.custom_string = _cupsStrAlloc(choice + 7); -+ cparam->current.custom_string = strdup(choice + 7); - break; - } - } -@@ -967,9 +967,9 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */ - case PPD_CUSTOM_PASSWORD : - case PPD_CUSTOM_STRING : - if (cparam->current.custom_string) -- _cupsStrFree(cparam->current.custom_string); -+ free(cparam->current.custom_string); - -- cparam->current.custom_string = _cupsStrRetain(val->value); -+ cparam->current.custom_string = strdup(val->value); - break; - } - } -diff --git a/cups/ppd.c b/cups/ppd.c -index 8276988..6782a85 100644 ---- a/cups/ppd.c -+++ b/cups/ppd.c -@@ -34,8 +34,6 @@ - * Definitions... - */ - --#define ppd_free(p) if (p) free(p) /* Safe free macro */ -- - #define PPD_KEYWORD 1 /* Line contained a keyword */ - #define PPD_OPTION 2 /* Line contained an option name */ - #define PPD_TEXT 4 /* Line contained human-readable text */ -@@ -117,7 +115,6 @@ void - ppdClose(ppd_file_t *ppd) /* I - PPD file record */ - { - int i; /* Looping var */ -- ppd_emul_t *emul; /* Current emulation */ - ppd_group_t *group; /* Current group */ - char **font; /* Current font */ - ppd_attr_t **attr; /* Current attribute */ -@@ -136,28 +133,12 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ - * Free all strings at the top level... - */ - -- _cupsStrFree(ppd->lang_encoding); -- _cupsStrFree(ppd->nickname); -- if (ppd->patches) -- free(ppd->patches); -- _cupsStrFree(ppd->jcl_begin); -- _cupsStrFree(ppd->jcl_end); -- _cupsStrFree(ppd->jcl_ps); -- -- /* -- * Free any emulations... -- */ -- -- if (ppd->num_emulations > 0) -- { -- for (i = ppd->num_emulations, emul = ppd->emulations; i > 0; i --, emul ++) -- { -- _cupsStrFree(emul->start); -- _cupsStrFree(emul->stop); -- } -- -- ppd_free(ppd->emulations); -- } -+ free(ppd->lang_encoding); -+ free(ppd->nickname); -+ free(ppd->patches); -+ free(ppd->jcl_begin); -+ free(ppd->jcl_end); -+ free(ppd->jcl_ps); - - /* - * Free any UI groups, subgroups, and options... -@@ -168,7 +149,7 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ - for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++) - ppd_free_group(group); - -- ppd_free(ppd->groups); -+ free(ppd->groups); - } - - cupsArrayDelete(ppd->options); -@@ -179,14 +160,14 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ - */ - - if (ppd->num_sizes > 0) -- ppd_free(ppd->sizes); -+ free(ppd->sizes); - - /* - * Free any constraints... - */ - - if (ppd->num_consts > 0) -- ppd_free(ppd->consts); -+ free(ppd->consts); - - /* - * Free any filters... -@@ -201,9 +182,9 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ - if (ppd->num_fonts > 0) - { - for (i = ppd->num_fonts, font = ppd->fonts; i > 0; i --, font ++) -- _cupsStrFree(*font); -+ free(*font); - -- ppd_free(ppd->fonts); -+ free(ppd->fonts); - } - - /* -@@ -211,7 +192,7 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ - */ - - if (ppd->num_profiles > 0) -- ppd_free(ppd->profiles); -+ free(ppd->profiles); - - /* - * Free any attributes... -@@ -221,11 +202,11 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ - { - for (i = ppd->num_attrs, attr = ppd->attrs; i > 0; i --, attr ++) - { -- _cupsStrFree((*attr)->value); -- ppd_free(*attr); -+ free((*attr)->value); -+ free(*attr); - } - -- ppd_free(ppd->attrs); -+ free(ppd->attrs); - } - - cupsArrayDelete(ppd->sorted_attrs); -@@ -247,7 +228,7 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ - case PPD_CUSTOM_PASSCODE : - case PPD_CUSTOM_PASSWORD : - case PPD_CUSTOM_STRING : -- _cupsStrFree(cparam->current.custom_string); -+ free(cparam->current.custom_string); - break; - - default : -@@ -295,7 +276,7 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ - * Free the whole record... - */ - -- ppd_free(ppd); -+ free(ppd); - } - - -@@ -441,7 +422,6 @@ _ppdOpen( - _ppd_localization_t localization) /* I - Localization to load */ - { - int i, j, k; /* Looping vars */ -- int count; /* Temporary count */ - _ppd_line_t line; /* Line buffer */ - ppd_file_t *ppd; /* PPD file record */ - ppd_group_t *group, /* Current group */ -@@ -459,7 +439,6 @@ _ppdOpen( - /* Human-readable text from file */ - *string, /* Code/text from file */ - *sptr, /* Pointer into string */ -- *nameptr, /* Pointer into name */ - *temp, /* Temporary string pointer */ - **tempfonts; /* Temporary fonts pointer */ - float order; /* Order dependency number */ -@@ -633,16 +612,14 @@ _ppdOpen( - if (pg->ppd_status == PPD_OK) - pg->ppd_status = PPD_MISSING_PPDADOBE4; - -- _cupsStrFree(string); -- ppd_free(line.buffer); -+ free(string); -+ free(line.buffer); - - return (NULL); - } - - DEBUG_printf(("2_ppdOpen: keyword=%s, string=%p", keyword, string)); - -- _cupsStrFree(string); -- - /* - * Allocate memory for the PPD file record... - */ -@@ -651,12 +628,15 @@ _ppdOpen( - { - pg->ppd_status = PPD_ALLOC_ERROR; - -- _cupsStrFree(string); -- ppd_free(line.buffer); -+ free(string); -+ free(line.buffer); - - return (NULL); - } - -+ free(string); -+ string = NULL; -+ - ppd->language_level = 2; - ppd->color_device = 0; - ppd->colorspace = PPD_CS_N; -@@ -735,6 +715,8 @@ _ppdOpen( - strncmp(ll, keyword, ll_len))) - { - DEBUG_printf(("2_ppdOpen: Ignoring localization: \"%s\"\n", keyword)); -+ free(string); -+ string = NULL; - continue; - } - else if (localization == _PPD_LOCALIZATION_ICC_PROFILES) -@@ -754,6 +736,8 @@ _ppdOpen( - if (i >= (int)(sizeof(color_keywords) / sizeof(color_keywords[0]))) - { - DEBUG_printf(("2_ppdOpen: Ignoring localization: \"%s\"\n", keyword)); -+ free(string); -+ string = NULL; - continue; - } - } -@@ -849,7 +833,7 @@ _ppdOpen( - * Say all PPD files are UTF-8, since we convert to UTF-8... - */ - -- ppd->lang_encoding = _cupsStrAlloc("UTF-8"); -+ ppd->lang_encoding = strdup("UTF-8"); - encoding = _ppdGetEncoding(string); - } - else if (!strcmp(keyword, "LanguageVersion")) -@@ -870,10 +854,10 @@ _ppdOpen( - - - cupsCharsetToUTF8(utf8, string, sizeof(utf8), encoding); -- ppd->nickname = _cupsStrAlloc((char *)utf8); -+ ppd->nickname = strdup((char *)utf8); - } - else -- ppd->nickname = _cupsStrAlloc(string); -+ ppd->nickname = strdup(string); - } - else if (!strcmp(keyword, "Product")) - ppd->product = string; -@@ -883,17 +867,17 @@ _ppdOpen( - ppd->ttrasterizer = string; - else if (!strcmp(keyword, "JCLBegin")) - { -- ppd->jcl_begin = _cupsStrAlloc(string); -+ ppd->jcl_begin = strdup(string); - ppd_decode(ppd->jcl_begin); /* Decode quoted string */ - } - else if (!strcmp(keyword, "JCLEnd")) - { -- ppd->jcl_end = _cupsStrAlloc(string); -+ ppd->jcl_end = strdup(string); - ppd_decode(ppd->jcl_end); /* Decode quoted string */ - } - else if (!strcmp(keyword, "JCLToPSInterpreter")) - { -- ppd->jcl_ps = _cupsStrAlloc(string); -+ ppd->jcl_ps = strdup(string); - ppd_decode(ppd->jcl_ps); /* Decode quoted string */ - } - else if (!strcmp(keyword, "AccurateScreensSupport")) -@@ -961,10 +945,10 @@ _ppdOpen( - ppd->num_filters ++; - - /* -- * Retain a copy of the filter string... -+ * Make a copy of the filter string... - */ - -- *filter = _cupsStrRetain(string); -+ *filter = strdup(string); - } - else if (!strcmp(keyword, "Throughput")) - ppd->throughput = atoi(string); -@@ -987,7 +971,7 @@ _ppdOpen( - } - - ppd->fonts = tempfonts; -- ppd->fonts[ppd->num_fonts] = _cupsStrAlloc(name); -+ ppd->fonts[ppd->num_fonts] = strdup(name); - ppd->num_fonts ++; - } - else if (!strncmp(keyword, "ParamCustom", 11)) -@@ -1152,7 +1136,7 @@ _ppdOpen( - strlcpy(choice->text, text[0] ? text : _("Custom"), - sizeof(choice->text)); - -- choice->code = _cupsStrAlloc(string); -+ choice->code = strdup(string); - - if (custom_option->section == PPD_ORDER_JCL) - ppd_decode(choice->code); -@@ -1201,59 +1185,23 @@ _ppdOpen( - else if (!strcmp(string, "Plus90")) - ppd->landscape = 90; - } -- else if (!strcmp(keyword, "Emulators") && string) -- { -- for (count = 1, sptr = string; sptr != NULL;) -- if ((sptr = strchr(sptr, ' ')) != NULL) -- { -- count ++; -- while (*sptr == ' ') -- sptr ++; -- } -- -- ppd->num_emulations = count; -- if ((ppd->emulations = calloc((size_t)count, sizeof(ppd_emul_t))) == NULL) -- { -- pg->ppd_status = PPD_ALLOC_ERROR; -- -- goto error; -- } -- -- for (i = 0, sptr = string; i < count; i ++) -- { -- for (nameptr = ppd->emulations[i].name; -- *sptr != '\0' && *sptr != ' '; -- sptr ++) -- if (nameptr < (ppd->emulations[i].name + sizeof(ppd->emulations[i].name) - 1)) -- *nameptr++ = *sptr; -- -- *nameptr = '\0'; -- -- while (*sptr == ' ') -- sptr ++; -- } -- } -- else if (!strncmp(keyword, "StartEmulator_", 14)) -+ else if (!strcmp(keyword, "Emulators") && string && ppd->num_emulations == 0) - { -- ppd_decode(string); -+ /* -+ * Issue #5562: Samsung printer drivers incorrectly use Emulators keyword -+ * to configure themselves -+ * -+ * The Emulators keyword was loaded but never used by anything in CUPS, -+ * and has no valid purpose in CUPS. The old code was removed due to a -+ * memory leak (Issue #5475), so the following (new) code supports a single -+ * name for the Emulators keyword, allowing these drivers to work until we -+ * remove PPD and driver support entirely in a future version of CUPS. -+ */ - -- for (i = 0; i < ppd->num_emulations; i ++) -- if (!strcmp(keyword + 14, ppd->emulations[i].name)) -- { -- ppd->emulations[i].start = string; -- string = NULL; -- } -- } -- else if (!strncmp(keyword, "StopEmulator_", 13)) -- { -- ppd_decode(string); -+ ppd->num_emulations = 1; -+ ppd->emulations = calloc(1, sizeof(ppd_emul_t)); - -- for (i = 0; i < ppd->num_emulations; i ++) -- if (!strcmp(keyword + 13, ppd->emulations[i].name)) -- { -- ppd->emulations[i].stop = string; -- string = NULL; -- } -+ strlcpy(ppd->emulations[0].name, string, sizeof(ppd->emulations[0].name)); - } - else if (!strcmp(keyword, "JobPatchFile")) - { -@@ -1408,7 +1356,7 @@ _ppdOpen( - - option->section = PPD_ORDER_ANY; - -- _cupsStrFree(string); -+ free(string); - string = NULL; - - /* -@@ -1436,7 +1384,7 @@ _ppdOpen( - strlcpy(choice->text, - custom_attr->text[0] ? custom_attr->text : _("Custom"), - sizeof(choice->text)); -- choice->code = _cupsStrRetain(custom_attr->value); -+ choice->code = strdup(custom_attr->value); - } - } - else if (!strcmp(keyword, "JCLOpenUI")) -@@ -1515,7 +1463,7 @@ _ppdOpen( - option->section = PPD_ORDER_JCL; - group = NULL; - -- _cupsStrFree(string); -+ free(string); - string = NULL; - - /* -@@ -1539,14 +1487,14 @@ _ppdOpen( - strlcpy(choice->text, - custom_attr->text[0] ? custom_attr->text : _("Custom"), - sizeof(choice->text)); -- choice->code = _cupsStrRetain(custom_attr->value); -+ choice->code = strdup(custom_attr->value); - } - } - else if (!strcmp(keyword, "CloseUI") || !strcmp(keyword, "JCLCloseUI")) - { - option = NULL; - -- _cupsStrFree(string); -+ free(string); - string = NULL; - } - else if (!strcmp(keyword, "OpenGroup")) -@@ -1593,14 +1541,14 @@ _ppdOpen( - if (group == NULL) - goto error; - -- _cupsStrFree(string); -+ free(string); - string = NULL; - } - else if (!strcmp(keyword, "CloseGroup")) - { - group = NULL; - -- _cupsStrFree(string); -+ free(string); - string = NULL; - } - else if (!strcmp(keyword, "OrderDependency")) -@@ -1658,7 +1606,7 @@ _ppdOpen( - option->order = order; - } - -- _cupsStrFree(string); -+ free(string); - string = NULL; - } - else if (!strncmp(keyword, "Default", 7)) -@@ -1901,7 +1849,7 @@ _ppdOpen( - * Don't add this one as an attribute... - */ - -- _cupsStrFree(string); -+ free(string); - string = NULL; - } - else if (!strcmp(keyword, "PaperDimension")) -@@ -1923,7 +1871,7 @@ _ppdOpen( - size->width = (float)_cupsStrScand(string, &sptr, loc); - size->length = (float)_cupsStrScand(sptr, NULL, loc); - -- _cupsStrFree(string); -+ free(string); - string = NULL; - } - else if (!strcmp(keyword, "ImageableArea")) -@@ -1947,7 +1895,7 @@ _ppdOpen( - size->right = (float)_cupsStrScand(sptr, &sptr, loc); - size->top = (float)_cupsStrScand(sptr, NULL, loc); - -- _cupsStrFree(string); -+ free(string); - string = NULL; - } - else if (option != NULL && -@@ -2003,7 +1951,7 @@ _ppdOpen( - (mask & (PPD_KEYWORD | PPD_STRING)) == (PPD_KEYWORD | PPD_STRING)) - ppd_add_attr(ppd, keyword, name, text, string); - else -- _cupsStrFree(string); -+ free(string); - } - - /* -@@ -2016,7 +1964,8 @@ _ppdOpen( - goto error; - } - -- ppd_free(line.buffer); -+ free(string); -+ free(line.buffer); - - /* - * Reset language preferences... -@@ -2098,8 +2047,8 @@ _ppdOpen( - - error: - -- _cupsStrFree(string); -- ppd_free(line.buffer); -+ free(string); -+ free(line.buffer); - - ppdClose(ppd); - -@@ -2537,9 +2486,9 @@ ppd_free_filters(ppd_file_t *ppd) /* I - PPD file */ - if (ppd->num_filters > 0) - { - for (i = ppd->num_filters, filter = ppd->filters; i > 0; i --, filter ++) -- _cupsStrFree(*filter); -+ free(*filter); - -- ppd_free(ppd->filters); -+ free(ppd->filters); - - ppd->num_filters = 0; - ppd->filters = NULL; -@@ -2566,7 +2515,7 @@ ppd_free_group(ppd_group_t *group) /* I - Group to free */ - i --, option ++) - ppd_free_option(option); - -- ppd_free(group->options); -+ free(group->options); - } - - if (group->num_subgroups > 0) -@@ -2576,7 +2525,7 @@ ppd_free_group(ppd_group_t *group) /* I - Group to free */ - i --, subgroup ++) - ppd_free_group(subgroup); - -- ppd_free(group->subgroups); -+ free(group->subgroups); - } - } - -@@ -2598,10 +2547,10 @@ ppd_free_option(ppd_option_t *option) /* I - Option to free */ - i > 0; - i --, choice ++) - { -- _cupsStrFree(choice->code); -+ free(choice->code); - } - -- ppd_free(option->choices); -+ free(option->choices); - } - } - -@@ -3338,7 +3287,7 @@ ppd_read(cups_file_t *fp, /* I - File to read from */ - lineptr ++; - } - -- *string = _cupsStrAlloc(lineptr); -+ *string = strdup(lineptr); - - mask |= PPD_STRING; - } -@@ -3460,7 +3409,7 @@ ppd_update_filters(ppd_file_t *ppd, /* I - PPD file */ - filter += ppd->num_filters; - ppd->num_filters ++; - -- *filter = _cupsStrAlloc(buffer); -+ *filter = strdup(buffer); - } - while ((attr = ppdFindNextAttr(ppd, "cupsFilter2", NULL)) != NULL); - -diff --git a/cups/ppd.h b/cups/ppd.h -index fb33c08..1c852c7 100644 ---- a/cups/ppd.h -+++ b/cups/ppd.h -@@ -302,8 +302,8 @@ typedef struct ppd_file_s /**** PPD File ****/ - int throughput; /* Pages per minute */ - ppd_cs_t colorspace; /* Default colorspace */ - char *patches; /* Patch commands to be sent to printer */ -- int num_emulations; /* Number of emulations supported */ -- ppd_emul_t *emulations; /* Emulations and the code to invoke them */ -+ int num_emulations; /* Number of emulations supported (no longer supported) @private@ */ -+ ppd_emul_t *emulations; /* Emulations and the code to invoke them (no longer supported) @private@ */ - char *jcl_begin; /* Start JCL commands */ - char *jcl_ps; /* Enter PostScript interpreter */ - char *jcl_end; /* End JCL commands */ -diff --git a/cups/string.c b/cups/string.c -index 0d4ed0f..8f37caf 100644 ---- a/cups/string.c -+++ b/cups/string.c -@@ -316,6 +316,13 @@ _cupsStrFree(const char *s) /* I - String to free */ - - key = (_cups_sp_item_t *)(s - offsetof(_cups_sp_item_t, str)); - -+ if ((item = (_cups_sp_item_t *)cupsArrayFind(stringpool, key)) != NULL && -+ item == key) -+ { -+ /* -+ * Found it, dereference... -+ */ -+ - #ifdef DEBUG_GUARDS - if (key->guard != _CUPS_STR_GUARD) - { -@@ -325,13 +332,6 @@ _cupsStrFree(const char *s) /* I - String to free */ - } - #endif /* DEBUG_GUARDS */ - -- if ((item = (_cups_sp_item_t *)cupsArrayFind(stringpool, key)) != NULL && -- item == key) -- { -- /* -- * Found it, dereference... -- */ -- - item->ref_count --; - - if (!item->ref_count) -diff --git a/scheduler/ipp.c b/scheduler/ipp.c -index 298b684..e0dbc4a 100644 ---- a/scheduler/ipp.c -+++ b/scheduler/ipp.c -@@ -2918,8 +2918,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ - if (!strcmp(attr->values[i].string.text, "none")) - continue; - -- printer->reasons[printer->num_reasons] = -- _cupsStrRetain(attr->values[i].string.text); -+ printer->reasons[printer->num_reasons] = _cupsStrAlloc(attr->values[i].string.text); - printer->num_reasons ++; - - if (!strcmp(attr->values[i].string.text, "paused") && -@@ -5437,8 +5436,7 @@ copy_printer_attrs( - - if ((p2_uri = ippFindAttribute(p2->attrs, "printer-uri-supported", - IPP_TAG_URI)) != NULL) -- member_uris->values[i].string.text = -- _cupsStrRetain(p2_uri->values[0].string.text); -+ member_uris->values[i].string.text = _cupsStrAlloc(p2_uri->values[0].string.text); - else - { - httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, -diff --git a/scheduler/printers.c b/scheduler/printers.c -index 3ec16cf..f16552e 100644 ---- a/scheduler/printers.c -+++ b/scheduler/printers.c -@@ -54,8 +54,7 @@ static int compare_printers(void *first, void *second, void *data); - static void delete_printer_filters(cupsd_printer_t *p); - static void dirty_printer(cupsd_printer_t *p); - static void load_ppd(cupsd_printer_t *p); --static ipp_t *new_media_col(pwg_size_t *size, const char *source, -- const char *type); -+static ipp_t *new_media_col(pwg_size_t *size); - static void write_xml_string(cups_file_t *fp, const char *s); - - -@@ -3873,21 +3872,19 @@ dirty_printer(cupsd_printer_t *p) /* I - Printer */ - static void - load_ppd(cupsd_printer_t *p) /* I - Printer */ - { -- int i, j, k; /* Looping vars */ -+ int i, j; /* Looping vars */ - char cache_name[1024]; /* Cache filename */ - struct stat cache_info; /* Cache file info */ - ppd_file_t *ppd; /* PPD file */ - char ppd_name[1024]; /* PPD filename */ - struct stat ppd_info; /* PPD file info */ -- int num_media; /* Number of media options */ -+ int num_media; /* Number of media values */ - ppd_size_t *size; /* Current PPD size */ - ppd_option_t *duplex, /* Duplex option */ - *output_bin, /* OutputBin option */ - *output_mode, /* OutputMode option */ - *resolution; /* (Set|JCL|)Resolution option */ -- ppd_choice_t *choice, /* Current PPD choice */ -- *input_slot, /* Current input slot */ -- *media_type; /* Current media type */ -+ ppd_choice_t *choice; /* Current PPD choice */ - ppd_attr_t *ppd_attr; /* PPD attribute */ - int xdpi, /* Horizontal resolution */ - ydpi; /* Vertical resolution */ -@@ -4147,18 +4144,7 @@ load_ppd(cupsd_printer_t *p) /* I - Printer */ - { - ipp_t *col; /* Collection value */ - -- input_slot = ppdFindMarkedChoice(ppd, "InputSlot"); -- media_type = ppdFindMarkedChoice(ppd, "MediaType"); -- col = new_media_col(pwgsize, -- input_slot ? -- _ppdCacheGetSource(p->pc, -- input_slot->choice) : -- NULL, -- media_type ? -- _ppdCacheGetType(p->pc, -- media_type->choice) : -- NULL); -- -+ col = new_media_col(pwgsize); - ippAddCollection(p->ppd_attrs, IPP_TAG_PRINTER, "media-col-default", - col); - ippDelete(col); -@@ -4354,89 +4340,19 @@ load_ppd(cupsd_printer_t *p) /* I - Printer */ - * media-col-database - */ - -- num_media = p->pc->num_sizes; -- if (p->pc->num_sources) -+ if ((attr = ippAddCollections(p->ppd_attrs, IPP_TAG_PRINTER, "media-col-database", p->pc->num_sizes, NULL)) != NULL) - { -- if (p->pc->num_types > 0) -- num_media += p->pc->num_sizes * p->pc->num_sources * -- p->pc->num_types; -- else -- num_media += p->pc->num_sizes * p->pc->num_sources; -- } -- else if (p->pc->num_types) -- num_media += p->pc->num_sizes * p->pc->num_types; -+ /* -+ * Add each page size without source or type... -+ */ - -- if ((attr = ippAddCollections(p->ppd_attrs, IPP_TAG_PRINTER, -- "media-col-database", num_media, -- NULL)) != NULL) -- { -- for (i = p->pc->num_sizes, pwgsize = p->pc->sizes, val = attr->values; -- i > 0; -- i --, pwgsize ++) -+ for (i = 0, pwgsize = p->pc->sizes; i < p->pc->num_sizes; i ++, pwgsize ++) - { -- /* -- * Start by adding the page size without source or type... -- */ -+ ipp_t *col = new_media_col(pwgsize); - -- ppdMarkOption(ppd, "PageSize", pwgsize->map.ppd); -- -- val->collection = new_media_col(pwgsize, NULL, NULL); -- val ++; -- -- /* -- * Then add the specific, supported combinations of size, source, and -- * type... -- */ -- -- if (p->pc->num_sources > 0) -- { -- for (j = p->pc->num_sources, pwgsource = p->pc->sources; -- j > 0; -- j --, pwgsource ++) -- { -- ppdMarkOption(ppd, "InputSlot", pwgsource->ppd); -- -- if (p->pc->num_types > 0) -- { -- for (k = p->pc->num_types, pwgtype = p->pc->types; -- k > 0; -- k --, pwgtype ++) -- { -- if (!ppdMarkOption(ppd, "MediaType", pwgtype->ppd)) -- { -- val->collection = new_media_col(pwgsize, pwgsource->pwg, -- pwgtype->pwg); -- val ++; -- } -- } -- } -- else if (!ppdConflicts(ppd)) -- { -- val->collection = new_media_col(pwgsize, pwgsource->pwg, NULL); -- val ++; -- } -- } -- } -- else if (p->pc->num_types > 0) -- { -- for (j = p->pc->num_types, pwgtype = p->pc->types; -- j > 0; -- j --, pwgtype ++) -- { -- if (!ppdMarkOption(ppd, "MediaType", pwgtype->ppd)) -- { -- val->collection = new_media_col(pwgsize, NULL, pwgtype->pwg); -- val ++; -- } -- } -- } -+ ippSetCollection(p->ppd_attrs, &attr, i, col); -+ ippDelete(col); - } -- -- /* -- * Update the number of media-col-database values... -- */ -- -- attr->num_values = val - attr->values; - } - } - -@@ -5134,9 +5050,7 @@ load_ppd(cupsd_printer_t *p) /* I - Printer */ - */ - - static ipp_t * /* O - Collection value */ --new_media_col(pwg_size_t *size, /* I - media-size/margin values */ -- const char *source, /* I - media-source value */ -- const char *type) /* I - media-type value */ -+new_media_col(pwg_size_t *size) /* I - media-size/margin values */ - { - ipp_t *media_col, /* Collection value */ - *media_size; /* media-size value */ -@@ -5145,29 +5059,15 @@ new_media_col(pwg_size_t *size, /* I - media-size/margin values */ - media_col = ippNew(); - - media_size = ippNew(); -- ippAddInteger(media_size, IPP_TAG_PRINTER, IPP_TAG_INTEGER, -- "x-dimension", size->width); -- ippAddInteger(media_size, IPP_TAG_PRINTER, IPP_TAG_INTEGER, -- "y-dimension", size->length); -+ ippAddInteger(media_size, IPP_TAG_PRINTER, IPP_TAG_INTEGER, "x-dimension", size->width); -+ ippAddInteger(media_size, IPP_TAG_PRINTER, IPP_TAG_INTEGER, "y-dimension", size->length); - ippAddCollection(media_col, IPP_TAG_PRINTER, "media-size", media_size); - ippDelete(media_size); - -- ippAddInteger(media_col, IPP_TAG_PRINTER, IPP_TAG_INTEGER, -- "media-bottom-margin", size->bottom); -- ippAddInteger(media_col, IPP_TAG_PRINTER, IPP_TAG_INTEGER, -- "media-left-margin", size->left); -- ippAddInteger(media_col, IPP_TAG_PRINTER, IPP_TAG_INTEGER, -- "media-right-margin", size->right); -- ippAddInteger(media_col, IPP_TAG_PRINTER, IPP_TAG_INTEGER, -- "media-top-margin", size->top); -- -- if (source) -- ippAddString(media_col, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-source", -- NULL, source); -- -- if (type) -- ippAddString(media_col, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-type", -- NULL, type); -+ ippAddInteger(media_col, IPP_TAG_PRINTER, IPP_TAG_INTEGER, "media-bottom-margin", size->bottom); -+ ippAddInteger(media_col, IPP_TAG_PRINTER, IPP_TAG_INTEGER, "media-left-margin", size->left); -+ ippAddInteger(media_col, IPP_TAG_PRINTER, IPP_TAG_INTEGER, "media-right-margin", size->right); -+ ippAddInteger(media_col, IPP_TAG_PRINTER, IPP_TAG_INTEGER, "media-top-margin", size->top); - - return (media_col); - } diff --git a/SOURCES/cups-no-export-ssllibs.patch b/SOURCES/cups-no-export-ssllibs.patch deleted file mode 100644 index 14b4426..0000000 --- a/SOURCES/cups-no-export-ssllibs.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up cups-2.2b2/config-scripts/cups-ssl.m4.no-export-ssllibs cups-2.2b2/config-scripts/cups-ssl.m4 ---- cups-2.2b2/config-scripts/cups-ssl.m4.no-export-ssllibs 2016-06-27 15:06:22.299980753 +0200 -+++ cups-2.2b2/config-scripts/cups-ssl.m4 2016-06-27 15:08:00.953154042 +0200 -@@ -102,5 +102,5 @@ AC_SUBST(IPPALIASES) - AC_SUBST(SSLFLAGS) - AC_SUBST(SSLLIBS) - --EXPORT_SSLLIBS="$SSLLIBS" -+EXPORT_SSLLIBS="" - AC_SUBST(EXPORT_SSLLIBS) diff --git a/SOURCES/cups-no-gzip-man.patch b/SOURCES/cups-no-gzip-man.patch deleted file mode 100644 index c476b7b..0000000 --- a/SOURCES/cups-no-gzip-man.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up cups-2.2.4/config-scripts/cups-manpages.m4.no-gzip-man cups-2.2.4/config-scripts/cups-manpages.m4 ---- cups-2.2.4/config-scripts/cups-manpages.m4.no-gzip-man 2017-06-30 20:37:09.470034273 +0200 -+++ cups-2.2.4/config-scripts/cups-manpages.m4 2017-06-30 20:39:15.982884832 +0200 -@@ -53,10 +53,10 @@ case "$host_os_name" in - ;; - linux* | gnu* | darwin*) - # Linux, GNU Hurd, and macOS -- MAN1EXT=1.gz -- MAN5EXT=5.gz -- MAN7EXT=7.gz -- MAN8EXT=8.gz -+ MAN1EXT=1 -+ MAN5EXT=5 -+ MAN7EXT=7 -+ MAN8EXT=8 - MAN8DIR=8 - ;; - *) diff --git a/SOURCES/cups-peercred.patch b/SOURCES/cups-peercred.patch deleted file mode 100644 index a106abb..0000000 --- a/SOURCES/cups-peercred.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cups-1.5b1/scheduler/auth.c.peercred cups-1.5b1/scheduler/auth.c ---- cups-1.5b1/scheduler/auth.c.peercred 2011-05-20 05:49:49.000000000 +0200 -+++ cups-1.5b1/scheduler/auth.c 2011-05-23 18:00:18.000000000 +0200 -@@ -52,6 +52,7 @@ - * Include necessary headers... - */ - -+#define _GNU_SOURCE - #include "cupsd.h" - #include - #ifdef HAVE_SHADOW_H diff --git a/SOURCES/cups-pid.patch b/SOURCES/cups-pid.patch deleted file mode 100644 index 23ffd47..0000000 --- a/SOURCES/cups-pid.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up cups-1.5b1/scheduler/main.c.pid cups-1.5b1/scheduler/main.c ---- cups-1.5b1/scheduler/main.c.pid 2011-05-18 22:44:16.000000000 +0200 -+++ cups-1.5b1/scheduler/main.c 2011-05-23 18:01:20.000000000 +0200 -@@ -311,6 +311,8 @@ main(int argc, /* I - Number of comm - * Setup signal handlers for the parent... - */ - -+ pid_t pid; -+ - #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */ - sigset(SIGUSR1, parent_handler); - sigset(SIGCHLD, parent_handler); -@@ -334,7 +336,7 @@ main(int argc, /* I - Number of comm - signal(SIGHUP, SIG_IGN); - #endif /* HAVE_SIGSET */ - -- if (fork() > 0) -+ if ((pid = fork()) > 0) - { - /* - * OK, wait for the child to startup and send us SIGUSR1 or to crash -@@ -346,7 +348,15 @@ main(int argc, /* I - Number of comm - sleep(1); - - if (parent_signal == SIGUSR1) -+ { -+ FILE *f = fopen ("/var/run/cupsd.pid", "w"); -+ if (f) -+ { -+ fprintf (f, "%d\n", pid); -+ fclose (f); -+ } - return (0); -+ } - - if (wait(&i) < 0) - { diff --git a/SOURCES/cups-ppdopen-heap-overflow.patch b/SOURCES/cups-ppdopen-heap-overflow.patch deleted file mode 100644 index 4b725e1..0000000 --- a/SOURCES/cups-ppdopen-heap-overflow.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/cups/ppd.c b/cups/ppd.c -index ff52df2e..199cf034 100644 ---- a/cups/ppd.c -+++ b/cups/ppd.c -@@ -1719,8 +1719,7 @@ _ppdOpen( - constraint->choice1, constraint->option2, - constraint->choice2)) - { -- case 0 : /* Error */ -- case 1 : /* Error */ -+ default : /* Error */ - pg->ppd_status = PPD_BAD_UI_CONSTRAINTS; - goto error; - -diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx -index c25d4966..236c00db 100644 ---- a/ppdc/ppdc-source.cxx -+++ b/ppdc/ppdc-source.cxx -@@ -1743,15 +1743,17 @@ ppdcSource::get_resolution(ppdcFile *fp)// I - File to read - - switch (sscanf(name, "%dx%d", &xdpi, &ydpi)) - { -- case 0 : -- _cupsLangPrintf(stderr, -- _("ppdc: Bad resolution name \"%s\" on line %d of " -- "%s."), name, fp->line, fp->filename); -- break; - case 1 : - ydpi = xdpi; - break; -- } -+ case 2 : -+ break; -+ default : -+ _cupsLangPrintf(stderr, -+ _("ppdc: Bad resolution name \"%s\" on line %d of " -+ "%s."), name, fp->line, fp->filename); -+ break; -+} - - // Create the necessary PS commands... - snprintf(command, sizeof(command), diff --git a/SOURCES/cups-preservejob-leak.patch b/SOURCES/cups-preservejob-leak.patch deleted file mode 100644 index c1c132d..0000000 --- a/SOURCES/cups-preservejob-leak.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/scheduler/colorman.c b/scheduler/colorman.c -index 8af4e5c..9bfdb0c 100644 ---- a/scheduler/colorman.c -+++ b/scheduler/colorman.c -@@ -1083,7 +1083,7 @@ colord_create_profile( - - dbus_message_iter_get_basic(&args, &profile_path); - cupsdLogMessage(CUPSD_LOG_DEBUG, "Created profile \"%s\".", profile_path); -- cupsArrayAdd(profiles, strdup(profile_path)); -+ cupsArrayAdd(profiles, profile_path); - - out: - -diff --git a/scheduler/job.c b/scheduler/job.c -index 0223bee..47d4c72 100644 ---- a/scheduler/job.c -+++ b/scheduler/job.c -@@ -1496,11 +1496,11 @@ cupsdDeleteJob(cupsd_job_t *job, /* I - Job */ - job->num_files = 0; - } - -+ unload_job(job); -+ - if (job->history) - free_job_history(job); - -- unload_job(job); -- - cupsArrayRemove(Jobs, job); - cupsArrayRemove(ActiveJobs, job); - cupsArrayRemove(PrintingJobs, job); diff --git a/SOURCES/cups-rastertoepson-crash.patch b/SOURCES/cups-rastertoepson-crash.patch deleted file mode 100644 index 11f6673..0000000 --- a/SOURCES/cups-rastertoepson-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c -index 4efe669..e8fe0c6 100644 ---- a/filter/rastertoepson.c -+++ b/filter/rastertoepson.c -@@ -307,7 +307,7 @@ StartPage( - - if (DotBytes) - { -- if ((LineBuffers[0] = calloc((size_t)DotBytes, header->cupsWidth * (size_t)(Shingling + 1))) == NULL) -+ if ((LineBuffers[0] = calloc((size_t)DotBytes, (header->cupsWidth + 7) * (size_t)(Shingling + 1))) == NULL) - { - fputs("ERROR: Unable to allocate memory\n", stderr); - exit(1); diff --git a/SOURCES/cups-require-cups-socket.patch b/SOURCES/cups-require-cups-socket.patch deleted file mode 100644 index 1686dd9..0000000 --- a/SOURCES/cups-require-cups-socket.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in -index c02412fb0..18b5e0386 100644 ---- a/scheduler/org.cups.cupsd.service.in -+++ b/scheduler/org.cups.cupsd.service.in -@@ -2,6 +2,7 @@ - Description=CUPS Scheduler - Documentation=man:cupsd(8) - After=network.target nss-user-lookup.target -+Requires=cups.socket - - [Service] - ExecStart=@sbindir@/cupsd -l diff --git a/SOURCES/cups-res_init.patch b/SOURCES/cups-res_init.patch deleted file mode 100644 index 3866521..0000000 --- a/SOURCES/cups-res_init.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up cups-1.7b1/cups/http-addr.c.res_init cups-1.7b1/cups/http-addr.c ---- cups-1.7b1/cups/http-addr.c.res_init 2013-03-20 19:14:10.000000000 +0100 -+++ cups-1.7b1/cups/http-addr.c 2013-04-19 12:01:36.927512159 +0200 -@@ -319,7 +319,8 @@ httpAddrLookup( - - if (error) - { -- if (error == EAI_FAIL) -+ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || -+ error == EAI_NONAME) - cg->need_res_init = 1; - - return (httpAddrString(addr, name, namelen)); -diff -up cups-1.7b1/cups/http-addrlist.c.res_init cups-1.7b1/cups/http-addrlist.c ---- cups-1.7b1/cups/http-addrlist.c.res_init 2013-04-19 12:01:36.930512119 +0200 -+++ cups-1.7b1/cups/http-addrlist.c 2013-04-19 12:03:13.769229554 +0200 -@@ -581,7 +581,8 @@ httpAddrGetList(const char *hostname, /* - } - else - { -- if (error == EAI_FAIL) -+ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || -+ error == EAI_NONAME) - cg->need_res_init = 1; - - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gai_strerror(error), 0); diff --git a/SOURCES/cups-restart-job-hold-until.patch b/SOURCES/cups-restart-job-hold-until.patch deleted file mode 100644 index d235518..0000000 --- a/SOURCES/cups-restart-job-hold-until.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/scheduler/ipp.c b/scheduler/ipp.c -index e0dbc4a..5e9a985 100644 ---- a/scheduler/ipp.c -+++ b/scheduler/ipp.c -@@ -9891,11 +9891,10 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ - cupsdLogJob(job, CUPSD_LOG_DEBUG, - "Restarted by \"%s\" with job-hold-until=%s.", - username, attr->values[0].string.text); -- cupsdSetJobHoldUntil(job, attr->values[0].string.text, 0); -- -- cupsdAddEvent(CUPSD_EVENT_JOB_CONFIG_CHANGED | CUPSD_EVENT_JOB_STATE, -- NULL, job, "Job restarted by user with job-hold-until=%s", -- attr->values[0].string.text); -+ cupsdSetJobHoldUntil(job, attr->values[0].string.text, 1); -+ cupsdSetJobState(job, IPP_JOB_HELD, CUPSD_JOB_DEFAULT, -+ "Job restarted by user with job-hold-until=%s", -+ attr->values[0].string.text); - } - else - { diff --git a/SOURCES/cups-retry-current-job-man.patch b/SOURCES/cups-retry-current-job-man.patch deleted file mode 100644 index 0d879c6..0000000 --- a/SOURCES/cups-retry-current-job-man.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html -index 9082348..8ab1ce8 100644 ---- a/doc/help/man-cupsd.conf.html -+++ b/doc/help/man-cupsd.conf.html -@@ -90,7 +90,7 @@ The default value is "30". -
Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer. -
ErrorPolicy retry-job -
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. --
ErrorPolicy retry-this-job -+
ErrorPolicy retry-current-job -
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. -
ErrorPolicy stop-printer -
Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default. -diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in -index 53a028d..ba12b07 100644 ---- a/man/cupsd.conf.man.in -+++ b/man/cupsd.conf.man.in -@@ -135,7 +135,7 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise - \fBErrorPolicy retry-job\fR - Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. - .TP 5 --\fBErrorPolicy retry-this-job\fR -+\fBErrorPolicy retry-current-job\fR - Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. - .TP 5 - \fBErrorPolicy stop-printer\fR -diff --git a/man/cupsd.conf.man.in.privilege-escalation b/man/cupsd.conf.man.in.privilege-escalation -index ab89e15..130ea8a 100644 ---- a/man/cupsd.conf.man.in.privilege-escalation -+++ b/man/cupsd.conf.man.in.privilege-escalation -@@ -135,7 +135,7 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise - \fBErrorPolicy retry-job\fR - Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. - .TP 5 --\fBErrorPolicy retry-this-job\fR -+\fBErrorPolicy retry-current-job\fR - Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. - .TP 5 - \fBErrorPolicy stop-printer\fR -diff --git a/man/cupsd.conf.man.in.remove-weak-ciphers b/man/cupsd.conf.man.in.remove-weak-ciphers -index 5516780..35065ca 100644 ---- a/man/cupsd.conf.man.in.remove-weak-ciphers -+++ b/man/cupsd.conf.man.in.remove-weak-ciphers -@@ -135,7 +135,7 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise - \fBErrorPolicy retry-job\fR - Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. - .TP 5 --\fBErrorPolicy retry-this-job\fR -+\fBErrorPolicy retry-current-job\fR - Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. - .TP 5 - \fBErrorPolicy stop-printer\fR diff --git a/SOURCES/cups-ricoh-deviceid-oid.patch b/SOURCES/cups-ricoh-deviceid-oid.patch deleted file mode 100644 index c148f95..0000000 --- a/SOURCES/cups-ricoh-deviceid-oid.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.5b1/backend/snmp.c.ricoh-deviceid-oid cups-1.5b1/backend/snmp.c ---- cups-1.5b1/backend/snmp.c.ricoh-deviceid-oid 2011-05-24 17:29:48.000000000 +0200 -+++ cups-1.5b1/backend/snmp.c 2011-05-24 17:29:48.000000000 +0200 -@@ -188,6 +188,7 @@ static const int LexmarkProductOID[] = { - static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 }; - static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 }; - static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 }; -+static const int RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 }; - static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 }; - static cups_array_t *DeviceURIs = NULL; - static int HostNameLookups = 0; -@@ -1005,6 +1006,9 @@ read_snmp_response(int fd) /* I - SNMP - packet.community, CUPS_ASN1_GET_REQUEST, - DEVICE_ID, LexmarkDeviceIdOID); - _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, -+ packet.community, CUPS_ASN1_GET_REQUEST, -+ DEVICE_ID, RicohDeviceIdOID); -+ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, - packet.community, CUPS_ASN1_GET_REQUEST, - DEVICE_PRODUCT, XeroxProductOID); - _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, diff --git a/SOURCES/cups-serverbin-compat.patch b/SOURCES/cups-serverbin-compat.patch deleted file mode 100644 index 5f51e23..0000000 --- a/SOURCES/cups-serverbin-compat.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff -up cups-2.2rc1/scheduler/conf.c.serverbin-compat cups-2.2rc1/scheduler/conf.c ---- cups-2.2rc1/scheduler/conf.c.serverbin-compat 2016-08-08 20:06:00.000000000 +0200 -+++ cups-2.2rc1/scheduler/conf.c 2016-08-09 09:58:21.324033645 +0200 -@@ -609,6 +609,9 @@ cupsdReadConfiguration(void) - cupsdClearString(&ServerName); - cupsdClearString(&ServerAdmin); - cupsdSetString(&ServerBin, CUPS_SERVERBIN); -+#ifdef __x86_64__ -+ cupsdSetString(&ServerBin_compat, "/usr/lib64/cups"); -+#endif /* __x86_64__ */ - cupsdSetString(&RequestRoot, CUPS_REQUESTS); - cupsdSetString(&CacheDir, CUPS_CACHEDIR); - cupsdSetString(&DataDir, CUPS_DATADIR); -@@ -1604,7 +1607,12 @@ cupsdReadConfiguration(void) - * Read the MIME type and conversion database... - */ - -+#ifdef __x86_64__ -+ snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin, -+ ServerBin_compat); -+#else - snprintf(temp, sizeof(temp), "%s/filter", ServerBin); -+#endif - snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir); - - MimeDatabase = mimeNew(); -diff -up cups-2.2rc1/scheduler/conf.h.serverbin-compat cups-2.2rc1/scheduler/conf.h ---- cups-2.2rc1/scheduler/conf.h.serverbin-compat 2016-08-08 20:06:00.000000000 +0200 -+++ cups-2.2rc1/scheduler/conf.h 2016-08-09 09:58:21.325033636 +0200 -@@ -106,6 +106,10 @@ VAR char *ConfigurationFile VALUE(NULL) - /* Root directory for scheduler */ - *ServerBin VALUE(NULL), - /* Root directory for binaries */ -+#ifdef __x86_64__ -+ *ServerBin_compat VALUE(NULL), -+ /* Compat directory for binaries */ -+#endif /* __x86_64__ */ - *StateDir VALUE(NULL), - /* Root directory for state data */ - *RequestRoot VALUE(NULL), -diff -up cups-2.2rc1/scheduler/env.c.serverbin-compat cups-2.2rc1/scheduler/env.c ---- cups-2.2rc1/scheduler/env.c.serverbin-compat 2016-08-08 20:06:00.000000000 +0200 -+++ cups-2.2rc1/scheduler/env.c 2016-08-09 09:58:21.325033636 +0200 -@@ -212,8 +212,13 @@ cupsdUpdateEnv(void) - set_if_undefined("LD_PRELOAD", NULL); - set_if_undefined("NLSPATH", NULL); - if (find_env("PATH") < 0) -+#ifdef __x86_64__ -+ cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR -+ ":/bin:/usr/bin", ServerBin, ServerBin_compat); -+#else /* ! defined(__x86_64__) */ - cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR - ":/bin:/usr/bin", ServerBin); -+#endif - set_if_undefined("SERVER_ADMIN", ServerAdmin); - set_if_undefined("SHLIB_PATH", NULL); - set_if_undefined("SOFTWARE", CUPS_MINIMAL); -diff -up cups-2.2rc1/scheduler/ipp.c.serverbin-compat cups-2.2rc1/scheduler/ipp.c ---- cups-2.2rc1/scheduler/ipp.c.serverbin-compat 2016-08-09 09:58:21.326033626 +0200 -+++ cups-2.2rc1/scheduler/ipp.c 2016-08-09 10:10:16.266127629 +0200 -@@ -2419,12 +2419,21 @@ add_printer(cupsd_client_t *con, /* I - - * Could not find device in list! - */ - -+#ifdef __x86_64__ -+ snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin_compat, -+ scheme); -+ if (access(srcfile, X_OK)) -+ { -+#endif /* __x86_64__ */ - send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad device-uri scheme \"%s\"."), scheme); - if (!modify) - cupsdDeletePrinter(printer, 0); - - return; -+#ifdef __x86_64__ -+ } -+#endif /* __x86_64__ */ - } - } - -diff -up cups-2.2rc1/scheduler/job.c.serverbin-compat cups-2.2rc1/scheduler/job.c ---- cups-2.2rc1/scheduler/job.c.serverbin-compat 2016-08-08 20:06:00.000000000 +0200 -+++ cups-2.2rc1/scheduler/job.c 2016-08-09 09:58:21.327033616 +0200 -@@ -1126,8 +1126,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I - i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) - { - if (filter->filter[0] != '/') -- snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, -- filter->filter); -+ { -+ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, -+ filter->filter); -+#ifdef __x86_64__ -+ if (access(command, F_OK)) -+ { -+ snprintf(command, sizeof(command), "%s/filter/%s", -+ ServerBin_compat, filter->filter); -+ if (!access(command, F_OK)) -+ { -+ /* Not in the correct directory, but found it in the compat -+ * directory. Issue a warning. */ -+ cupsdLogMessage(CUPSD_LOG_INFO, -+ "Filter '%s' not in %s/filter!", -+ filter->filter, ServerBin); -+ } -+ else -+ { -+ /* Not in the compat directory either; make any error -+ * messages use the correct directory name then. */ -+ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, -+ filter->filter); -+ } -+ } -+#endif /* __x86_64__ */ -+ } - else - strlcpy(command, filter->filter, sizeof(command)); - -@@ -1283,6 +1307,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I - { - cupsdClosePipe(job->back_pipes); - cupsdClosePipe(job->side_pipes); -+#ifdef __x86_64__ -+ if (access(command, F_OK)) -+ { -+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat, -+ scheme); -+ if (!access(command, F_OK)) -+ { -+ /* Not in the correct directory, but we found it in the compat -+ * directory. Issue a warning. */ -+ cupsdLogMessage(CUPSD_LOG_INFO, -+ "Backend '%s' not in %s/backend!", scheme, -+ ServerBin); -+ } -+ else -+ { -+ /* Not in the compat directory either; make any error -+ messages use the correct directory name then. */ -+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, -+ scheme); -+ } -+ } -+#endif /* __x86_64__ */ - - close(job->status_pipes[1]); - job->status_pipes[1] = -1; -diff -up cups-2.2rc1/scheduler/printers.c.serverbin-compat cups-2.2rc1/scheduler/printers.c ---- cups-2.2rc1/scheduler/printers.c.serverbin-compat 2016-08-08 20:06:00.000000000 +0200 -+++ cups-2.2rc1/scheduler/printers.c 2016-08-09 09:58:21.327033616 +0200 -@@ -967,9 +967,19 @@ cupsdLoadAllPrinters(void) - * Backend does not exist, stop printer... - */ - -+#ifdef __x86_64__ -+ snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat, -+ p->device_uri); -+ if (access(line, 0)) -+ { -+#endif /* __x86_64__ */ -+ - p->state = IPP_PRINTER_STOPPED; - snprintf(p->state_message, sizeof(p->state_message), - "Backend %s does not exist!", line); -+#ifdef __x86_64__ -+ } -+#endif /* __x86_64__ */ - } - } - -@@ -3481,8 +3491,20 @@ add_printer_filter( - else - snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, program); - -+#ifdef __x86_64__ -+ if (_cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser, -+ cupsdLogFCMessage, p) == _CUPS_FILE_CHECK_MISSING) { -+ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat, -+ program); -+ if (_cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser, -+ cupsdLogFCMessage, p) == _CUPS_FILE_CHECK_MISSING) -+ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, -+ program); -+ } -+#else /* ! defined(__x86_64__) */ - _cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser, - cupsdLogFCMessage, p); -+#endif - } - - /* diff --git a/SOURCES/cups-socket-remove-on-stop.patch b/SOURCES/cups-socket-remove-on-stop.patch deleted file mode 100644 index ea532d0..0000000 --- a/SOURCES/cups-socket-remove-on-stop.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in -index 613b977a6..1deee826a 100644 ---- a/scheduler/org.cups.cupsd.socket.in -+++ b/scheduler/org.cups.cupsd.socket.in -@@ -4,6 +4,7 @@ PartOf=org.cups.cupsd.service - - [Socket] - ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ -+RemoveOnStop=on - - [Install] - WantedBy=sockets.target diff --git a/SOURCES/cups-sssd.patch b/SOURCES/cups-sssd.patch deleted file mode 100644 index b0a7d76..0000000 --- a/SOURCES/cups-sssd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in -index 11e0662..6fb7a32 100644 ---- a/scheduler/org.cups.cupsd.service.in -+++ b/scheduler/org.cups.cupsd.service.in -@@ -1,7 +1,7 @@ - [Unit] - Description=CUPS Scheduler - Documentation=man:cupsd(8) --After=network.target ypbind.service -+After=network.target nss-user-lookup.target - - [Service] - ExecStart=@sbindir@/cupsd -l diff --git a/SOURCES/cups-str3382.patch b/SOURCES/cups-str3382.patch deleted file mode 100644 index b31bf37..0000000 --- a/SOURCES/cups-str3382.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -up cups-2.0rc1/cups/tempfile.c.str3382 cups-2.0rc1/cups/tempfile.c ---- cups-2.0rc1/cups/tempfile.c.str3382 2014-07-31 02:58:00.000000000 +0200 -+++ cups-2.0rc1/cups/tempfile.c 2014-09-12 14:06:42.560887827 +0200 -@@ -27,6 +27,7 @@ - # include - #else - # include -+# include - #endif /* WIN32 || __EMX__ */ - - -@@ -48,7 +49,7 @@ cupsTempFd(char *filename, /* I - Point - char tmppath[1024]; /* Windows temporary directory */ - DWORD curtime; /* Current time */ - #else -- struct timeval curtime; /* Current time */ -+ mode_t old_umask; /* Old umask before using mkstemp() */ - #endif /* WIN32 */ - - -@@ -98,32 +99,24 @@ cupsTempFd(char *filename, /* I - Point - */ - - snprintf(filename, (size_t)len - 1, "%s/%05lx%08lx", tmpdir, GetCurrentProcessId(), curtime); --#else -- /* -- * Get the current time of day... -- */ -- -- gettimeofday(&curtime, NULL); -- -- /* -- * Format a string using the hex time values... -- */ -- -- snprintf(filename, (size_t)len - 1, "%s/%05x%08x", tmpdir, (unsigned)getpid(), (unsigned)(curtime.tv_sec + curtime.tv_usec + tries)); --#endif /* WIN32 */ - - /* - * Open the file in "exclusive" mode, making sure that we don't - * stomp on an existing file or someone's symlink crack... - */ - --#ifdef WIN32 - fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY, - _S_IREAD | _S_IWRITE); --#elif defined(O_NOFOLLOW) -- fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600); - #else -- fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600); -+ /* -+ * Use the standard mkstemp() call to make a temporary filename -+ * securely. -- andrew.wood@jdplc.com -+ */ -+ snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir); -+ -+ old_umask = umask(0077); -+ fd = mkstemp(filename); -+ umask(old_umask); - #endif /* WIN32 */ - - if (fd < 0 && errno != EEXIST) diff --git a/SOURCES/cups-strict-ppd-line-length.patch b/SOURCES/cups-strict-ppd-line-length.patch deleted file mode 100644 index 4ba1dd2..0000000 --- a/SOURCES/cups-strict-ppd-line-length.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up cups-2.0rc1/cups/ppd.c.strict-ppd-line-length cups-2.0rc1/cups/ppd.c ---- cups-2.0rc1/cups/ppd.c.strict-ppd-line-length 2014-02-06 19:33:34.000000000 +0100 -+++ cups-2.0rc1/cups/ppd.c 2014-09-12 18:07:44.227773710 +0200 -@@ -2872,7 +2872,7 @@ ppd_read(cups_file_t *fp, /* I - Fil - *lineptr++ = (char)ch; - col ++; - -- if (col > (PPD_MAX_LINE - 1)) -+ if (col > (PPD_MAX_LINE - 1) && pg->ppd_conform == PPD_CONFORM_STRICT) - { - /* - * Line is too long... -@@ -2933,7 +2933,7 @@ ppd_read(cups_file_t *fp, /* I - Fil - { - col ++; - -- if (col > (PPD_MAX_LINE - 1)) -+ if (col > (PPD_MAX_LINE - 1) && pg->ppd_conform == PPD_CONFORM_STRICT) - { - /* - * Line is too long... -@@ -2992,7 +2992,7 @@ ppd_read(cups_file_t *fp, /* I - Fil - { - col ++; - -- if (col > (PPD_MAX_LINE - 1)) -+ if (col > (PPD_MAX_LINE - 1) && pg->ppd_conform == PPD_CONFORM_STRICT) - { - /* - * Line is too long... diff --git a/SOURCES/cups-substitute-bad-attrs.patch b/SOURCES/cups-substitute-bad-attrs.patch deleted file mode 100644 index 37e65a1..0000000 --- a/SOURCES/cups-substitute-bad-attrs.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -up cups-2.2.7/scheduler/ipp.c.substitute-bad-attrs cups-2.2.7/scheduler/ipp.c ---- cups-2.2.7/scheduler/ipp.c.substitute-bad-attrs 2018-04-03 15:55:45.974344993 +0200 -+++ cups-2.2.7/scheduler/ipp.c 2018-04-03 16:15:06.723859881 +0200 -@@ -164,6 +164,7 @@ cupsdProcessIPPRequest( - ipp_attribute_t *uri = NULL; /* Printer or job URI attribute */ - ipp_attribute_t *username; /* requesting-user-name attr */ - int sub_id; /* Subscription ID */ -+ int valid = 1; /* Valid request? */ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdProcessIPPRequest(%p[%d]): operation_id=%04x(%s)", con, con->number, con->request->request.op.operation_id, ippOpString(con->request->request.op.operation_id)); -@@ -423,20 +424,55 @@ cupsdProcessIPPRequest( - else - { - /* -- * OK, all the checks pass so far; make sure requesting-user-name is -- * not "root" from a remote host... -+ * OK, all the checks pass so far; validate "requesting-user-name" -+ * attribute value... - */ - -- if ((username = ippFindAttribute(con->request, "requesting-user-name", -- IPP_TAG_NAME)) != NULL) -- { -- /* -- * Check for root user... -- */ -- -- if (!strcmp(username->values[0].string.text, "root") && -- _cups_strcasecmp(con->http->hostname, "localhost") && -- strcmp(con->username, "root")) -+ if ((username = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_ZERO)) != NULL) -+ { -+ /* -+ * Validate "requesting-user-name"... -+ */ -+ -+ if (username->group_tag != IPP_TAG_OPERATION && StrictConformance) -+ { -+ cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s \"requesting-user-name\" attribute in wrong group.", IPP_STATUS_ERROR_BAD_REQUEST, con->http->hostname); -+ send_ipp_status(con, IPP_STATUS_ERROR_BAD_REQUEST, _("\"requesting-user-name\" attribute in wrong group.")); -+ valid = 0; -+ } -+ else if (username->value_tag != IPP_TAG_NAME && username->value_tag != IPP_TAG_NAMELANG) -+ { -+ cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s \"requesting-user-name\" attribute with wrong syntax.", IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES, con->http->hostname); -+ send_ipp_status(con, IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES, _("\"requesting-user-name\" attribute with wrong syntax.")); -+ if ((attr = ippCopyAttribute(con->response, username, 0)) != NULL) -+ attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP; -+ valid = 0; -+ } -+ else if (!ippValidateAttribute(username)) -+ { -+ cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL, "%04X %s \"requesting-user-name\" attribute with bad value.", IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES, con->http->hostname); -+ -+ if (StrictConformance) -+ { -+ /* -+ * Throw an error... -+ */ -+ -+ send_ipp_status(con, IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES, _("\"requesting-user-name\" attribute with wrong syntax.")); -+ if ((attr = ippCopyAttribute(con->response, username, 0)) != NULL) -+ attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP; -+ valid = 0; -+ } -+ else -+ { -+ /* -+ * Map bad "requesting-user-name" to 'anonymous'... -+ */ -+ -+ ippSetString(con->request, &username, 0, "anonymous"); -+ } -+ } -+ else if (!strcmp(username->values[0].string.text, "root") && _cups_strcasecmp(con->http->hostname, "localhost") && strcmp(con->username, "root")) - { - /* - * Remote unauthenticated user masquerading as local root... -@@ -452,6 +488,8 @@ cupsdProcessIPPRequest( - else - sub_id = 0; - -+ if (valid) -+ { - /* - * Then try processing the operation... - */ -@@ -655,6 +693,7 @@ cupsdProcessIPPRequest( - ippOpString( - con->request->request.op.operation_id)); - break; -+ } - } - } - } -@@ -1615,27 +1654,34 @@ add_job(cupsd_client_t *con, /* I - Cl - _("Bad job-name value: Wrong type or count.")); - if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL) - attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP; -- return (NULL); -+ -+ if (StrictConformance) -+ return (NULL); -+ -+ /* Don't use invalid attribute */ -+ ippDeleteAttribute(con->request, attr); -+ -+ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, "Untitled"); - } - else if (!ippValidateAttribute(attr)) - { - send_ipp_status(con, IPP_ATTRIBUTES, _("Bad job-name value: %s"), - cupsLastErrorString()); -+ - if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL) - attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP; -- return (NULL); -- } - -- attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME); -+ if (StrictConformance) -+ return (NULL); - -- if (attr && !ippValidateAttribute(attr)) -- { -- send_ipp_status(con, IPP_ATTRIBUTES, _("Bad requesting-user-name value: %s"), cupsLastErrorString()); -- if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL) -- attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP; -- return (NULL); -+ /* Don't use invalid attribute */ -+ ippDeleteAttribute(con->request, attr); -+ -+ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, "Untitled"); - } - -+ attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME); -+ - #ifdef WITH_LSPP - if (is_lspp_config()) - { diff --git a/SOURCES/cups-synconclose.patch b/SOURCES/cups-synconclose.patch deleted file mode 100644 index 8aee02b..0000000 --- a/SOURCES/cups-synconclose.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up cups-2.0.2/conf/cups-files.conf.in.LGOyhq cups-2.0.2/conf/cups-files.conf.in ---- cups-2.0.2/conf/cups-files.conf.in.LGOyhq 2015-02-10 13:51:24.912193296 +0100 -+++ cups-2.0.2/conf/cups-files.conf.in 2015-02-10 13:52:49.400997262 +0100 -@@ -7,7 +7,7 @@ - #FatalErrors @CUPS_FATAL_ERRORS@ - - # Do we call fsync() after writing configuration or status files? --#SyncOnClose No -+#SyncOnClose Yes - - # Default user and group for filters/backends/helper programs; this cannot be - # any user or group that resolves to ID 0 for security reasons... -diff -up cups-2.0.2/doc/help/man-cups-files.conf.html.LGOyhq cups-2.0.2/doc/help/man-cups-files.conf.html ---- cups-2.0.2/doc/help/man-cups-files.conf.html.LGOyhq 2015-02-10 13:52:49.400997262 +0100 -+++ cups-2.0.2/doc/help/man-cups-files.conf.html 2015-02-10 13:53:07.057747311 +0100 -@@ -136,7 +136,7 @@ The default is "/etc/cups". -
Specifies whether the scheduler calls - fsync(2) - after writing configuration or state files. --The default is "No". -+The default is "Yes". -
SystemGroup group-name [ ... group-name ] -
Specifies the group(s) to use for @SYSTEM group authentication. - The default contains "admin", "lpadmin", "root", "sys", and/or "system". -diff -up cups-2.0.2/man/cups-files.conf.man.in.LGOyhq cups-2.0.2/man/cups-files.conf.man.in ---- cups-2.0.2/man/cups-files.conf.man.in.LGOyhq 2015-02-10 13:52:49.400997262 +0100 -+++ cups-2.0.2/man/cups-files.conf.man.in 2015-02-10 13:53:23.753510964 +0100 -@@ -201,7 +201,7 @@ The default is "/etc/cups". - Specifies whether the scheduler calls - .BR fsync (2) - after writing configuration or state files. --The default is "No". -+The default is "Yes". - .\"#SystemGroup - .TP 5 - \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ] -diff -up cups-2.0.2/scheduler/conf.c.LGOyhq cups-2.0.2/scheduler/conf.c ---- cups-2.0.2/scheduler/conf.c.LGOyhq 2015-02-10 13:51:24.991192177 +0100 -+++ cups-2.0.2/scheduler/conf.c 2015-02-10 13:52:49.401997248 +0100 -@@ -717,7 +717,7 @@ cupsdReadConfiguration(void) - RootCertDuration = 300; - Sandboxing = CUPSD_SANDBOXING_STRICT; - StrictConformance = FALSE; -- SyncOnClose = FALSE; -+ SyncOnClose = TRUE; - Timeout = DEFAULT_TIMEOUT; - WebInterface = CUPS_DEFAULT_WEBIF; - diff --git a/SOURCES/cups-system-auth.patch b/SOURCES/cups-system-auth.patch deleted file mode 100644 index 60117a9..0000000 --- a/SOURCES/cups-system-auth.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up cups-1.5b1/conf/cups.password-auth.system-auth cups-1.5b1/conf/cups.password-auth ---- cups-1.5b1/conf/cups.password-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 -+++ cups-1.5b1/conf/cups.password-auth 2011-05-23 17:27:27.000000000 +0200 -@@ -0,0 +1,4 @@ -+#%PAM-1.0 -+# Use password-auth common PAM configuration for the daemon -+auth include password-auth -+account include password-auth -diff -up cups-1.5b1/conf/cups.system-auth.system-auth cups-1.5b1/conf/cups.system-auth ---- cups-1.5b1/conf/cups.system-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 -+++ cups-1.5b1/conf/cups.system-auth 2011-05-23 17:27:27.000000000 +0200 -@@ -0,0 +1,3 @@ -+#%PAM-1.0 -+auth include system-auth -+account include system-auth -diff -up cups-1.5b1/conf/Makefile.system-auth cups-1.5b1/conf/Makefile ---- cups-1.5b1/conf/Makefile.system-auth 2011-05-12 07:21:56.000000000 +0200 -+++ cups-1.5b1/conf/Makefile 2011-05-23 17:27:27.000000000 +0200 -@@ -90,10 +90,16 @@ install-data: - done - -if test x$(PAMDIR) != x; then \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ -- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ -- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ -+ if test -f /etc/pam.d/password-auth; then \ -+ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \ -+ elif test -f /etc/pam.d/system-auth; then \ -+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \ - else \ -- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ -+ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ -+ else \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ -+ fi ; \ - fi ; \ - fi - diff --git a/SOURCES/cups-systemd-socket.patch b/SOURCES/cups-systemd-socket.patch deleted file mode 100644 index 37ccec9..0000000 --- a/SOURCES/cups-systemd-socket.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up cups-2.2.5/scheduler/main.c.systemd-socket cups-2.2.5/scheduler/main.c ---- cups-2.2.5/scheduler/main.c.systemd-socket 2017-10-17 18:59:53.732431498 +0200 -+++ cups-2.2.5/scheduler/main.c 2017-10-17 19:02:13.132275861 +0200 -@@ -691,8 +691,16 @@ main(int argc, /* I - Number of comm - - #ifdef HAVE_ONDEMAND - if (OnDemand) -+ { - cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand."); -- else -+# ifdef HAVE_SYSTEMD -+ sd_notifyf(0, "READY=1\n" -+ "STATUS=Scheduler is running...\n" -+ "MAINPID=%lu", -+ (unsigned long) getpid()); -+# endif /* HAVE_SYSTEMD */ -+ } else -+ - #endif /* HAVE_ONDEMAND */ - if (fg) - cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground."); -diff -up cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.path.in ---- cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket 2017-10-13 20:22:26.000000000 +0200 -+++ cups-2.2.5/scheduler/org.cups.cupsd.path.in 2017-10-17 18:59:53.732431498 +0200 -@@ -1,6 +1,6 @@ - [Unit] - Description=CUPS Scheduler --PartOf=org.cups.cupsd.service -+PartOf=cups.service - - [Path] - PathExists=@CUPS_CACHEDIR@/org.cups.cupsd -diff -up cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.service.in ---- cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket 2017-10-13 20:22:26.000000000 +0200 -+++ cups-2.2.5/scheduler/org.cups.cupsd.service.in 2017-10-17 18:59:53.732431498 +0200 -@@ -1,11 +1,13 @@ - [Unit] - Description=CUPS Scheduler - Documentation=man:cupsd(8) -+After=network.target - - [Service] - ExecStart=@sbindir@/cupsd -l --Type=simple -+Type=notify -+Restart=on-failure - - [Install] --Also=org.cups.cupsd.socket org.cups.cupsd.path -+Also=cups.socket cups.path - WantedBy=printer.target -diff -up cups-2.2.6/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.6/scheduler/org.cups.cupsd.socket.in ---- cups-2.2.6/scheduler/org.cups.cupsd.socket.in.systemd-socket 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/scheduler/org.cups.cupsd.socket.in 2018-09-19 12:38:00.630843246 +0200 -@@ -1,6 +1,6 @@ - [Unit] - Description=CUPS Scheduler --PartOf=org.cups.cupsd.service -+PartOf=cups.service - - [Socket] - ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ -diff -up cups-2.2.6/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.6/scheduler/org.cups.cups-lpd.socket ---- cups-2.2.6/scheduler/org.cups.cups-lpd.socket.systemd-socket 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/scheduler/org.cups.cups-lpd.socket 2018-09-19 12:38:00.630843246 +0200 -@@ -1,6 +1,6 @@ - [Unit] - Description=CUPS LPD Server Socket --PartOf=org.cups.cups-lpd.service -+PartOf=cups-lpd.service - - [Socket] - ListenStream=515 diff --git a/SOURCES/cups-use-ipp1.1.patch b/SOURCES/cups-use-ipp1.1.patch deleted file mode 100644 index 41855fc..0000000 --- a/SOURCES/cups-use-ipp1.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.6.3/cups/usersys.c.use-ipp1.1 cups-1.6.3/cups/usersys.c ---- cups-1.6.3/cups/usersys.c.use-ipp1.1 2013-07-12 11:41:45.368837618 +0200 -+++ cups-1.6.3/cups/usersys.c 2013-07-12 11:41:45.391837299 +0200 -@@ -366,7 +366,7 @@ cupsSetServer(const char *server) /* I - - cg->server_version = 22; - } - else -- cg->server_version = 20; -+ cg->server_version = 11; - - if (cg->server[0] != '/' && (port = strrchr(cg->server, ':')) != NULL && - !strchr(port, ']') && isdigit(port[1] & 255)) diff --git a/SOURCES/cups-validate-1st.patch b/SOURCES/cups-validate-1st.patch deleted file mode 100644 index e7b9070..0000000 --- a/SOURCES/cups-validate-1st.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/backend/ipp.c b/backend/ipp.c -index 0a70a87..f8bf7e1 100644 ---- a/backend/ipp.c -+++ b/backend/ipp.c -@@ -327,6 +327,7 @@ main(int argc, /* I - Number of command-line args */ - get_job_attrs = 0, /* Does printer support Get-Job-Attributes? */ - send_document = 0, /* Does printer support Send-Document? */ - validate_job = 0, /* Does printer support Validate-Job? */ -+ validation_retried = 0, /* Indicate whether Validate-Job was retried */ - copies, /* Number of copies for job */ - copies_remaining; /* Number of copies remaining */ - const char *content_type, /* CONTENT_TYPE environment variable */ -@@ -1597,7 +1598,15 @@ main(int argc, /* I - Number of command-line args */ - ipp_status == IPP_BAD_REQUEST) - break; - else if (job_auth == NULL && ipp_status > IPP_BAD_REQUEST) -+ { -+ if (!validation_retried) -+ { -+ validation_retried = 1; -+ sleep(10); -+ continue; -+ } - goto cleanup; -+ } - } - - /* diff --git a/SOURCES/cups-ypbind.patch b/SOURCES/cups-ypbind.patch deleted file mode 100644 index f942708..0000000 --- a/SOURCES/cups-ypbind.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-2.2.0/scheduler/org.cups.cupsd.service.in.ypbind cups-2.2.0/scheduler/org.cups.cupsd.service.in ---- cups-2.2.0/scheduler/org.cups.cupsd.service.in.ypbind 2017-09-22 16:51:39.053585694 +0200 -+++ cups-2.2.0/scheduler/org.cups.cupsd.service.in 2017-09-22 16:52:02.588403584 +0200 -@@ -1,7 +1,7 @@ - [Unit] - Description=CUPS Scheduler - Documentation=man:cupsd(8) --After=network.target -+After=network.target ypbind.service - - [Service] - ExecStart=@sbindir@/cupsd -l diff --git a/SOURCES/cups.logrotate b/SOURCES/cups.logrotate deleted file mode 100644 index 773c70f..0000000 --- a/SOURCES/cups.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/cups/*_log { - missingok - notifempty - sharedscripts -} diff --git a/SOURCES/macros.cups b/SOURCES/macros.cups deleted file mode 100644 index 5b560d9..0000000 --- a/SOURCES/macros.cups +++ /dev/null @@ -1 +0,0 @@ -%_cups_serverbin %(/usr/bin/cups-config --serverbin) diff --git a/SOURCES/ncp.backend b/SOURCES/ncp.backend deleted file mode 100755 index d57ada1..0000000 --- a/SOURCES/ncp.backend +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# This is a modified version of 'ncpprint'. It can now be used as a CUPS -# backend. -# Modifications: -# Copyright (C) 2002 Red Hat, inc -# Copyright (C) 2002 Tim Waugh -# Before modification: shipped as /usr/share/printconf/util/ncpprint - -if [ -z "$*" ] -then - # This is where we would enumerate all the URIs we support. - # Patches welcome. - exit 0 -fi - -FILE=$6 -if [ -z "$FILE" ] -then - FILE=- -fi - -# $DEVICE_URI is 'ncp://[user:password@]server/queue' -URI=${DEVICE_URI#*://} -queue=${URI#*/} -URI=${URI%/$queue} -server=${URI#*@} -URI=${URI%$server} -URI=${URI%@} -if [ -n "$URI" ] -then - user=${URI%:*} - URI=${URI#$user} - password=${URI#:} -fi - -#echo user: ${user-(none)} -#echo password: ${password-(none)} -#echo server: $server -#echo queue: $queue - -if [ -n "$user" ] -then - if [ -n "$password" ] - then - /usr/bin/nprint -S "$server" -q "$queue" -U "$user" -P "$password" -N "$FILE" 2>/dev/null - else - /usr/bin/nprint -S "$server" -q "$queue" -U "$user" -n -N "$FILE" 2>/dev/null - fi -else - /usr/bin/nprint -S "$server" -q "$queue" -N "$FILE" 2>/dev/null -fi diff --git a/SOURCES/cups-banners.patch b/cups-banners.patch similarity index 100% rename from SOURCES/cups-banners.patch rename to cups-banners.patch diff --git a/SOURCES/cups-direct-usb.patch b/cups-direct-usb.patch similarity index 100% rename from SOURCES/cups-direct-usb.patch rename to cups-direct-usb.patch diff --git a/SOURCES/cups-driverd-timeout.patch b/cups-driverd-timeout.patch similarity index 100% rename from SOURCES/cups-driverd-timeout.patch rename to cups-driverd-timeout.patch diff --git a/cups-dymo-deviceid.patch b/cups-dymo-deviceid.patch new file mode 100644 index 0000000..3ff1ffd --- /dev/null +++ b/cups-dymo-deviceid.patch @@ -0,0 +1,11 @@ +diff -up cups-2.3.1/ppdc/sample.drv.dymo-deviceid cups-2.3.1/ppdc/sample.drv +--- cups-2.3.1/ppdc/sample.drv.dymo-deviceid 2019-12-16 09:22:34.476492212 +0100 ++++ cups-2.3.1/ppdc/sample.drv 2019-12-16 09:23:44.665003895 +0100 +@@ -129,6 +129,7 @@ Version "2.3" + { + Manufacturer "DYMO" + ModelName "Label Printer" ++ Attribute "1284DeviceID" "" "MFG:DYMO;MDL:LabelWriter 400;" + Attribute NickName "" "DYMO Label Printer" + PCFileName "dymo.ppd" + DriverType label diff --git a/SOURCES/cups-failover-backend.patch b/cups-failover-backend.patch similarity index 97% rename from SOURCES/cups-failover-backend.patch rename to cups-failover-backend.patch index a92dad8..73551e4 100644 --- a/SOURCES/cups-failover-backend.patch +++ b/cups-failover-backend.patch @@ -1,42 +1,6 @@ -diff --git a/backend/Makefile b/backend/Makefile -index 3038682..6642016 100644 ---- a/backend/Makefile -+++ b/backend/Makefile -@@ -28,6 +28,7 @@ include ../Makedefs - RBACKENDS = \ - ipp \ - lpd \ -+ failover \ - $(DNSSD_BACKEND) - UBACKENDS = \ - snmp \ -@@ -51,6 +52,7 @@ LIBOBJS = \ - OBJS = \ - ipp.o \ - lpd.o \ -+ failover.o \ - dnssd.o \ - snmp.o \ - socket.o \ -@@ -275,6 +277,13 @@ lpd: lpd.o ../cups/$(LIBCUPS) libbackend.a - echo Linking $@... - $(LD_CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS) - -+# -+# failover -+# -+ -+failover: failover.o ../cups/$(LIBCUPS) libbackend.a -+ echo Linking $@... -+ $(LD_CC) $(LDFLAGS) -o failover failover.o libbackend.a $(LIBS) - - # - # snmp -diff --git a/backend/failover.c b/backend/failover.c -new file mode 100644 -index 0000000..9affd8f ---- /dev/null -+++ b/backend/failover.c +diff -up cups-2.4.0/backend/failover.c.failover cups-2.4.0/backend/failover.c +--- cups-2.4.0/backend/failover.c.failover 2021-12-15 11:06:14.274967317 +0100 ++++ cups-2.4.0/backend/failover.c 2021-12-15 11:06:14.274967317 +0100 @@ -0,0 +1,837 @@ +/* + * Failover Backend for the Common UNIX Printing System (CUPS). @@ -875,3 +839,38 @@ index 0000000..9affd8f + else + return (NULL); +} +diff -up cups-2.4.0/backend/Makefile.failover cups-2.4.0/backend/Makefile +--- cups-2.4.0/backend/Makefile.failover 2021-11-29 15:27:31.000000000 +0100 ++++ cups-2.4.0/backend/Makefile 2021-12-15 11:08:27.433009704 +0100 +@@ -25,6 +25,7 @@ RBACKENDS = \ + ipp \ + lpd \ + usb \ ++ failover \ + $(DNSSD_BACKEND) + UBACKENDS = \ + snmp \ +@@ -45,6 +46,7 @@ LIBOBJS = \ + OBJS = \ + ipp.o \ + lpd.o \ ++ failover.o \ + dnssd.o \ + snmp.o \ + socket.o \ +@@ -264,6 +266,15 @@ lpd: lpd.o ../cups/$(LIBCUPS) libbackend + + + # ++# failover ++# ++ ++failover: failover.o ../cups/$(LIBCUPS) libbackend.a ++ echo Linking $@... ++ $(LD_CC) $(ALL_LDFLAGS) -o failover failover.o libbackend.a $(LINKCUPS) ++ ++ ++# + # snmp + # + diff --git a/cups-fix-device-uri-in-webui.patch b/cups-fix-device-uri-in-webui.patch new file mode 100644 index 0000000..d702f88 --- /dev/null +++ b/cups-fix-device-uri-in-webui.patch @@ -0,0 +1,44 @@ +diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c +index e0f1136..02ff51d 100644 +--- a/cgi-bin/admin.c ++++ b/cgi-bin/admin.c +@@ -636,7 +636,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */ + }; + + +- ptr = cgiGetTextfield("DEVICE_URI"); ++ ptr = cgiGetVariable("DEVICE_URI"); + fprintf(stderr, "DEBUG: do_am_printer: DEVICE_URI=\"%s\"\n", + ptr ? ptr : "(null)"); + +@@ -697,7 +697,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */ + } + } + +- if ((var = cgiGetTextfield("DEVICE_URI")) != NULL) ++ if ((var = cgiGetVariable("DEVICE_URI")) != NULL) + { + if ((uriptr = strrchr(var, '|')) != NULL) + { +@@ -1130,7 +1130,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */ + ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-info", + NULL, cgiGetTextfield("PRINTER_INFO")); + +- strlcpy(uri, cgiGetTextfield("DEVICE_URI"), sizeof(uri)); ++ strlcpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri)); + + /* + * Strip make and model from URI... +diff --git a/cgi-bin/var.c b/cgi-bin/var.c +index 6ad945d..a4993ff 100644 +--- a/cgi-bin/var.c ++++ b/cgi-bin/var.c +@@ -288,7 +288,7 @@ cgiGetTextfield(const char *name) /* I - Name of form field */ + value = NULL; + } + +- return (value); ++ return (value ? strdup(value) : NULL); + } + + diff --git a/SOURCES/cups-freebind.patch b/cups-freebind.patch similarity index 100% rename from SOURCES/cups-freebind.patch rename to cups-freebind.patch diff --git a/SOURCES/cups-ipp-multifile.patch b/cups-ipp-multifile.patch similarity index 100% rename from SOURCES/cups-ipp-multifile.patch rename to cups-ipp-multifile.patch diff --git a/SOURCES/cups-lspp.patch b/cups-lspp.patch similarity index 87% rename from SOURCES/cups-lspp.patch rename to cups-lspp.patch index b5c2599..8d04789 100644 --- a/SOURCES/cups-lspp.patch +++ b/cups-lspp.patch @@ -1,22 +1,21 @@ -diff -up cups-2.2.6/config.h.in.lspp cups-2.2.6/config.h.in ---- cups-2.2.6/config.h.in.lspp 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/config.h.in 2024-08-15 14:55:07.310818870 +0200 -@@ -730,4 +730,12 @@ static __inline int _cups_abs(int i) { r - # endif /* __GNUC__ || __STDC_VERSION__ */ - #endif /* !HAVE_ABS && !abs */ - -+ -+/* -+ * Are we trying to meet LSPP requirements? -+ */ -+ -+#undef WITH_LSPP -+ -+ - #endif /* !_CUPS_CONFIG_H_ */ -diff -up cups-2.2.6/config-scripts/cups-lspp.m4.lspp cups-2.2.6/config-scripts/cups-lspp.m4 ---- cups-2.2.6/config-scripts/cups-lspp.m4.lspp 2024-08-15 14:55:07.310818870 +0200 -+++ cups-2.2.6/config-scripts/cups-lspp.m4 2024-08-15 14:55:07.310818870 +0200 +diff --git a/Makedefs.in b/Makedefs.in +index 9211338..8a1e0be 100644 +--- a/Makedefs.in ++++ b/Makedefs.in +@@ -162,7 +162,7 @@ ARFLAGS = @ARFLAGS@ + BACKLIBS = @BACKLIBS@ + BUILDDIRS = @BUILDDIRS@ + CFLAGS = @CPPFLAGS@ @CFLAGS@ +-COMMONLIBS = @LIBS@ ++COMMONLIBS = @LIBS@ @LIBAUDIT@ @LIBSELINUX@ + CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ + CXXLIBS = @CXXLIBS@ + DBUS_NOTIFIER = @DBUS_NOTIFIER@ +diff --git a/config-scripts/cups-lspp.m4 b/config-scripts/cups-lspp.m4 +new file mode 100644 +index 0000000..55bd1bb +--- /dev/null ++++ b/config-scripts/cups-lspp.m4 @@ -0,0 +1,36 @@ +dnl +dnl LSPP code for the Common UNIX Printing System (CUPS). @@ -54,22 +53,42 @@ diff -up cups-2.2.6/config-scripts/cups-lspp.m4.lspp cups-2.2.6/config-scripts/c + ;; + esac +fi -diff -up cups-2.2.6/configure.ac.lspp cups-2.2.6/configure.ac ---- cups-2.2.6/configure.ac.lspp 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/configure.ac 2024-08-15 14:55:07.310818870 +0200 -@@ -38,6 +38,8 @@ sinclude(config-scripts/cups-startup.m4) +diff --git a/config.h.in b/config.h.in +index 6940b96..363780a 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -684,6 +684,13 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); } + #endif /* !HAVE_ABS && !abs */ + + ++/* ++ * Are we trying to meet LSPP requirements? ++ */ ++ ++#undef WITH_LSPP ++ ++ + /* + * Building as a snap (snapcraft.io)? + */ +diff --git a/configure.ac b/configure.ac +index 3b5dd73..0e61044 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,6 +40,8 @@ sinclude(config-scripts/cups-container.m4) + sinclude(config-scripts/cups-startup.m4) sinclude(config-scripts/cups-defaults.m4) - sinclude(config-scripts/cups-scripting.m4) +sinclude(config-scripts/cups-lspp.m4) + + dnl See what languages are available and make sure we generate the localization + dnl files as needed... INSTALL_LANGUAGES="" - UNINSTALL_LANGUAGES="" - LANGFILES="" -diff -up cups-2.2.6/filter/common.c.lspp cups-2.2.6/filter/common.c ---- cups-2.2.6/filter/common.c.lspp 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/filter/common.c 2024-08-15 14:55:07.310818870 +0200 -@@ -17,6 +17,12 @@ +diff --git a/filter/common.c b/filter/common.c +index 22217be..070662f 100644 +--- a/filter/common.c ++++ b/filter/common.c +@@ -12,6 +12,12 @@ * Include necessary headers... */ @@ -82,7 +101,7 @@ diff -up cups-2.2.6/filter/common.c.lspp cups-2.2.6/filter/common.c #include "common.h" #include -@@ -299,6 +305,18 @@ WriteLabelProlog(const char *label, /* I +@@ -294,6 +300,18 @@ WriteLabelProlog(const char *label, /* I - Page label */ { const char *classification; /* CLASSIFICATION environment variable */ const char *ptr; /* Temporary string pointer */ @@ -101,7 +120,7 @@ diff -up cups-2.2.6/filter/common.c.lspp cups-2.2.6/filter/common.c /* -@@ -321,6 +339,124 @@ WriteLabelProlog(const char *label, /* I +@@ -316,6 +334,124 @@ WriteLabelProlog(const char *label, /* I - Page label */ return; } @@ -226,7 +245,7 @@ diff -up cups-2.2.6/filter/common.c.lspp cups-2.2.6/filter/common.c /* * Set the classification + page label string... */ -@@ -401,7 +537,10 @@ WriteLabelProlog(const char *label, /* I +@@ -396,7 +532,10 @@ WriteLabelProlog(const char *label, /* I - Page label */ printf(" %.0f moveto ESPpl show\n", top - 14.0); puts("pop"); puts("}bind put"); @@ -237,10 +256,11 @@ diff -up cups-2.2.6/filter/common.c.lspp cups-2.2.6/filter/common.c /* -diff -up cups-2.2.6/filter/pstops.c.lspp cups-2.2.6/filter/pstops.c ---- cups-2.2.6/filter/pstops.c.lspp 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/filter/pstops.c 2024-08-15 14:55:07.311818856 +0200 -@@ -3176,6 +3176,18 @@ write_label_prolog(pstops_doc_t *doc, /* +diff --git a/filter/pstops.c b/filter/pstops.c +index 41090c8..87da143 100644 +--- a/filter/pstops.c ++++ b/filter/pstops.c +@@ -3171,6 +3171,18 @@ write_label_prolog(pstops_doc_t *doc, /* I - Document info */ { const char *classification; /* CLASSIFICATION environment variable */ const char *ptr; /* Temporary string pointer */ @@ -259,7 +279,7 @@ diff -up cups-2.2.6/filter/pstops.c.lspp cups-2.2.6/filter/pstops.c /* -@@ -3198,6 +3210,124 @@ write_label_prolog(pstops_doc_t *doc, /* +@@ -3193,6 +3205,124 @@ write_label_prolog(pstops_doc_t *doc, /* I - Document info */ return; } @@ -384,7 +404,7 @@ diff -up cups-2.2.6/filter/pstops.c.lspp cups-2.2.6/filter/pstops.c /* * Set the classification + page label string... */ -@@ -3276,7 +3406,10 @@ write_label_prolog(pstops_doc_t *doc, /* +@@ -3271,7 +3401,10 @@ write_label_prolog(pstops_doc_t *doc, /* I - Document info */ doc_printf(doc, " %.0f moveto ESPpl show\n", top - 14.0); doc_puts(doc, "pop\n"); doc_puts(doc, "}bind put\n"); @@ -395,22 +415,11 @@ diff -up cups-2.2.6/filter/pstops.c.lspp cups-2.2.6/filter/pstops.c /* -diff -up cups-2.2.6/Makedefs.in.lspp cups-2.2.6/Makedefs.in ---- cups-2.2.6/Makedefs.in.lspp 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/Makedefs.in 2024-08-15 14:55:07.310818870 +0200 -@@ -145,7 +145,7 @@ ARFLAGS = @ARFLAGS@ - BACKLIBS = @BACKLIBS@ - BUILDDIRS = @BUILDDIRS@ - CFLAGS = @CPPFLAGS@ @CFLAGS@ --COMMONLIBS = @LIBS@ -+COMMONLIBS = @LIBS@ @LIBAUDIT@ @LIBSELINUX@ - CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ - CXXLIBS = @CXXLIBS@ - DBUS_NOTIFIER = @DBUS_NOTIFIER@ -diff -up cups-2.2.6/scheduler/client.c.lspp cups-2.2.6/scheduler/client.c ---- cups-2.2.6/scheduler/client.c.lspp 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/scheduler/client.c 2024-08-15 14:55:07.311818856 +0200 -@@ -22,12 +22,20 @@ +diff --git a/scheduler/client.c b/scheduler/client.c +index 779404c..bfb9210 100644 +--- a/scheduler/client.c ++++ b/scheduler/client.c +@@ -20,12 +20,20 @@ #define _HTTP_NO_PRIVATE #include "cupsd.h" @@ -431,7 +440,7 @@ diff -up cups-2.2.6/scheduler/client.c.lspp cups-2.2.6/scheduler/client.c /* -@@ -268,6 +276,59 @@ cupsdAcceptClient(cupsd_listener_t *lis) +@@ -264,6 +272,59 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ } #endif /* HAVE_TCPD_H */ @@ -491,7 +500,7 @@ diff -up cups-2.2.6/scheduler/client.c.lspp cups-2.2.6/scheduler/client.c #ifdef AF_LOCAL if (httpAddrFamily(httpGetAddress(con->http)) == AF_LOCAL) { -@@ -522,6 +583,11 @@ cupsdCloseClient(cupsd_client_t *con) /* +@@ -526,6 +587,11 @@ cupsdCloseClient(cupsd_client_t *con) /* I - Client to close */ } #endif /* HAVE_AUTHORIZATION_H */ @@ -503,9 +512,9 @@ diff -up cups-2.2.6/scheduler/client.c.lspp cups-2.2.6/scheduler/client.c /* * Re-enable new client connections if we are going back under the * limit... -@@ -562,6 +628,13 @@ cupsdReadClient(cupsd_client_t *con) /* +@@ -566,6 +632,13 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */ + struct stat filestats; /* File information */ mime_type_t *type; /* MIME type of file */ - cupsd_printer_t *p; /* Printer */ static unsigned request_id = 0; /* Request ID for temp files */ +#ifdef WITH_LSPP + security_context_t spoolcon; /* context of the job file */ @@ -517,7 +526,7 @@ diff -up cups-2.2.6/scheduler/client.c.lspp cups-2.2.6/scheduler/client.c status = HTTP_STATUS_CONTINUE; -@@ -1924,7 +1997,73 @@ cupsdReadClient(cupsd_client_t *con) /* +@@ -1737,7 +1810,73 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */ fchmod(con->file, 0640); fchown(con->file, RunUser, Group); fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); @@ -591,7 +600,7 @@ diff -up cups-2.2.6/scheduler/client.c.lspp cups-2.2.6/scheduler/client.c if (httpGetState(con->http) != HTTP_STATE_POST_SEND) { -@@ -3456,6 +3595,49 @@ is_path_absolute(const char *path) /* I +@@ -3235,6 +3374,49 @@ is_path_absolute(const char *path) /* I - Input path */ return (1); } @@ -641,10 +650,11 @@ diff -up cups-2.2.6/scheduler/client.c.lspp cups-2.2.6/scheduler/client.c /* * 'pipe_command()' - Pipe the output of a command to the remote client. -diff -up cups-2.2.6/scheduler/client.h.lspp cups-2.2.6/scheduler/client.h ---- cups-2.2.6/scheduler/client.h.lspp 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/scheduler/client.h 2024-08-15 14:55:07.312818843 +0200 -@@ -16,6 +16,13 @@ +diff --git a/scheduler/client.h b/scheduler/client.h +index 9fe4e2e..51c3ab5 100644 +--- a/scheduler/client.h ++++ b/scheduler/client.h +@@ -14,6 +14,13 @@ #endif /* HAVE_AUTHORIZATION_H */ @@ -658,7 +668,7 @@ diff -up cups-2.2.6/scheduler/client.h.lspp cups-2.2.6/scheduler/client.h /* * HTTP client structure... */ -@@ -65,6 +72,10 @@ struct cupsd_client_s +@@ -66,6 +73,10 @@ struct cupsd_client_s #ifdef HAVE_AUTHORIZATION_H AuthorizationRef authref; /* Authorization ref */ #endif /* HAVE_AUTHORIZATION_H */ @@ -669,7 +679,7 @@ diff -up cups-2.2.6/scheduler/client.h.lspp cups-2.2.6/scheduler/client.h }; #define HTTP(con) ((con)->http) -@@ -139,6 +150,10 @@ extern void cupsdStopListening(void); +@@ -138,6 +149,10 @@ extern void cupsdStopListening(void); extern void cupsdUpdateCGI(void); extern void cupsdWriteClient(cupsd_client_t *con); @@ -677,13 +687,14 @@ diff -up cups-2.2.6/scheduler/client.h.lspp cups-2.2.6/scheduler/client.h +extern uid_t client_pid_to_auid(pid_t clipid); +#endif /* WITH_LSPP */ + - #ifdef HAVE_SSL + #ifdef HAVE_TLS extern int cupsdEndTLS(cupsd_client_t *con); extern int cupsdStartTLS(cupsd_client_t *con); -diff -up cups-2.2.6/scheduler/conf.c.lspp cups-2.2.6/scheduler/conf.c ---- cups-2.2.6/scheduler/conf.c.lspp 2024-08-15 14:55:07.306818923 +0200 -+++ cups-2.2.6/scheduler/conf.c 2024-08-15 14:55:07.312818843 +0200 -@@ -40,6 +40,9 @@ +diff --git a/scheduler/conf.c b/scheduler/conf.c +index 0d4bb6a..88d67cf 100644 +--- a/scheduler/conf.c ++++ b/scheduler/conf.c +@@ -38,6 +38,9 @@ # define INADDR_NONE 0xffffffff #endif /* !INADDR_NONE */ @@ -693,7 +704,7 @@ diff -up cups-2.2.6/scheduler/conf.c.lspp cups-2.2.6/scheduler/conf.c /* * Configuration variable structure... -@@ -131,6 +134,10 @@ static const cupsd_var_t cupsd_vars[] = +@@ -129,6 +132,10 @@ static const cupsd_var_t cupsd_vars[] = { "ServerName", &ServerName, CUPSD_VARTYPE_STRING }, { "StrictConformance", &StrictConformance, CUPSD_VARTYPE_BOOLEAN }, { "Timeout", &Timeout, CUPSD_VARTYPE_TIME }, @@ -704,7 +715,7 @@ diff -up cups-2.2.6/scheduler/conf.c.lspp cups-2.2.6/scheduler/conf.c { "WebInterface", &WebInterface, CUPSD_VARTYPE_BOOLEAN } }; static const cupsd_var_t cupsfiles_vars[] = -@@ -544,6 +551,9 @@ cupsdReadConfiguration(void) +@@ -539,6 +546,9 @@ cupsdReadConfiguration(void) const char *tmpdir; /* TMPDIR environment variable */ struct stat tmpinfo; /* Temporary directory info */ cupsd_policy_t *p; /* Policy */ @@ -740,7 +751,7 @@ diff -up cups-2.2.6/scheduler/conf.c.lspp cups-2.2.6/scheduler/conf.c cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.", RemotePort ? "enabled" : "disabled"); -@@ -1277,7 +1306,19 @@ cupsdReadConfiguration(void) +@@ -1272,7 +1301,19 @@ cupsdReadConfiguration(void) cupsdClearString(&Classification); if (Classification) @@ -760,7 +771,7 @@ diff -up cups-2.2.6/scheduler/conf.c.lspp cups-2.2.6/scheduler/conf.c /* * Check the MaxClients setting, and then allocate memory for it... -@@ -3761,6 +3802,18 @@ read_location(cups_file_t *fp, /* I - C +@@ -3880,6 +3921,18 @@ read_location(cups_file_t *fp, /* I - Configuration file */ return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum); } @@ -779,12 +790,13 @@ diff -up cups-2.2.6/scheduler/conf.c.lspp cups-2.2.6/scheduler/conf.c /* * 'read_policy()' - Read a definition. -diff -up cups-2.2.6/scheduler/conf.h.lspp cups-2.2.6/scheduler/conf.h ---- cups-2.2.6/scheduler/conf.h.lspp 2024-08-15 14:55:07.250819672 +0200 -+++ cups-2.2.6/scheduler/conf.h 2024-08-15 14:55:07.312818843 +0200 -@@ -250,6 +250,13 @@ VAR char *ServerKeychain VALUE(NULL); +diff --git a/scheduler/conf.h b/scheduler/conf.h +index 2e5aac6..df22b07 100644 +--- a/scheduler/conf.h ++++ b/scheduler/conf.h +@@ -242,6 +242,13 @@ VAR char *ServerKeychain VALUE(NULL); /* Keychain holding cert + key */ - #endif /* HAVE_SSL */ + #endif /* HAVE_TLS */ +#ifdef WITH_LSPP +VAR int AuditLog VALUE(-1), @@ -796,7 +808,7 @@ diff -up cups-2.2.6/scheduler/conf.h.lspp cups-2.2.6/scheduler/conf.h #ifdef HAVE_ONDEMAND VAR int IdleExitTimeout VALUE(60); /* Time after which an idle cupsd will exit */ -@@ -268,6 +275,9 @@ VAR int HaveServerCreds VALUE(0); +@@ -260,6 +267,9 @@ VAR int HaveServerCreds VALUE(0); VAR gss_cred_id_t ServerCreds; /* Server's GSS credentials */ #endif /* HAVE_GSSAPI */ @@ -806,12 +818,22 @@ diff -up cups-2.2.6/scheduler/conf.h.lspp cups-2.2.6/scheduler/conf.h /* * Prototypes... -diff -up cups-2.2.6/scheduler/cupsd.h.lspp cups-2.2.6/scheduler/cupsd.h ---- cups-2.2.6/scheduler/cupsd.h.lspp 2024-08-15 14:55:07.298819030 +0200 -+++ cups-2.2.6/scheduler/cupsd.h 2024-08-15 14:55:07.312818843 +0200 -@@ -36,6 +36,14 @@ +diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h +index 164df6e..2d66464 100644 +--- a/scheduler/cupsd.h ++++ b/scheduler/cupsd.h +@@ -9,6 +9,8 @@ + * information. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + + /* + * Include necessary headers. +@@ -34,6 +36,14 @@ # include - #endif /* WIN32 */ + #endif /* _WIN32 */ +#include "config.h" +#ifdef WITH_LSPP @@ -824,18 +846,22 @@ diff -up cups-2.2.6/scheduler/cupsd.h.lspp cups-2.2.6/scheduler/cupsd.h #include "mime.h" #if defined(HAVE_CDSASSL) -@@ -248,4 +256,4 @@ extern void cupsdRunTimeout (cupsd_t - extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout, - const struct timeval *tv); - extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout); --#endif /* HAVE_AVAHI */ -\ No newline at end of file -+#endif /* HAVE_AVAHI */ -diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c ---- cups-2.2.6/scheduler/ipp.c.lspp 2024-08-15 14:55:07.268819431 +0200 -+++ cups-2.2.6/scheduler/ipp.c 2024-08-15 14:56:15.961900807 +0200 -@@ -37,6 +37,12 @@ extern int mbr_check_membership_by_id(uu - # endif /* HAVE_MEMBERSHIPPRIV_H */ +diff --git a/scheduler/ipp.c b/scheduler/ipp.c +index 67ee8ed..e7fa758 100644 +--- a/scheduler/ipp.c ++++ b/scheduler/ipp.c +@@ -12,6 +12,9 @@ + * information. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -28,6 +31,12 @@ extern int mbr_group_name_to_uuid(const char* name, uuid_t uu); + extern int mbr_check_membership_by_id(uuid_t user, gid_t group, int* ismember); #endif /* __APPLE__ */ +#ifdef WITH_LSPP @@ -847,7 +873,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c /* * Local functions... -@@ -61,6 +67,9 @@ static void cancel_all_jobs(cupsd_client +@@ -52,6 +61,9 @@ static void cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_subscription(cupsd_client_t *con, int id); static int check_rss_recipient(const char *recipient); @@ -857,7 +883,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); static void close_job(cupsd_client_t *con, ipp_attribute_t *uri); static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra, -@@ -1286,6 +1295,21 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1188,6 +1200,21 @@ add_job(cupsd_client_t *con, /* I - Client connection */ "time-at-creation", "time-at-processing" }; @@ -879,9 +905,9 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", -@@ -1607,6 +1631,106 @@ add_job(cupsd_client_t *con, /* I - Cl - return (NULL); - } +@@ -1516,6 +1543,106 @@ add_job(cupsd_client_t *con, /* I - Client connection */ + + attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME); +#ifdef WITH_LSPP + if (is_lspp_config()) @@ -986,7 +1012,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c if ((job = cupsdAddJob(priority, printer->name)) == NULL) { send_ipp_status(con, IPP_INTERNAL_ERROR, -@@ -1615,6 +1739,32 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1524,6 +1651,32 @@ add_job(cupsd_client_t *con, /* I - Client connection */ return (NULL); } @@ -1019,7 +1045,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE); job->attrs = con->request; job->dirty = 1; -@@ -1802,6 +1952,29 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1711,6 +1864,29 @@ add_job(cupsd_client_t *con, /* I - Client connection */ ippSetString(job->attrs, &attr, 0, printer->job_sheets[0]); ippSetString(job->attrs, &attr, 1, printer->job_sheets[1]); } @@ -1049,7 +1075,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c job->job_sheets = attr; -@@ -1832,6 +2005,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1741,6 +1917,9 @@ add_job(cupsd_client_t *con, /* I - Client connection */ "job-sheets=\"%s,none\", " "job-originating-user-name=\"%s\"", Classification, job->username); @@ -1059,7 +1085,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c } else if (attr->num_values == 2 && strcmp(attr->values[0].string.text, -@@ -1850,6 +2026,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1759,6 +1938,9 @@ add_job(cupsd_client_t *con, /* I - Client connection */ "job-originating-user-name=\"%s\"", attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -1069,7 +1095,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c } else if (strcmp(attr->values[0].string.text, Classification) && strcmp(attr->values[0].string.text, "none") && -@@ -1870,6 +2049,9 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1779,6 +1961,9 @@ add_job(cupsd_client_t *con, /* I - Client connection */ "job-originating-user-name=\"%s\"", attr->values[0].string.text, attr->values[1].string.text, job->username); @@ -1079,7 +1105,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c } } else if (strcmp(attr->values[0].string.text, Classification) && -@@ -1910,9 +2092,55 @@ add_job(cupsd_client_t *con, /* I - Cl +@@ -1819,9 +2004,55 @@ add_job(cupsd_client_t *con, /* I - Client connection */ "job-sheets=\"%s\", " "job-originating-user-name=\"%s\"", Classification, job->username); @@ -1135,7 +1161,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c /* * See if we need to add the starting sheet... */ -@@ -3694,6 +3922,128 @@ check_rss_recipient( +@@ -3647,6 +3878,128 @@ check_rss_recipient( } @@ -1264,7 +1290,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c /* * 'check_quotas()' - Check quotas for a printer and user. */ -@@ -4150,6 +4500,15 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4102,6 +4455,15 @@ copy_banner(cupsd_client_t *con, /* I - Client connection */ char attrname[255], /* Name of attribute */ *s; /* Pointer into name */ ipp_attribute_t *attr; /* Attribute */ @@ -1280,7 +1306,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -4185,6 +4544,85 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4137,6 +4499,85 @@ copy_banner(cupsd_client_t *con, /* I - Client connection */ fchmod(cupsFileNumber(out), 0640); fchown(cupsFileNumber(out), RunUser, Group); @@ -1366,7 +1392,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c /* * Try the localized banner file under the subdirectory... -@@ -4279,6 +4717,24 @@ copy_banner(cupsd_client_t *con, /* I - +@@ -4231,6 +4672,24 @@ copy_banner(cupsd_client_t *con, /* I - Client connection */ else s = attrname; @@ -1391,7 +1417,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c if (!strcmp(s, "printer-name")) { cupsFilePuts(out, job->dest); -@@ -6467,6 +6923,22 @@ get_job_attrs(cupsd_client_t *con, /* I +@@ -6681,6 +7140,22 @@ get_job_attrs(cupsd_client_t *con, /* I - Client connection */ exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username); @@ -1414,7 +1440,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c /* * Copy attributes... */ -@@ -6864,6 +7336,11 @@ get_jobs(cupsd_client_t *con, /* I - C +@@ -7079,6 +7554,11 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ if (username[0] && _cups_strcasecmp(username, job->username)) continue; @@ -1426,7 +1452,7 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c if (count > 0) ippAddSeparator(con->response); -@@ -11495,6 +11972,11 @@ validate_user(cupsd_job_t *job, /* I +@@ -11810,6 +12290,11 @@ validate_user(cupsd_job_t *job, /* I - Job */ strlcpy(username, get_username(con), userlen); @@ -1438,10 +1464,21 @@ diff -up cups-2.2.6/scheduler/ipp.c.lspp cups-2.2.6/scheduler/ipp.c /* * Check the username against the owner... */ -diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c ---- cups-2.2.6/scheduler/job.c.lspp 2024-08-15 14:55:07.278819298 +0200 -+++ cups-2.2.6/scheduler/job.c 2024-08-15 14:55:07.316818790 +0200 -@@ -26,6 +26,12 @@ +diff --git a/scheduler/job.c b/scheduler/job.c +index 822a247..2f952bc 100644 +--- a/scheduler/job.c ++++ b/scheduler/job.c +@@ -9,6 +9,9 @@ + * information. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -24,6 +27,12 @@ # endif /* HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H */ #endif /* __APPLE__ */ @@ -1454,10 +1491,10 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c /* * Design Notes for Job Management -@@ -547,6 +553,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I +@@ -544,6 +553,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ + /* PRINTER env variable */ + *printer_state_reasons = NULL; /* PRINTER_STATE_REASONS env var */ - rip_max_cache[255]; - /* RIP_MAX_CACHE env variable */ +#ifdef WITH_LSPP + char *audit_message = NULL; /* Audit message string */ + context_t jobcon; /* SELinux context of the job */ @@ -1469,7 +1506,7 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -1083,6 +1097,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I +@@ -1070,6 +1087,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ if (final_content_type[0]) envp[envc ++] = final_content_type; @@ -1537,7 +1574,7 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c if (Classification && !banner_page) { if ((attr = ippFindAttribute(job->attrs, "job-sheets", -@@ -1464,6 +1539,11 @@ cupsdDeleteJob(cupsd_job_t *job, / +@@ -1404,6 +1482,11 @@ cupsdDeleteJob(cupsd_job_t *job, /* I - Job */ cupsdClearString(&job->username); cupsdClearString(&job->dest); @@ -1549,8 +1586,8 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c for (i = 0; i < (int)(sizeof(job->auth_env) / sizeof(job->auth_env[0])); i ++) -@@ -1908,6 +1988,22 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J - ippSetString(job->attrs, &job->reasons, 0, "none"); +@@ -1856,6 +1939,22 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ + ippSetString(job->attrs, &job->reasons, 0, "job-completed-successfully"); } +#ifdef WITH_LSPP @@ -1572,7 +1609,7 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c job->impressions = ippFindAttribute(job->attrs, "job-impressions-completed", IPP_TAG_INTEGER); job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", IPP_TAG_INTEGER); job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); -@@ -2321,6 +2417,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -2268,6 +2367,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - Job */ { char filename[1024]; /* Job control filename */ cups_file_t *fp; /* Job file */ @@ -1587,7 +1624,7 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", -@@ -2343,6 +2447,78 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J +@@ -2290,6 +2397,78 @@ cupsdSaveJob(cupsd_job_t *job) /* I - Job */ fchown(cupsFileNumber(fp), RunUser, Group); @@ -1666,7 +1703,7 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c job->attrs->state = IPP_IDLE; if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, -@@ -3989,6 +4165,19 @@ get_options(cupsd_job_t *job, /* I - Jo +@@ -4020,6 +4199,19 @@ get_options(cupsd_job_t *job, /* I - Job */ banner_page) continue; @@ -1686,7 +1723,7 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c /* * Otherwise add them to the list... */ -@@ -4750,6 +4939,18 @@ start_job(cupsd_job_t *job, /* I - +@@ -4834,6 +5026,18 @@ start_job(cupsd_job_t *job, /* I - Job ID */ cupsd_printer_t *printer) /* I - Printer to print job */ { const char *filename; /* Support filename */ @@ -1705,7 +1742,7 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c ipp_attribute_t *cancel_after = ippFindAttribute(job->attrs, "job-cancel-after", IPP_TAG_INTEGER); -@@ -4926,6 +5127,113 @@ start_job(cupsd_job_t *job, /* I - +@@ -5022,6 +5226,113 @@ start_job(cupsd_job_t *job, /* I - Job ID */ fcntl(job->side_pipes[1], F_SETFD, fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC); @@ -1819,13 +1856,17 @@ diff -up cups-2.2.6/scheduler/job.c.lspp cups-2.2.6/scheduler/job.c /* * Now start the first file in the job... */ -diff -up cups-2.2.6/scheduler/job.h.lspp cups-2.2.6/scheduler/job.h ---- cups-2.2.6/scheduler/job.h.lspp 2017-11-01 15:57:53.000000000 +0100 -+++ cups-2.2.6/scheduler/job.h 2024-08-15 14:55:07.316818790 +0200 -@@ -11,6 +11,10 @@ - * missing or damaged, see the license at "http://www.cups.org/". +diff --git a/scheduler/job.h b/scheduler/job.h +index 619353d..310b66a 100644 +--- a/scheduler/job.h ++++ b/scheduler/job.h +@@ -8,6 +8,13 @@ + * Licensed under Apache License v2.0. See the file "LICENSE" for more information. */ ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ +#ifdef WITH_LSPP +#include +#endif /* WITH_LSPP */ @@ -1833,7 +1874,7 @@ diff -up cups-2.2.6/scheduler/job.h.lspp cups-2.2.6/scheduler/job.h /* * Constants... */ -@@ -88,6 +92,10 @@ struct cupsd_job_s /**** Job request * +@@ -85,6 +92,10 @@ struct cupsd_job_s /**** Job request ****/ int progress; /* Printing progress */ int num_keywords; /* Number of PPD keywords */ cups_option_t *keywords; /* PPD keywords */ @@ -1844,10 +1885,11 @@ diff -up cups-2.2.6/scheduler/job.h.lspp cups-2.2.6/scheduler/job.h }; typedef struct cupsd_joblog_s /**** Job log message ****/ -diff -up cups-2.2.6/scheduler/main.c.lspp cups-2.2.6/scheduler/main.c ---- cups-2.2.6/scheduler/main.c.lspp 2024-08-15 14:55:07.299819017 +0200 -+++ cups-2.2.6/scheduler/main.c 2024-08-15 14:55:07.316818790 +0200 -@@ -56,6 +56,9 @@ +diff --git a/scheduler/main.c b/scheduler/main.c +index ae2409e..21bd989 100644 +--- a/scheduler/main.c ++++ b/scheduler/main.c +@@ -58,6 +58,9 @@ # include #endif /* HAVE_SYS_PARAM_H */ @@ -1857,7 +1899,7 @@ diff -up cups-2.2.6/scheduler/main.c.lspp cups-2.2.6/scheduler/main.c /* * Local functions... -@@ -122,6 +125,9 @@ main(int argc, /* I - Number of comm +@@ -124,6 +127,9 @@ main(int argc, /* I - Number of command-line args */ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) struct sigaction action; /* Actions for POSIX signals */ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ @@ -1867,7 +1909,7 @@ diff -up cups-2.2.6/scheduler/main.c.lspp cups-2.2.6/scheduler/main.c #ifdef __APPLE__ int use_sysman = 1; /* Use system management functions? */ #else -@@ -508,6 +514,25 @@ main(int argc, /* I - Number of comm +@@ -494,6 +500,25 @@ main(int argc, /* I - Number of command-line args */ exit(errno); } @@ -1893,7 +1935,7 @@ diff -up cups-2.2.6/scheduler/main.c.lspp cups-2.2.6/scheduler/main.c /* * Let the system know we are busy while we bring up cupsd... */ -@@ -1219,6 +1244,11 @@ main(int argc, /* I - Number of comm +@@ -1203,6 +1228,11 @@ main(int argc, /* I - Number of command-line args */ cupsdStopSelect(); @@ -1905,10 +1947,20 @@ diff -up cups-2.2.6/scheduler/main.c.lspp cups-2.2.6/scheduler/main.c return (!stop_scheduler); } -diff -up cups-2.2.6/scheduler/printers.c.lspp cups-2.2.6/scheduler/printers.c ---- cups-2.2.6/scheduler/printers.c.lspp 2024-08-15 14:55:07.253819632 +0200 -+++ cups-2.2.6/scheduler/printers.c 2024-08-15 14:55:07.317818776 +0200 -@@ -35,6 +35,10 @@ +diff --git a/scheduler/printers.c b/scheduler/printers.c +index bf493a3..d06bd93 100644 +--- a/scheduler/printers.c ++++ b/scheduler/printers.c +@@ -9,6 +9,8 @@ + * information. + */ + ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -33,6 +35,10 @@ # include #endif /* __APPLE__ */ @@ -1919,7 +1971,7 @@ diff -up cups-2.2.6/scheduler/printers.c.lspp cups-2.2.6/scheduler/printers.c /* * Local functions... -@@ -2212,6 +2216,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) +@@ -2184,6 +2190,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ ipp_attribute_t *attr; /* Attribute data */ char *name, /* Current user/group name */ *filter; /* Current filter */ @@ -1932,8 +1984,8 @@ diff -up cups-2.2.6/scheduler/printers.c.lspp cups-2.2.6/scheduler/printers.c +#endif /* WITH_LSPP */ - DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, -@@ -2339,6 +2350,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) + /* +@@ -2309,6 +2322,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ attr->values[1].string.text = _cupsStrAlloc(Classification ? Classification : p->job_sheets[1]); } diff --git a/SOURCES/cups-multilib.patch b/cups-multilib.patch similarity index 52% rename from SOURCES/cups-multilib.patch rename to cups-multilib.patch index 3c6bc39..c8d5686 100644 --- a/SOURCES/cups-multilib.patch +++ b/cups-multilib.patch @@ -1,16 +1,14 @@ -diff -up cups-1.5b1/cups-config.in.multilib cups-1.5b1/cups-config.in ---- cups-1.5b1/cups-config.in.multilib 2010-06-16 02:48:25.000000000 +0200 -+++ cups-1.5b1/cups-config.in 2011-05-23 17:33:31.000000000 +0200 -@@ -22,8 +22,10 @@ prefix=@prefix@ +diff -up cups-2.3.0/cups-config.in.multilib cups-2.3.0/cups-config.in +--- cups-2.3.0/cups-config.in.multilib 2019-10-07 12:10:09.508859587 +0200 ++++ cups-2.3.0/cups-config.in 2019-10-07 12:11:56.614025934 +0200 +@@ -17,7 +17,9 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ includedir=@includedir@ -libdir=@libdir@ --imagelibdir=@libdir@ +# Fetch libdir from gnutls's pkg-config script. This is a bit +# of a cheat, but the cups-devel package requires gnutls-devel anyway. +libdir=`pkg-config --variable=libdir gnutls` -+imagelibdir=`pkg-config --variable=libdir gnutls` datarootdir=@datadir@ datadir=@datadir@ sysconfdir=@sysconfdir@ diff --git a/cups-no-export-ssllibs.patch b/cups-no-export-ssllibs.patch new file mode 100644 index 0000000..a0a9473 --- /dev/null +++ b/cups-no-export-ssllibs.patch @@ -0,0 +1,10 @@ +diff -up cups-2.2b2/config-scripts/cups-tls.m4.no-export-ssllibs cups-2.2b2/config-scripts/cups-tls.m4 +--- cups-2.2b2/config-scripts/cups-tls.m4.no-export-ssllibs 2016-06-27 15:06:22.299980753 +0200 ++++ cups-2.2b2/config-scripts/cups-tls.m4 2016-06-27 15:08:00.953154042 +0200 +@@ -102,5 +102,5 @@ AC_SUBST([IPPALIASES]) + AC_SUBST([TLSFLAGS]) + AC_SUBST([TLSLIBS]) + +-EXPORT_TLSLIBS="$TLSLIBS" ++EXPORT_TLSLIBS="" + AC_SUBST([EXPORT_TLSLIBS]) diff --git a/SOURCES/cups-uri-compat.patch b/cups-uri-compat.patch similarity index 100% rename from SOURCES/cups-uri-compat.patch rename to cups-uri-compat.patch diff --git a/SOURCES/cups-usb-paperout.patch b/cups-usb-paperout.patch similarity index 100% rename from SOURCES/cups-usb-paperout.patch rename to cups-usb-paperout.patch diff --git a/SOURCES/cups-web-devices-timeout.patch b/cups-web-devices-timeout.patch similarity index 100% rename from SOURCES/cups-web-devices-timeout.patch rename to cups-web-devices-timeout.patch diff --git a/SPECS/cups.spec b/cups.spec similarity index 77% rename from SPECS/cups.spec rename to cups.spec index fbf6b9c..c60a493 100644 --- a/SPECS/cups.spec +++ b/cups.spec @@ -21,214 +21,169 @@ Summary: CUPS printing system Name: cups Epoch: 1 -Version: 2.2.6 -Release: 62%{?dist} -License: GPLv2+ and LGPLv2 with exceptions and AML -Url: http://www.cups.org/ -Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz +Version: 2.4.10 +Release: 11%{?dist} +# backend/failover.c - BSD-3-Clause +# cups/md5* - Zlib +# scheduler/colorman.c - Apache-2.0 WITH LLVM-exception AND BSD-2-Clause +# * - Apache-2.0 WITH LLVM-exception +# the CUPS exception text is the same as LLVM exception, so using that name with +# agreement from legal team +# https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/message/A7GFSD6M3GYGSI32L2FC5KB22DUAEQI3/ +License: Apache-2.0 WITH LLVM-exception AND BSD-3-Clause AND Zlib AND BSD-2-Clause +Url: https://openprinting.github.io/cups/ +# Apple stopped uploading the new versions into github, use OpenPrinting fork +Source0: https://github.com/OpenPrinting/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz # Pixmap for desktop file -Source2: cupsprinter.png -# Logrotate configuration -Source6: cups.logrotate -# Backend for NCP protocol -Source7: ncp.backend -Source8: macros.cups -# CVE-2023-32360 migration script -Source9: upgrade_get_document.py.in +Source1: cupsprinter.png +# cups_serverbin macro definition for use during builds +Source2: macros.cups +# upgrade script for CUPS-Get-Document fix +# remove after Fedora 40 is EOL and C10S is released +Source3: upgrade_get_document.py.in -Patch1: cups-no-gzip-man.patch -Patch2: cups-system-auth.patch -Patch3: cups-multilib.patch -Patch5: cups-banners.patch -Patch6: cups-serverbin-compat.patch -Patch7: cups-no-export-ssllibs.patch -Patch8: cups-direct-usb.patch -Patch9: cups-lpr-help.patch -Patch10: cups-peercred.patch -Patch11: cups-pid.patch -Patch12: cups-eggcups.patch -Patch13: cups-driverd-timeout.patch -Patch14: cups-strict-ppd-line-length.patch -Patch15: cups-logrotate.patch -Patch16: cups-usb-paperout.patch -Patch17: cups-res_init.patch -Patch18: cups-filter-debug.patch -Patch19: cups-uri-compat.patch -Patch20: cups-str3382.patch -#Patch21: cups-0755.patch -Patch22: cups-hp-deviceid-oid.patch -Patch23: cups-dnssd-deviceid.patch -Patch24: cups-ricoh-deviceid-oid.patch -Patch25: cups-systemd-socket.patch -Patch27: cups-avahi-address.patch -Patch29: cups-dymo-deviceid.patch -Patch30: cups-freebind.patch -#Patch31: cups-no-gcry.patch -Patch33: cups-use-ipp1.1.patch -Patch34: cups-avahi-no-threaded.patch -Patch35: cups-ipp-multifile.patch -Patch36: cups-web-devices-timeout.patch -Patch37: cups-synconclose.patch -Patch38: cups-ypbind.patch -Patch39: cups-substitute-bad-attrs.patch -# 1607295 - CVE-2018-4180 CVE-2018-4181 CVE-2018-4182 CVE-2018-4183 cups: various flaws [rhel-8.0] -Patch40: 0001-Fix-local-privilege-escalation-to-root-and-sandbox-b.patch -# 1613173 - Remove weak SSL/TLS ciphers from CUPS -Patch41: 0001-Add-support-for-MinTLS-and-MaxTLS-options-Issue-5119.patch -# 1602469 - fixed covscan issues, backported from upstream -Patch42: 0001-Fix-memory-leaks-found-by-Coverity-Issue-5375.patch -# 1625899 - cups 2.2.6 lpr command fails against old cups 1.3.9 server -Patch43: 0001-Printing-to-old-CUPS-servers-has-been-fixed-Issue-52.patch -# 1625913 - ssl options aren't initialized when no SSLOptions directive is set in /etc/cups/client.conf -Patch44: 0001-Fix-default-TLS-versions.patch -# 1622431 - Jobs with multiple files don't complete when backend fails -Patch45: 0001-Fix-stuck-multi-file-jobs-Issue-5359-Issue-5413.patch -# CVE-2018-4700 cups: Predictable session cookie breaks CSRF protection [rhel-8] -Patch46: 0001-CVE-2018-4700-Linux-session-cookies-used-a-predictab.patch -# 1659486 - cupsd crash on startup in ippCopyAttribute -Patch47: 0001-The-scheduler-could-crash-while-adding-an-IPP-Everyw.patch -# 1677577 - Remove 'View X log' buttons from web ui -Patch48: 0001-Remove-web-log-buttons.patch -# 1650233 - cups uses md5 for hashing credentials sent through tls connection -Patch49: cups-fips-compliance.patch -# 1700663 - Stop advertising the HTTP methods that are supported -Patch50: cups-do-not-advertise-http-methods.patch -# 1774462, 1774463 - CVE-2019-8696, CVE-2019-8675 - buffer overflow in SNMP and IPP, -# memory disclosure and DoS in scheduler -Patch51: 0001-Multiple-security-disclosure-issues.patch -# 1775668 - cupsd eats a lot of memory when lots of queue with extensive PPDs are created -Patch52: cups-memory-consumption.patch -# 1784884 - cups.service doesn't execute automatically on request -Patch53: cups-autostart-when-enabled.patch -# 1825253 - CVE-2020-3898 cups: heap based buffer overflow in libcups's ppdFindOption() in ppd-mark.c -Patch54: cups-ppdopen-heap-overflow.patch -# 1838449 - ipp/socket backends connect to turned off device for eternity (contimeout is not applied) -Patch55: cups-etimedout.patch -# 1689207 - Add failover backend -Patch56: cups-failover-backend.patch -# 1833516 - DirtyCleanInterval ignored if there are open client connections -Patch57: cups-dirtyclean.patch -# 1775590 - rastertoepson filter crashes with paper size A6 -Patch58: cups-rastertoepson-crash.patch -# 1941437 - cupsd doesn't log job ids when logging into journal -Patch59: cups-logs.patch -# 1782216 - Print queue is paused after ipp backend ends with CUPS_BACKEND_STOP -Patch60: cups-validate-1st.patch -# 1938384 - CUPS doesn't start if sssd starts after cupsd -Patch61: cups-sssd.patch -# 1955964 - PreserveJobHistory doesn't work with seconds -Patch62: cups-fix-preservejob-times.patch -# 1927452 - CVE-2020-10001 cups: access to uninitialized buffer in ipp.c [rhel-8] -Patch63: cups-cve202010001.patch -# 2006987 - Unauthenticated users can't move print jobs in Web UI -Patch64: 0001-cgi-bin-ipp-var.c-Use-guest-user-for-Move-Job-when-n.patch -# 2017919 - Setting 'MaxJobTime 0' does not set a job time to unlimited -Patch65: 0001-Fix-handling-of-MaxJobTime-0-Issue-5438.patch -# 1726383 - "lpadmin -p -o cupsSNMPSupplies:false" doesn't work -Patch66: 0001-Fix-lpadmin-with-cupsIPPSupplies-and-cupsSNMPSupplie.patch -# 1982891 - Printing of banner before PCL file only prints banner -Patch67: 0001-scheduler-job.c-use-gziptoany-for-raw-files-not-just.patch -# 2006591 - Trying to restart and hold a job doesn't work -Patch68: cups-restart-job-hold-until.patch -# 1811716 - lpr to non-existent printer reports incorrect error -Patch69: 0001-cups-dests.c-cupsGetNamedDest-set-IPP_STATUS_ERROR_N.patch -# 2015182 - RFE: Implement IdleExitTimeout configuration during build -Patch70: 0001-Add-with-idle-exit-timeout-configure-option.patch -# 2013865 - RFE: Implement TimeoutStartSec configuration during build -Patch71: 0001-Add-with-systemd-timeoutstartsec-configure-option.patch -# 2032965 - [RFE] RHEL8 - CUPS Web UI supports adding IPP Everywhere -Patch72: cups-ippeve-web-support.patch -# 2071417 - 30-second delays printing to Windows 2016 server via HTTPS -Patch73: 0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch -# 2074684 - lp to a remote server takes a long time -Patch74: 0001-Use-cupsGetNamedDest-for-legacy-printing-APIs-Issue-.patch -# 2074736 - CUPS is too chatty about "Removing document files." in debug mode -Patch75: cups-cupsd-too-chatty.patch -# CVE-2022-26691 cups: authorization bypass when using "local" authorization -Patch76: 0001-scheduler-cert.c-Fix-string-comparison-fixes-CVE-202.patch -# 2084257 - ErrorPolicy documentation is incorrect -Patch77: cups-retry-current-job-man.patch -# 1910415 - manpage update to acknowledge order dependency of -h option -Patch78: 0001-Update-man-pages-for-h-option-Issue-357.patch -# 2130391 - Kerberized IPP Printing Fails -Patch79: cups-kerberos.patch -# 2217178 - Delays printing to lpd when reserved ports are exhausted -Patch80: 0001-Fix-delays-printing-to-lpd-when-reserved-ports-are-e.patch -# 2217283 - The command "cancel -x " does not remove job files -Patch81: 0001-Use-purge-job-instead-of-purge-jobs-when-canceling-a.patch -# 2217955 - Enlarge backlog queue for listen() in cupsd -Patch82: 0001-cups-http-addr.c-Set-listen-backlog-size-to-INT_MAX-.patch -# CVE-2023-34241 cups: use-after-free in cupsdAcceptClient() in scheduler/client.c -Patch83: 0001-Log-result-of-httpGetHostname-BEFORE-closing-the-con.patch -# CVE-2023-32324 cups: heap buffer overflow may lead to DoS -Patch84: 0001-cups-strlcpy-handle-zero-size.patch -# CVE-2023-32360 cups: Information leak through Cups-Get-Document operation -Patch85: 0001-Require-authentication-for-CUPS-Get-Document.patch -# RHEL-14933 cupsd memory leak in cupsdDeleteJob() with "PreserveJobHistory Off" -Patch86: cups-preservejob-leak.patch -# RHEL-15309 cupsd fails to open cups-files.conf and the resulting error message is lost -Patch87: 0001-scheduler-conf.c-Print-to-stderr-if-we-don-t-open-cu.patch -# RHEL-10702 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents -Patch88: 0001-httpAddrConnect2-Check-for-error-if-POLLHUP-is-in-va.patch -# RHEL-40386 CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777 -# https://github.com/OpenPrinting/cups/commit/a436956 -Patch89: 0001-Fix-domain-socket-handling.patch -# RHEL-40386 CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777 -# https://github.com/OpenPrinting/cups/pull/31 -Patch90: cups-require-cups-socket.patch -# RHEL-40386 CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777 -# https://github.com/OpenPrinting/cups/commit/3448c52 -Patch91: cups-socket-remove-on-stop.patch -# RHEL-40386 CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777 -# https://github.com/OpenPrinting/cups/commit/7adb508 -# https://github.com/OpenPrinting/cups/commit/824f49f -# https://github.com/OpenPrinting/cups/commit/56b9728 -# https://github.com/OpenPrinting/cups/commit/74f437b -# https://github.com/OpenPrinting/cups/commit/fb0c914 -Patch92: cups-check-for-listeners.patch -# RHEL-60338 CVE-2024-47175 cups: remote command injection via attacker controlled data in PPD file -Patch93: 0001-mirror-ipp-everywhere-printer-changes-from-master.patch -Patch94: 0001-refactor-make-and-model-code.patch -Patch95: 0001-ppdize-preset-and-template-names.patch -Patch96: 0001-Fix-make-and-model-whitespace-trimming-Issue-1096.patch +# cups-config from devel package conflicted on multilib arches, +# fixed hack with pkg-config calling for gnutls' libdir variable +Patch1: cups-multilib.patch +# if someone makes a change to banner files, then there will .rpmnew +# with next update of cups-filters - this patch makes sure the banner file +# changed by user is used and .rpmnew or .rpmsave is ignored +# Note: This could be rewrite with use a kind of #define and send to upstream +Patch2: cups-banners.patch +# don't export ssl libs to cups-config - can't find the reason. +Patch3: cups-no-export-ssllibs.patch +# enables old uri usb:/dev/usb/lp0 - leave it here for users of old printers +Patch4: cups-direct-usb.patch +# when system workload is high, timeout for cups-driverd can be reached - +# increase the timeout +Patch5: cups-driverd-timeout.patch +# usb backend didn't get any notification about out-of-paper because of kernel +Patch6: cups-usb-paperout.patch +# uri compatibility with old Fedoras +Patch7: cups-uri-compat.patch +# use IP_FREEBIND, because cupsd cannot bind to not yet existing IP address +# by default +Patch8: cups-freebind.patch +# add support of multifile +Patch9: cups-ipp-multifile.patch +# prolongs web ui timeout +Patch10: cups-web-devices-timeout.patch +# failover backend for implementing failover functionality +# TODO: move it to the cups-filters upstream +Patch11: cups-failover-backend.patch +# add device id for dymo printer +Patch12: cups-dymo-deviceid.patch -Patch1000: cups-lspp.patch +%if %{lspp} +# selinux and audit enablement for CUPS - needs work and CUPS upstream wants +# to have these features implemented their way in the future +Patch100: cups-lspp.patch +%endif -Requires: %{name}-filesystem = %{epoch}:%{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-client%{?_isa} = %{epoch}:%{version}-%{release} +#### UPSTREAM PATCHES (starts with 1000) #### +# RHEL-49449 Fix checkbox support in web ui +Patch1000: 0001-cgi-Fix-checkbox-support-fixes-1008.patch +# RHEL-49447 Fix garbage uri when adding discovered print in web ui +Patch1001: cups-fix-device-uri-in-webui.patch +# RHEL-54345 Creating IPP Everywhere printer fails due race condition +Patch1002: 0001-Fix-IPP-everywhere-printer-setup-Issue-1033.patch +# RHEL-54579 [rhel-10] Do not look into /root/.cups/lpoptions when using cupsGetNamedDest as root +Patch1003: 0001-dest.c-Don-t-look-for-user-config-in-cupsGetNamedDes.patch +# RHEL-45525 cups-2.4.10-2.el10: RHEL SAST Automation: address 1 High impact true positive(s) +Patch1004: 0001-Fix-Coverity-discovered-issues.patch +# RHEL-60354 CVE-2024-47175 cups: remote command injection via attacker controlled data in PPD file +Patch1005: 0001-mirror-ipp-everywhere-printer-changes-from-master.patch +Patch1006: 0001-refactor-make-and-model-code.patch +Patch1007: 0001-ppdize-preset-and-template-names.patch +Patch1008: 0001-quote-ppd-localized-strings.patch +Patch1009: 0001-fix-warnings-for-unused-vars.patch +Patch1010: 0001-Fix-make-and-model-whitespace-trimming-Issue-1096.patch +# RHEL-69638 IPP Everywhere permanent queue is not removed if PPD generation fails +Patch1011: 0001-scheduler-Clean-up-failed-IPP-Everywhere-permanent-q.patch +# RHEL-68415 Inability to disable weak ciphers in CUPS configuration: +# 0001-tls-gnutls.c-Use-system-crypto-policy-if-available.patch +# 0001-Add-NoSystem-SSLOptions-value.patch +Patch1012: 0001-tls-gnutls.c-Use-system-crypto-policy-if-available.patch +Patch1013: 0001-Add-NoSystem-SSLOptions-value.patch + + +##### Patches removed because IMHO they aren't no longer needed +##### but still I'll leave them in git in case their removal +##### breaks something. -Provides: cupsddk cupsddk-drivers -BuildRequires: pam-devel pkgconf-pkg-config -BuildRequires: pkgconfig(gnutls) -BuildRequires: libacl-devel -BuildRequires: openldap-devel -BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: krb5-devel -BuildRequires: pkgconfig(avahi-client) -BuildRequires: systemd -BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(dbus-1) BuildRequires: automake -# for decompressing functions when reading from a gzipped file -BuildRequires: zlib-devel - # gcc and gcc-c++ is no longer in buildroot by default # gcc for most of files BuildRequires: gcc # gcc-c++ for ppdc and cups-driverd Buildrequires: gcc-c++ - +BuildRequires: krb5-devel +BuildRequires: libacl-devel +# make is used for compilation +BuildRequires: make +BuildRequires: openldap-devel +BuildRequires: pam-devel +BuildRequires: pkgconf-pkg-config +BuildRequires: pkgconfig(avahi-client) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libusb-1.0) # Make sure we get postscriptdriver tags. BuildRequires: python3-cups +BuildRequires: systemd +# needed for systemd rpm macros according FPG +BuildRequires: systemd-rpm-macros +# needed for decompressing functions when reading from gzipped ppds +BuildRequires: zlib-devel %if %{lspp} BuildRequires: libselinux-devel BuildRequires: audit-libs-devel %endif +# /etc/cups/ssl and /etc/cups were moved from main package to filesystem package +# remove once CentOS Stream 10 is released +Conflicts: %{name}-filesystem < 1:2.4.10-7 +# ippfind manpage was moved to cups-ipptool +# remove once C10S is released +Conflicts: %{name}-ipptool < 1:2.4.3-1 + +# getaddrinfo from glibc needs nss-mdns or systemd-resolved for resolving +# mdns .local addresses. Don't require a specific package for now and let +# the user to decide what to use +# just recommend nss-mdns for Fedora for now to have working default, but +# don't hardwire it for resolved users +%if 0%{?fedora} +Recommends: nss-mdns +%endif +# avahi is needed for mDNS discovery and sharing queues +Recommends: avahi +%if 0%{?fedora} >= 38 || 0%{?rhel} >= 9 +# for better migration - cups-browsed was part of cups-filters in the past, +# now it was splitted and no longer depends on cups-filters - the daemon will +# vanish during upgrade without a weak dependency at least +# remove once C10X is released +Recommends: cups-browsed +# for IPP-over-USB device support +Recommends: ipp-usb +%endif + +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 9 +# driverless stuff was splitted from cups-filters +Recommends: cups-filters-driverless +%endif + +# We ship udev rules which use setfacl. +Requires: acl +Requires: %{name}-client%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-filesystem = %{epoch}:%{version}-%{release} +# Make sure we have some filters for converting to raster format. +Requires: cups-filters +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: dbus +Requires: systemd # Requires working PrivateTmp (bug #807672) Requires(pre): systemd @@ -237,19 +192,12 @@ Requires(post): grep, sed Requires(preun): systemd Requires(postun): systemd -# for upgrade-get-document script +# for upgrade-get-document script - remove after C10S is released and F40 is EOL Requires(post): %{__python} -# We ship udev rules which use setfacl. -Requires: systemd -Requires: acl - -# Make sure we have some filters for converting to raster format. -Requires: cups-filters %package client Summary: CUPS printing system - client programs -License: GPLv2 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %if %{use_alternatives} Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat @@ -259,20 +207,23 @@ Provides: lpr %package devel Summary: CUPS printing system - development environment -License: LGPLv2 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: gnutls-devel Requires: krb5-devel +Requires: pkgconf-pkg-config Requires: zlib-devel -Provides: cupsddk-devel %package libs Summary: CUPS printing system - libraries -License: LGPLv2 and zlib +Requires: %{name}-filesystem = %{epoch}:%{version}-%{release} %package filesystem Summary: CUPS printing system - directory layout BuildArch: noarch +# /etc/cups/ssl and /etc/cups were moved from main package to filesystem package +# remove once CentOS Stream 10 is released +Conflicts: %{name} < 1:2.4.10-7 + %package lpd Summary: CUPS printing system - lpd emulation @@ -282,7 +233,34 @@ Provides: lpd %package ipptool Summary: CUPS printing system - tool for performing IPP requests +# ippfind manpage was moved to cups-ipptool +# remove once C10S is released +Conflicts: %{name} < 1:2.4.3-1 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +# ippfind needs avahi for printer discovery +Requires: avahi +# mdns address resolver (nss-mdns or systemd-resolved) is needed too, +# but don't require a specific package for now and let the user to choose +# what to use +# just recommend nss-mdns for Fedora for now to have working default, but +# don't hardwire it for resolved users +%if 0%{?fedora} +Recommends: nss-mdns +%endif + +%package printerapp +Summary: CUPS printing system - tools for printer application +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +# ippeveprinter needs avahi for registering and sharing printer +Requires: avahi +# mdns address resolver (nss-mdns or systemd-resolved) is needed too, +# but don't require a specific package for now and let the user to choose +# what to use +# just recommend nss-mdns for Fedora for now to have working default, but +# don't hardwire it for resolved users +%if 0%{?fedora} +Recommends: nss-mdns +%endif %description CUPS printing system provides a portable printing layer for @@ -321,265 +299,127 @@ lpd emulation. %description ipptool Sends IPP requests to the specified URI and tests and/or displays the results. +%description printerapp +Provides IPP everywhere printer application ippeveprinter and tools for printing +PostScript and HP PCL document formats - ippevepcl and ippeveps. The printer +application enables older printers for IPP everywhere standard - so if older printer +is installed with a printer application, its print queue acts as IPP everywhere printer +to CUPS daemon. This solution will substitute printer drivers and raw queues in the future. + %prep %setup -q -n cups-%{VERSION} -# Don't gzip man pages in the Makefile, let rpmbuild do it. -%patch1 -p1 -b .no-gzip-man -# Use the system pam configuration. -%patch2 -p1 -b .system-auth # Prevent multilib conflict in cups-config script. -%patch3 -p1 -b .multilib +%patch -P 1 -p1 -b .multilib # Ignore rpm save/new files in the banners directory. -%patch5 -p1 -b .banners -# Use compatibility fallback path for ServerBin. -%patch6 -p1 -b .serverbin-compat +%patch -P 2 -p1 -b .banners # Don't export SSLLIBS to cups-config. -%patch7 -p1 -b .no-export-ssllibs +%patch -P 3 -p1 -b .no-export-ssllibs # Allow file-based usb device URIs. -%patch8 -p1 -b .direct-usb -# Add --help option to lpr. -%patch9 -p1 -b .lpr-help -# Fix compilation of peer credentials support. -%patch10 -p1 -b .peercred -# Maintain a cupsd.pid file. -%patch11 -p1 -b .pid -# Fix implementation of com.redhat.PrinterSpooler D-Bus object. -%patch12 -p1 -b .eggcups +%patch -P 4 -p1 -b .direct-usb # Increase driverd timeout to 70s to accommodate foomatic (bug #744715). -%patch13 -p1 -b .driverd-timeout -# Only enforce maximum PPD line length when in strict mode. -%patch14 -p1 -b .strict-ppd-line-length -# Re-open the log if it has been logrotated under us. -%patch15 -p1 -b .logrotate +%patch -P 5 -p1 -b .driverd-timeout # Support for errno==ENOSPACE-based USB paper-out reporting. -%patch16 -p1 -b .usb-paperout -# Re-initialise the resolver on failure in httpAddrGetList() (bug #567353). -%patch17 -p1 -b .res_init -# Log extra debugging information if no filters are available. -%patch18 -p1 -b .filter-debug +%patch -P 6 -p1 -b .usb-paperout # Allow the usb backend to understand old-style URI formats. -%patch19 -p1 -b .uri-compat -# Fix temporary filename creation. -%patch20 -p1 -b .str3382 -# Use mode 0755 for binaries and libraries where appropriate. -#%%patch21 -p1 -b .0755 -# Add an SNMP query for HP's device ID OID (STR #3552). -%patch22 -p1 -b .hp-deviceid-oid -# Mark DNS-SD Device IDs that have been guessed at with "FZY:1;". -%patch23 -p1 -b .dnssd-deviceid -# Add an SNMP query for Ricoh's device ID OID (STR #3552). -%patch24 -p1 -b .ricoh-deviceid-oid -# Make cups.service Type=notify (bug #1088918). -%patch25 -p1 -b .systemd-socket -# Use IP address when resolving DNSSD URIs (bug #948288). -%patch27 -p1 -b .avahi-address -# Added IEEE 1284 Device ID for a Dymo device (bug #747866). -%patch29 -p1 -b .dymo-deviceid +%patch -P 7 -p1 -b .uri-compat # Use IP_FREEBIND socket option when binding listening sockets (bug #970809). -%patch30 -p1 -b .freebind -# Don't link against libgcrypt needlessly. -#%%patch31 -p1 -b .no-gcry -# Default to IPP/1.1 for now (bug #977813). -%patch33 -p1 -b .use-ipp1.1 -# Don't use D-Bus from two threads (bug #979748). -%patch34 -p1 -b .avahi-no-threaded +%patch -P 8 -p1 -b .freebind # Fixes for jobs with multiple files and multiple formats. -%patch35 -p1 -b .ipp-multifile +%patch -P 9 -p1 -b .ipp-multifile # Increase web interface get-devices timeout to 10s (bug #996664). -%patch36 -p1 -b .web-devices-timeout -# Set the default for SyncOnClose to Yes. -%patch37 -p1 -b .synconclose -# CUPS may fail to start if NIS groups are used (bug #1494558) -%patch38 -p1 -b .ypbind +%patch -P 10 -p1 -b .web-devices-timeout +# Add failover backend (bug #1689209) +%patch -P 11 -p1 -b .failover +# Added IEEE 1284 Device ID for a Dymo device (bug #747866). +%patch -P 12 -p1 -b .dymo-deviceid %if %{lspp} # LSPP support. -%patch1000 -p1 -b .lspp +%patch -P 100 -p1 -b .lspp %endif -# substitute default values for invalid job attributes (upstream #5186 and #5229) -%patch39 -p1 -b .substitute-bad-attrs -# 1607295 - CVE-2018-4180 CVE-2018-4181 CVE-2018-4182 CVE-2018-4183 cups: various flaws [rhel-8.0] -%patch40 -p1 -b .privilege-escalation -# 1613173 - Remove weak SSL/TLS ciphers from CUPS -%patch41 -p1 -b .remove-weak-ciphers -# 1602469 - fixed covscan issues, backported from upstream -%patch42 -p1 -b .covscan -# 1625899 - cups 2.2.6 lpr command fails against old cups 1.3.9 server -%patch43 -p1 -b .oldcupsservers -# 1625913 - ssl options aren't initialized when no SSLOptions directive is set in /etc/cups/client.conf -%patch44 -p1 -b .defaulttls -# 1622431 - Jobs with multiple files don't complete when backend fails -%patch45 -p1 -b .multifile-stuck -# CVE-2018-4700 cups: Predictable session cookie breaks CSRF protection [rhel-8] -%patch46 -p1 -b .predictable-cookie -# 1659486 - cupsd crash on startup in ippCopyAttribute -%patch47 -p1 -b .ippeve-crash -# 1677577 - Remove 'View X log' buttons from web ui -%patch48 -p1 -b .rm-webui-buttons -# 1650233 - cups uses md5 for hashing credentials sent through tls connection -%patch49 -p1 -b .fips-compliance -# 1700663 - Stop advertising the HTTP methods that are supported -%patch50 -p1 -b .do-not-advertise-http-methods -# 1774462, 1774463 - CVE-2019-8696, CVE-2019-8675 - buffer overflow in SNMP and IPP, -# memory disclosure and DoS in scheduler -%patch51 -p1 -b .cve-in-scheduler -# 1775668 - cupsd eats a lot of memory when lots of queue with extensive PPDs are created -%patch52 -p1 -b .memory-consumption -# 1784884 - cups.service doesn't execute automatically on request -%patch53 -p1 -b .autostart-when-enabled -# 1825253 - CVE-2020-3898 cups: heap based buffer overflow in libcups's ppdFindOption() in ppd-mark.c -%patch54 -p1 -b .ppdopen-heap-overflow -# 1838449 - ipp/socket backends connect to turned off device for eternity (contimeout is not applied) -%patch55 -p1 -b .etimedout -# 1689207 - Add failover backend -%patch56 -p1 -b .failover -# 1833516 - DirtyCleanInterval ignored if there are open client connections -%patch57 -p1 -b .dirtyclean -# 1775590 - rastertoepson filter crashes with paper size A6 -%patch58 -p1 -b .rastertoepson-crash -# 1941437 - cupsd doesn't log job ids when logging into journal -%patch59 -p1 -b .logs -# 1782216 - Print queue is paused after ipp backend ends with CUPS_BACKEND_STOP -%patch60 -p1 -b .validate-1st -# 1938384 - CUPS doesn't start if sssd starts after cupsd -%patch61 -p1 -b .sssd -# 1955964 - PreserveJobHistory doesn't work with seconds -%patch62 -p1 -b .cups-fix-preservejob-times -# 1927452 - CVE-2020-10001 cups: access to uninitialized buffer in ipp.c [rhel-8] -%patch63 -p1 -b .cve202010001 -# 2006987 - Unauthenticated users can't move print jobs in Web UI -%patch64 -p1 -b .move-job -# 2017919 - Setting 'MaxJobTime 0' does not set a job time to unlimited -%patch65 -p1 -b .maxjobtime -# 1726383 - "lpadmin -p -o cupsSNMPSupplies:false" doesn't work -%patch66 -p1 -b .supplies -# 1982891 - Printing of banner before PCL file only prints banner -%patch67 -p1 -b .banner-rawfiles -# 2006591 - Trying to restart and hold a job doesn't work -%patch68 -p1 -b .restart-hold-job -# 1811716 - lpr to non-existent printer reports incorrect error -%patch69 -p1 -b .lplpr-better-error -# 2015182 - RFE: Implement IdleExitTimeout configuration during build -%patch70 -p1 -b .idleexittimeout -# 2013865 - RFE: Implement TimeoutStartSec configuration during build -%patch71 -p1 -b .timeoutstartsec -# 2032965 - [RFE] RHEL8 - CUPS Web UI supports adding IPP Everywhere -%patch72 -p1 -b .ippeve-web-support -# 2071417 - 30-second delays printing to Windows 2016 server via HTTPS -%patch73 -p1 -b .gnutlsbye -# 2074684 - lp to a remote server takes a long time -%patch74 -p1 -b .lp-long-time -# 2074736 - CUPS is too chatty about "Removing document files." in debug mode -%patch75 -p1 -b .cupsd-too-chatty -# CVE-2022-26691 cups: authorization bypass when using "local" authorization -%patch76 -p1 -b .cve26691 -# 2084257 - ErrorPolicy documentation is incorrect -%patch77 -p1 -b .retry-current-job-man -# 1910415 - manpage update to acknowledge order dependency of -h option -%patch78 -p1 -b .manpage-update -# 2130391 - Kerberized IPP Printing Fails -%patch79 -p1 -b .kerberos -# 2217178 - Delays printing to lpd when reserved ports are exhausted -%patch80 -p1 -b .lpd-delay -# 2217283 - The command "cancel -x " does not remove job files -%patch81 -p1 -b .purge-job -# 2217955 - Enlarge backlog queue for listen() in cupsd -%patch82 -p1 -b .listen-backlog -# CVE-2023-34241 cups: use-after-free in cupsdAcceptClient() in scheduler/client.c -%patch83 -p1 -b .cve34241 -# CVE-2023-32324 cups: heap buffer overflow may lead to DoS -%patch84 -p1 -b .cve32324 -# CVE-2023-32360 cups: Information leak through Cups-Get-Document operation -%patch85 -p1 -b .get-document-auth -# RHEL-14933 cupsd memory leak in cupsdDeleteJob() with "PreserveJobHistory Off" -%patch86 -p1 -b .preservejob-leak -# RHEL-15309 cupsd fails to open cups-files.conf and the resulting error message is lost -%patch87 -p1 -b .message-stderr -# RHEL-10702 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents -%patch88 -p1 -b .cupsgetjobs-pollhup -# RHEL-40386 CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777 -# https://github.com/OpenPrinting/cups/commit/a436956 -%patch89 -p1 -b .cve2024-35235 -# RHEL-40386 CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777 -# https://github.com/OpenPrinting/cups/pull/31 -%patch90 -p1 -b .cups-require-cups-socket -# RHEL-40386 CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777 -# https://github.com/OpenPrinting/cups/commit/3448c52 -%patch91 -p1 -b .cups-remove-on-stop -# RHEL-40386 CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777 -# https://github.com/OpenPrinting/cups/commit/7adb508 -# https://github.com/OpenPrinting/cups/commit/824f49f -# https://github.com/OpenPrinting/cups/commit/56b9728 -# https://github.com/OpenPrinting/cups/commit/74f437b -# https://github.com/OpenPrinting/cups/commit/fb0c914 -%patch92 -p1 -b .cups-check-for-listeners -# RHEL-60338 CVE-2024-47175 cups: remote command injection via attacker controlled data in PPD file -%patch93 -p1 -b .ippeve-validate -%patch94 -p1 -b .make-model-refact -%patch95 -p1 -b .ppdize-presets -%patch96 -p1 -b .make-model-trim +# UPSTREAM PATCHES +# RHEL-49449 Fix checkbox support in web ui +%patch -P 1000 -p1 -b .cgi-checkbox +# RHEL-49447 Fix garbage uri when adding discovered print in web ui +%patch -P 1001 -p1 -b .device-uri-webui +# RHEL-54345 Creating IPP Everywhere printer fails due race condition +%patch -P 1002 -p1 -b .fix-ippeve-thread-uri +# RHEL-54579 [rhel-10] Do not look into /root/.cups/lpoptions when using cupsGetNamedDest as root +%patch -P 1003 -p1 -b .root-cupsgetnameddest +# RHEL-45525 cups-2.4.10-2.el10: RHEL SAST Automation: address 1 High impact true positive(s) +%patch -P 1004 -p1 -b .sast-fix +# RHEL-60354 CVE-2024-47175 cups: remote command injection via attacker controlled data in PPD file +%patch -P 1005 -p1 -b .ipp-everywhere +%patch -P 1006 -p1 -b .refactor-make-model +%patch -P 1007 -p1 -b .ppdize-preset +%patch -P 1008 -p1 -b .quote-ppd-strings +%patch -P 1009 -p1 -b .unused-vars +%patch -P 1010 -p1 -b .trim-make-model +# RHEL-69638 IPP Everywhere permanent queue is not removed if PPD generation fails +%patch -P 1011 -p1 -b .clean-failed-eve +# RHEL-68415 Inability to disable weak ciphers in CUPS configuration +%patch -P 1012 -p1 -b .tls-system-policy +# give a way how to opt-out from crypto policy +%patch -P 1013 -p1 -b .nosystem-ssloption -sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in - # Log to the system journal by default (bug #1078781, bug #1519331). sed -i -e 's,^ErrorLog .*$,ErrorLog syslog,' conf/cups-files.conf.in sed -i -e 's,^AccessLog .*$,AccessLog syslog,' conf/cups-files.conf.in -sed -i -e 's,^PageLog .*$,PageLog syslog,' conf/cups-files.conf.in - -# Add comment text mentioning syslog is systemd journal (bug #1358589) -sed -i -e 's,\"syslog\",\"syslog\" \(syslog means systemd journal by default\),' conf/cups-files.conf.in - -# Add group wheel to SystemGroups (bug #1405669) -sed -i -e 's,^SystemGroup .*$, SystemGroup sys root wheel,' conf/cups-files.conf.in +sed -i -e 's,^PageLog .*,PageLog syslog,' conf/cups-files.conf.in # Let's look at the compilation command lines. perl -pi -e "s,^.SILENT:,," Makedefs.in -f=CREDITS.md -mv "$f" "$f"~ -iconv -f MACINTOSH -t UTF-8 "$f"~ > "$f" -rm -f "$f"~ - +# remove this once we don't have any patches changing configure stuff aclocal -I config-scripts -autoconf -I config-scripts +autoconf -f -I config-scripts %build +# cups can use different compiler if it is installed, so set to GCC for to be sure +export CC=%{__cc} +export CXX=%{__cxx} # add Fedora specific flags to DSOFLAGS -export DSOFLAGS="$DSOFLAGS -L../cgi-bin -L../filter -L../ppdc -L../scheduler -Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,-z,relro,-z,now -fPIE -pie" -export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1" -export CC=gcc -export CXX=g++ +export DSOFLAGS="$DSOFLAGS $RPM_LD_FLAGS" +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DLDAP_DEPRECATED=1" +export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DLDAP_DEPRECATED=1" # --enable-debug to avoid stripping binaries -%configure --with-docdir=%{_datadir}/%{name}/www --enable-debug \ +%configure --with-docdir=%{_datadir}/%{name}/www \ + --enable-debug \ + --enable-gssapi \ %if %{lspp} - --enable-lspp \ + --enable-lspp \ %endif - --with-exe-file-perm=0755 \ - --with-cupsd-file-perm=0755 \ - --with-log-file-perm=0600 \ - --enable-relro \ - --with-dbusdir=%{_sysconfdir}/dbus-1 \ - --with-php=/usr/bin/php-cgi \ - --enable-avahi \ - --enable-threads \ - --enable-gnutls \ - --enable-webif \ - --with-xinetd=no \ - --with-access-log-level=actions \ - --enable-page-logging \ + --enable-page-logging \ + --enable-relro \ + --enable-sync-on-close \ + --enable-webif \ + --with-access-log-level=actions \ + --with-cupsd-file-perm=0755 \ + --with-dbusdir=%{_sysconfdir}/dbus-1 \ + --with-dnssd=avahi \ + --with-log-file-perm=0600 \ + --with-ondemand=systemd \ + --with-pkgconfpath=%{_libdir}/pkgconfig \ + --with-rundir=%{_rundir}/cups \ + --with-tls=gnutls \ + --with-xinetd=no \ %if 0%{?rhel} --without-idle-exit-timeout \ --without-systemd-timeoutstartsec \ %endif - localedir=%{_datadir}/locale + --localedir=%{_datadir}/locale # If we got this far, all prerequisite libraries must be here. -make %{?_smp_mflags} +%make_build %install -make BUILDROOT=%{buildroot} install +# %%make_install macro results into permission error during install phase, +# because it sets INSTALL env to 'install -p'. +# use the old make invocation for now, fix this upstream when upstream will +# have a time for github issues +make install DESTDIR=%{buildroot} rm -rf %{buildroot}%{_initddir} \ %{buildroot}%{_sysconfdir}/init.d \ @@ -588,6 +428,13 @@ mkdir -p %{buildroot}%{_unitdir} find %{buildroot}%{_datadir}/cups/model -name "*.ppd" |xargs gzip -n9f +pushd %{buildroot}%{_datadir}/%{name}/ipptool +for file in color.jpg document-a4.pdf document-a4.ps document-letter.pdf document-letter.ps gray.jpg onepage-a4.pdf onepage-a4.ps onepage-letter.pdf onepage-letter.ps testfile.jpg testfile.pcl testfile.pdf testfile.ps testfile.txt +do + mv $file{,.gz} +done +popd + %if %{use_alternatives} pushd %{buildroot}%{_bindir} for i in cancel lp lpq lpr lprm lpstat; do @@ -604,21 +451,12 @@ mv lpc.8 lpc-cups.8 popd %endif -mv %{buildroot}%{_unitdir}/org.cups.cupsd.path %{buildroot}%{_unitdir}/cups.path -mv %{buildroot}%{_unitdir}/org.cups.cupsd.service %{buildroot}%{_unitdir}/cups.service -mv %{buildroot}%{_unitdir}/org.cups.cupsd.socket %{buildroot}%{_unitdir}/cups.socket -mv %{buildroot}%{_unitdir}/org.cups.cups-lpd.socket %{buildroot}%{_unitdir}/cups-lpd.socket -mv %{buildroot}%{_unitdir}/org.cups.cups-lpd@.service %{buildroot}%{_unitdir}/cups-lpd@.service -/bin/sed -i -e "s,org.cups.cupsd,cups,g" %{buildroot}%{_unitdir}/cups.service - -mkdir -p %{buildroot}%{_datadir}/pixmaps %{buildroot}%{_sysconfdir}/X11/sysconfig %{buildroot}%{_sysconfdir}/X11/applnk/System %{buildroot}%{_sysconfdir}/logrotate.d -install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps -install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/cups -install -p -m 755 %{SOURCE7} %{buildroot}%{cups_serverbin}/backend/ncp +mkdir -p %{buildroot}%{_datadir}/pixmaps %{buildroot}%{_sysconfdir}/X11/sysconfig %{buildroot}%{_sysconfdir}/X11/applnk/System +install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps # Ship an rpm macro for where to put driver executables. mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d -install -m 0644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/macros.d +install -m 0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d # Ship a printers.conf file, and a client.conf file. That way, they get # their SELinux file contexts set correctly. @@ -628,6 +466,18 @@ touch %{buildroot}%{_sysconfdir}/cups/client.conf touch %{buildroot}%{_sysconfdir}/cups/subscriptions.conf touch %{buildroot}%{_sysconfdir}/cups/lpoptions +# deny MD5 digest authentication by default in client.conf +cat > %{buildroot}%{_sysconfdir}/cups/client.conf < ${RPM_BUILD_ROOT}%{_tmpfilesdir}/cups.conf < %{buildroot}%{_tmpfilesdir}/cups.conf < ${RPM_BUILD_ROOT}%{_tmpfilesdir}/cups-lp.conf < %{buildroot}%{_tmpfilesdir}/cups-lp.conf < %{name}.lang -# install get-document upgrade script -install -m 0755 %{SOURCE9} %{buildroot}%{_sbindir}/upgrade_get_document +# install get-document upgrade script - remove it after +# C10S is released and Fedora 40 is EOL +install -m 0755 %{SOURCE3} %{buildroot}%{_sbindir}/upgrade_get_document +# adjust shebang for old python2 if needed - remove once C10S is released and F40 EOL sed -i 's,@PYTHON_SHEBANG@,#!%{__python},' %{buildroot}%{_sbindir}/upgrade_get_document %post -%systemd_post %{name}.path %{name}.socket %{name}.service - -# Remove old-style certs directory; new-style is /var/run -# (see bug #194581 for why this is necessary). -rm -rf %{_sysconfdir}/cups/certs -rm -f %{_localstatedir}/cache/cups/*.ipp %{_localstatedir}/cache/cups/*.cache - -# Previous migration script unnecessarily put PageLogFormat into cups-files.conf -# (see bug #1148995) -FILE=%{_sysconfdir}/cups/cups-files.conf -for keyword in PageLogFormat; do - /bin/sed -i -e "s,^$keyword,#$keyword,i" "$FILE" || : -done - -# Because of moving logs to journal, we need to create placeholder files -# at /var/log/cups for users, whose are going to install CUPS on new OS -# machine with info message -%if 0%{?rhel} > 7 || 0%{?fedora} > 27 -confignames=( "ErrorLog" "AccessLog" "PageLog" ) -lognames=( "error_log" "access_log" "page_log" ) -message="This CUPS log has been moved into journal by default unless changes have been made in /etc/cups/cups-files.conf. Log messages can be got by \"$ journalctl -u cups -e\"" -for ((i=0;i<${#confignames[@]};i++)); -do - found=`%{_bindir}/grep -i "${confignames[i]} syslog" /etc/cups/cups-files.conf` - if [ ! -z "$found" ] - then - if [ ! -f %{_localstatedir}/log/cups/${lognames[i]} ] - then - %{_bindir}/touch %{_localstatedir}/log/cups/${lognames[i]} || : - fi - perms=`%{_bindir}/ls -lah %{_localstatedir}/log/cups/${lognames[i]} | %{_bindir}/grep -v -e "\-rw-------" -e "root lp"` - if [ ! -z "$perms" ] - then - # we need to set correct permissions and ownership because of possible - # security issues - # we need to have here, because previous CUPS releases had the bug. - # Checking permissions and ownership here fixes it. - %{_bindir}/chown root:lp %{_localstatedir}/log/cups/${lognames[i]} || : - %{_bindir}/chmod 600 %{_localstatedir}/log/cups/${lognames[i]} || : - fi - lastmessage=`%{_bindir}/tail -n 1 %{_localstatedir}/log/cups/${lognames[i]} | %{_bindir}/grep "$message"` - if [ -z "$lastmessage" ] - then - %{_bindir}/echo $message >> %{_localstatedir}/log/cups/${lognames[i]} || : - fi - fi -done -%endif - -%{_bindir}/rm /var/cache/cups/*.data > /dev/null 2>&1 - -if [ -e /etc/systemd/system/printer.target.wants/cups.service ] -then - %{_bindir}/systemctl enable cups.service > /dev/null 2>&1 -fi - -# 2013865 - if the directive is not in cupsd.conf, add it (needed during upgrades if -# user had changed the config file) -grep '^\s*IdleExitTimeout' %{_sysconfdir}/cups/cupsd.conf &> /dev/null || echo -e '\nIdleExitTimeout 0' \ ->> %{_sysconfdir}/cups/cupsd.conf +# remove after CentOS Stream 10 is released +# Require authentication for accessing /admin location +# - needed for finding printers via Find New Printers button in Web UI +# upstream PR https://github.com/OpenPrinting/cups/pull/518 +# Implementation: we need to get a scope for /admin location, which starts with +# and ends with the first , so once we find the opening tag via sed, we implement a sed loop, +# which saves all lines which don't match the ending tag into pattern space, and once there is +# the ending tag, print the whole pattern buffer. The buffer is checked for AuthType and Require directives. +# If they already exist, we don't add anything. cupsd.conf.rpmsave is created as a backup. +sed -ne '/^\s*/ { :loop; /<\/Location>/ ! {N; b loop}; p }' %{_sysconfdir}/cups/cupsd.conf \ +| grep -E '^\s*(AuthType|Require)' &> /dev/null || \ +sed -i.rpmsave '/^\s*/a\ AuthType Default\n Require user @SYSTEM' %{_sysconfdir}/cups/cupsd.conf +# remove after C10S release and Fedora 40 EOL %{_sbindir}/upgrade_get_document -exit 0 +# required for systemd units +%systemd_post %{name}.path %{name}.socket %{name}.service %post client %if %{use_alternatives} @@ -755,43 +561,35 @@ exit 0 --slave %{_mandir}/man1/lpq.1.gz print-lpqman %{_mandir}/man1/lpq-cups.1.gz \ --slave %{_mandir}/man1/lpr.1.gz print-lprman %{_mandir}/man1/lpr-cups.1.gz \ --slave %{_mandir}/man1/lprm.1.gz print-lprmman %{_mandir}/man1/lprm-cups.1.gz \ - --slave %{_mandir}/man1/lpstat.1.gz print-lpstatman %{_mandir}/man1/lpstat-cups.1.gz + --slave %{_mandir}/man1/lpstat.1.gz print-lpstatman %{_mandir}/man1/lpstat-cups.1.gz || : %endif -exit 0 %post lpd %systemd_post cups-lpd.socket -exit 0 %ldconfig_scriptlets libs %preun %systemd_preun %{name}.path %{name}.socket %{name}.service -exit 0 %preun client %if %{use_alternatives} if [ $1 -eq 0 ] ; then - /usr/sbin/alternatives --remove print %{_bindir}/lpr.cups + /usr/sbin/alternatives --remove print %{_bindir}/lpr.cups || : fi %endif -exit 0 %preun lpd %systemd_preun cups-lpd.socket -exit 0 %postun %systemd_postun_with_restart %{name}.path %{name}.socket %{name}.service -exit 0 %postun lpd %systemd_postun_with_restart cups-lpd.socket -exit 0 %triggerin -- samba-client ln -sf %{_libexecdir}/samba/cups_backend_smb %{cups_serverbin}/backend/smb || : -exit 0 %triggerun -- samba-client [ $2 = 0 ] || exit 0 @@ -799,13 +597,154 @@ rm -f %{cups_serverbin}/backend/smb %files -f %{name}.lang %doc README.md CREDITS.md CHANGES.md -%dir %attr(0755,root,lp) %{_sysconfdir}/cups -%dir %attr(0755,root,lp) %{_localstatedir}/run/cups -%dir %attr(0511,lp,sys) %{_localstatedir}/run/cups/certs -%{_tmpfilesdir}/cups.conf -%{_tmpfilesdir}/cups-lp.conf -%verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf +%{_bindir}/cupstestppd +%{_bindir}/ppdc +%{_bindir}/ppdhtml +%{_bindir}/ppdi +%{_bindir}/ppdmerge +%{_bindir}/ppdpo +%{_sbindir}/cupsaccept +%{_sbindir}/cupsctl +%{_sbindir}/cupsd +%{_sbindir}/cupsdisable +%{_sbindir}/cupsenable +%{_sbindir}/cupsfilter +%{_sbindir}/cupsreject +%{_sbindir}/lpadmin +%{_sbindir}/lpinfo +%{_sbindir}/lpmove +# remove upgrade-get-document once C10S is released and Fedora 40 EOL +%{_sbindir}/upgrade_get_document +%dir %{cups_serverbin}/daemon +%{cups_serverbin}/daemon/cups-deviced +%{cups_serverbin}/daemon/cups-driverd +%{cups_serverbin}/daemon/cups-exec +%{cups_serverbin}/backend/dnssd +%{cups_serverbin}/backend/failover +%{cups_serverbin}/backend/http +%{cups_serverbin}/backend/https +%{cups_serverbin}/backend/ipp +%{cups_serverbin}/backend/ipps +%{cups_serverbin}/backend/lpd +%{cups_serverbin}/backend/snmp +%{cups_serverbin}/backend/socket +%{cups_serverbin}/backend/usb +%dir %{cups_serverbin}/cgi-bin +%{cups_serverbin}/cgi-bin/admin.cgi +%{cups_serverbin}/cgi-bin/classes.cgi +%{cups_serverbin}/cgi-bin/help.cgi +%{cups_serverbin}/cgi-bin/jobs.cgi +%{cups_serverbin}/cgi-bin/printers.cgi +%{cups_serverbin}/filter/commandtops +%{cups_serverbin}/filter/gziptoany +%{cups_serverbin}/filter/pstops +%{cups_serverbin}/filter/rastertoepson +%{cups_serverbin}/filter/rastertohp +%{cups_serverbin}/filter/rastertolabel +%{cups_serverbin}/filter/rastertopwg +%dir %{cups_serverbin}/monitor +%{cups_serverbin}/monitor/bcp +%{cups_serverbin}/monitor/tbcp +%dir %{cups_serverbin}/notifier +%{cups_serverbin}/notifier/dbus +%{cups_serverbin}/notifier/mailto +%{cups_serverbin}/notifier/rss +%{_datadir}/cups/drv/sample.drv +%dir %{_datadir}/cups/examples +%{_datadir}/cups/examples/*.drv +%{_datadir}/cups/mime/mime.types +%{_datadir}/cups/mime/mime.convs +%{_datadir}/cups/ppdc/*.defs +%{_datadir}/cups/ppdc/*.h +%dir %{_datadir}/cups/templates +%{_datadir}/cups/templates/*.tmpl +%dir %{_datadir}/cups/templates/da +%{_datadir}/cups/templates/da/*.tmpl +%dir %{_datadir}/cups/templates/de +%{_datadir}/cups/templates/de/*.tmpl +%dir %{_datadir}/cups/templates/es +%{_datadir}/cups/templates/es/*.tmpl +%dir %{_datadir}/cups/templates/fr +%{_datadir}/cups/templates/fr/*.tmpl +%dir %{_datadir}/cups/templates/ja +%{_datadir}/cups/templates/ja/*.tmpl +%dir %{_datadir}/cups/templates/pt_BR +%{_datadir}/cups/templates/pt_BR/*.tmpl +%dir %{_datadir}/cups/templates/ru +%{_datadir}/cups/templates/ru/*.tmpl +%dir %{_datadir}/%{name}/usb +%{_datadir}/%{name}/usb/org.cups.usb-quirks +%dir %{_datadir}/%{name}/www +%{_datadir}/%{name}/www/images +%{_datadir}/%{name}/www/*.css +# 1658673 - html files cannot be docs, because CUPS web ui will not have +# introduction page on Fedora Docker image (because rpms are installed +# without docs there because of space reasons) +%{_datadir}/%{name}/www/index.html +%{_datadir}/%{name}/www/help +%{_datadir}/%{name}/www/robots.txt +%{_datadir}/%{name}/www/da/index.html +%{_datadir}/%{name}/www/de/index.html +%{_datadir}/%{name}/www/es/index.html +%{_datadir}/%{name}/www/fr/index.html +%{_datadir}/%{name}/www/ja/index.html +%{_datadir}/%{name}/www/ru/index.html +%{_datadir}/%{name}/www/pt_BR/index.html +%{_datadir}/%{name}/www/apple-touch-icon.png +%dir %{_datadir}/%{name}/www/da +%dir %{_datadir}/%{name}/www/de +%dir %{_datadir}/%{name}/www/es +%dir %{_datadir}/%{name}/www/fr +%dir %{_datadir}/%{name}/www/ja +%dir %{_datadir}/%{name}/www/pt_BR +%dir %{_datadir}/%{name}/www/ru +%{_datadir}/pixmaps/cupsprinter.png +%ghost %dir %attr(0770,root,lp) %{_localstatedir}/cache/cups +%ghost %dir %attr(0775,root,lp) %{_localstatedir}/cache/cups/rss +%dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp +%dir %attr(0710,root,lp) %{_localstatedir}/spool/cups +%dir %attr(0755,root,lp) %{_localstatedir}/log/cups +%{_mandir}/man1/cups.1.gz +%{_mandir}/man1/cupstestppd.1.gz +%{_mandir}/man1/ppdc.1.gz +%{_mandir}/man1/ppdhtml.1.gz +%{_mandir}/man1/ppdi.1.gz +%{_mandir}/man1/ppdmerge.1.gz +%{_mandir}/man1/ppdpo.1.gz +%{_mandir}/man5/classes.conf.5.gz +%{_mandir}/man5/client.conf.5.gz +%{_mandir}/man5/cups-files.conf.5.gz +%{_mandir}/man5/cups-snmp.conf.5.gz +%{_mandir}/man5/cupsd-logs.5.gz +%{_mandir}/man5/cupsd.conf.5.gz +%{_mandir}/man5/mailto.conf.5.gz +%{_mandir}/man5/mime.convs.5.gz +%{_mandir}/man5/mime.types.5.gz +%{_mandir}/man5/ppdcfile.5.gz +%{_mandir}/man5/printers.conf.5.gz +%{_mandir}/man5/subscriptions.conf.5.gz +%{_mandir}/man7/backend.7.gz +%{_mandir}/man7/filter.7.gz +%{_mandir}/man7/notifier.7.gz +%{_mandir}/man8/cups-deviced.8.gz +%{_mandir}/man8/cups-driverd.8.gz +%{_mandir}/man8/cups-exec.8.gz +%{_mandir}/man8/cups-snmp.8.gz +%{_mandir}/man8/cupsaccept.8.gz +%{_mandir}/man8/cupsctl.8.gz +%{_mandir}/man8/cupsd-helper.8.gz +%{_mandir}/man8/cupsd.8.gz +%{_mandir}/man8/cupsdisable.8.gz +%{_mandir}/man8/cupsenable.8.gz +%{_mandir}/man8/cupsfilter.8.gz +%{_mandir}/man8/cupsreject.8.gz +%{_mandir}/man8/lpadmin.8.gz +%{_mandir}/man8/lpinfo.8.gz +%{_mandir}/man8/lpmove.8.gz +%dir %attr(0755,root,lp) %{_rundir}/cups +%dir %attr(0511,lp,sys) %{_rundir}/cups/certs %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf.default +%verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf %verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cups-files.conf %attr(0640,root,lp) %{_sysconfdir}/cups/cups-files.conf.default %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/client.conf @@ -814,100 +753,35 @@ rm -f %{cups_serverbin}/backend/smb %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/snmp.conf %attr(0640,root,lp) %{_sysconfdir}/cups/snmp.conf.default %verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/subscriptions.conf -#%%{_sysconfdir}/cups/interfaces %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/lpoptions %dir %attr(0755,root,lp) %{_sysconfdir}/cups/ppd %dir %attr(0700,root,lp) %{_sysconfdir}/cups/ssl -%config(noreplace) %{_sysconfdir}/pam.d/cups -%config(noreplace) %{_sysconfdir}/logrotate.d/cups -%dir %{_datadir}/%{name}/www -%dir %{_datadir}/%{name}/www/de -%dir %{_datadir}/%{name}/www/es -%dir %{_datadir}/%{name}/www/ja -%dir %{_datadir}/%{name}/www/ru -%{_datadir}/%{name}/www/images -%{_datadir}/%{name}/www/*.css -%doc %{_datadir}/%{name}/www/index.html -%doc %{_datadir}/%{name}/www/help -%doc %{_datadir}/%{name}/www/robots.txt -%doc %{_datadir}/%{name}/www/de/index.html -%doc %{_datadir}/%{name}/www/es/index.html -%doc %{_datadir}/%{name}/www/ja/index.html -%doc %{_datadir}/%{name}/www/ru/index.html -%doc %{_datadir}/%{name}/www/pt_BR/index.html -%doc %{_datadir}/%{name}/www/apple-touch-icon.png -%dir %{_datadir}/%{name}/usb -%{_datadir}/%{name}/usb/org.cups.usb-quirks -%{_unitdir}/%{name}.service -%{_unitdir}/%{name}.socket -%{_unitdir}/%{name}.path -%{_bindir}/cupstestppd -%{_bindir}/cupstestdsc -%{_bindir}/ppd* -%{cups_serverbin}/backend/* -%{cups_serverbin}/cgi-bin -%dir %{cups_serverbin}/daemon -%{cups_serverbin}/daemon/cups-deviced -%{cups_serverbin}/daemon/cups-driverd -%{cups_serverbin}/daemon/cups-exec -%{cups_serverbin}/notifier -%{cups_serverbin}/filter/* -%{cups_serverbin}/monitor -%{_mandir}/man[1578]/* -# client subpackage -%exclude %{_mandir}/man1/lp*.1.gz -%exclude %{_mandir}/man1/cancel-cups.1.gz -%exclude %{_mandir}/man8/lpc-cups.8.gz -# devel subpackage -%exclude %{_mandir}/man1/cups-config.1.gz -# ipptool subpackage -%exclude %{_mandir}/man1/ipptool.1.gz -%exclude %{_mandir}/man5/ipptoolfile.5.gz -# lpd subpackage -%exclude %{_mandir}/man8/cups-lpd.8.gz -%{_sbindir}/* -# client subpackage -%exclude %{_sbindir}/lpc.cups -%dir %{_datadir}/cups/templates -%dir %{_datadir}/cups/templates/de -%dir %{_datadir}/cups/templates/es -%dir %{_datadir}/cups/templates/ja -%dir %{_datadir}/cups/templates/ru -%dir %{_datadir}/cups/templates/pt_BR -%{_datadir}/cups/templates/*.tmpl -%{_datadir}/cups/templates/de/*.tmpl -%{_datadir}/cups/templates/fr/*.tmpl -%{_datadir}/cups/templates/es/*.tmpl -%{_datadir}/cups/templates/ja/*.tmpl -%{_datadir}/cups/templates/ru/*.tmpl -%{_datadir}/cups/templates/pt_BR/*.tmpl -%dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp -%dir %attr(0710,root,lp) %{_localstatedir}/spool/cups -%dir %attr(0755,lp,sys) %{_localstatedir}/log/cups -%{_datadir}/pixmaps/cupsprinter.png %config(noreplace) %{_sysconfdir}/dbus-1/system.d/cups.conf -%{_datadir}/cups/drv/sample.drv -%{_datadir}/cups/examples -%{_datadir}/cups/mime/mime.types -%{_datadir}/cups/mime/mime.convs -%{_datadir}/cups/ppdc/*.defs -%{_datadir}/cups/ppdc/*.h +%config(noreplace) %{_sysconfdir}/pam.d/cups +%{_tmpfilesdir}/cups.conf +%{_tmpfilesdir}/cups-lp.conf +%attr(0644, root, root)%{_unitdir}/%{name}.service +%attr(0644, root, root)%{_unitdir}/%{name}.socket +%attr(0644, root, root)%{_unitdir}/%{name}.path %files client +%{_bindir}/cancel.cups +%{_bindir}/lp.cups +%{_bindir}/lpoptions +%{_bindir}/lpq.cups +%{_bindir}/lpr.cups +%{_bindir}/lprm.cups +%{_bindir}/lpstat.cups %{_sbindir}/lpc.cups -%{_bindir}/cancel* -%{_bindir}/lp* -%{_mandir}/man1/lp*.1.gz %{_mandir}/man1/cancel-cups.1.gz +%{_mandir}/man1/lp*.1.gz %{_mandir}/man8/lpc-cups.8.gz %files libs -%{license} LICENSE.txt +%{license} LICENSE +%{license} NOTICE %{_libdir}/libcups.so.2 -%{_libdir}/libcupscgi.so.1 %{_libdir}/libcupsimage.so.2 -%{_libdir}/libcupsmime.so.1 -%{_libdir}/libcupsppdc.so.1 %files filesystem %dir %{cups_serverbin} @@ -915,222 +789,495 @@ rm -f %{cups_serverbin}/backend/smb %dir %{cups_serverbin}/driver %dir %{cups_serverbin}/filter %dir %{_datadir}/cups -#%%dir %%{_datadir}/cups/banners -#%%dir %%{_datadir}/cups/charsets %dir %{_datadir}/cups/data %dir %{_datadir}/cups/drv %dir %{_datadir}/cups/mime %dir %{_datadir}/cups/model %dir %{_datadir}/cups/ppdc %dir %{_datadir}/ppd +%dir %attr(0755,root,lp) %{_sysconfdir}/cups +%dir %attr(0700,root,lp) %{_sysconfdir}/cups/ssl %files devel %{_bindir}/cups-config -%{_libdir}/*.so %{_includedir}/cups +%{_libdir}/*.so +%{_libdir}/pkgconfig/cups.pc %{_mandir}/man1/cups-config.1.gz %{_rpmconfigdir}/macros.d/macros.cups %files lpd -%{_unitdir}/cups-lpd.socket -%{_unitdir}/cups-lpd@.service %{cups_serverbin}/daemon/cups-lpd %{_mandir}/man8/cups-lpd.8.gz +%attr(0644, root, root)%{_unitdir}/cups-lpd.socket +%attr(0644, root, root)%{_unitdir}/cups-lpd@.service %files ipptool -%{_bindir}/ipptool %{_bindir}/ippfind +%{_bindir}/ipptool %dir %{_datadir}/cups/ipptool %{_datadir}/cups/ipptool/* +%{_mandir}/man1/ippfind.1.gz %{_mandir}/man1/ipptool.1.gz %{_mandir}/man5/ipptoolfile.5.gz +%files printerapp +%{_bindir}/ippeveprinter +%dir %{cups_serverbin}/command +%{cups_serverbin}/command/ippevepcl +%{cups_serverbin}/command/ippeveps +%{_mandir}/man1/ippeveprinter.1.gz +%{_mandir}/man7/ippevepcl.7.gz +%{_mandir}/man7/ippeveps.7.gz + %changelog -* Fri Oct 25 2024 Zdenek Dohnal - 1:2.2.6-62 -- RHEL-60338 CVE-2024-47175 cups: remote command injection via attacker controlled data in PPD file +* Tue Jan 07 2025 Zdenek Dohnal - 1:2.4.10-11 +- provide a way how to opt-out from system crypto policy if needed -* Thu Aug 15 2024 Zdenek Dohnal - 1:2.2.6-61 -- RHEL-54038 cups source rpm doesn't actually build lspp support -- fix memory leaks caused by lspp +* Fri Dec 06 2024 Zdenek Dohnal - 1:2.4.10-10 +- RHEL-68415 Inability to disable weak ciphers in CUPS configuration -* Tue Jun 18 2024 Pavol Zacik - 1:2.2.6-60 -- RHEL-40386 cups: Cupsd Listen arbitrary chmod 0140777 -- Delete the domain socket file after stopping the cups.socket service -- Fix cupsd Listener checks +* Mon Dec 02 2024 Zdenek Dohnal - 1:2.4.10-9 +- RHEL-69638 IPP Everywhere permanent queue is not removed if PPD generation fails -* Fri Jun 14 2024 Pavol Zacik - 1:2.2.6-59 -- RHEL-40386 cups: Cupsd Listen arbitrary chmod 0140777 -- Require cups.socket in cupsd service file +* Mon Nov 25 2024 Zdenek Dohnal - 1:2.4.10-8 +- RHEL-45525 cups-2.4.10-2.el10: RHEL SAST Automation: address 1 High impact true positive(s) +- RHEL-60354 CVE-2024-47175 cups: remote command injection via attacker controlled data in PPD file -* Mon Jun 10 2024 Pavol Zacik - 1:2.2.6-58 +* Fri Nov 22 2024 Zdenek Dohnal - 1:2.4.10-8 +- RHEL-54579 [rhel-10] Do not look into /root/.cups/lpoptions when using cupsGetNamedDest as root + +* Thu Nov 14 2024 Zdenek Dohnal - 1:2.4.10-7 +- RHEL-67580 Move /etc/cups/ssl into cups-filesystem and require filesystem in libs + +* Tue Oct 29 2024 Troy Dawson - 1:2.4.10-6 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Thu Aug 15 2024 Zdenek Dohnal - 1:2.4.10-5 +- RHEL-54297 lspp caused memory leakage + +* Thu Aug 15 2024 Zdenek Dohnal - 1:2.4.10-4 +- RHEL-54345 Creating IPP Everywhere printer fails due race condition + +* Wed Aug 14 2024 Zdenek Dohnal - 1:2.4.10-4 +- RHEL-54297 cups source rpm doesn't actually build lspp support +- RHEL-49447 Fix garbage uri when adding discovered print in web ui + +* Tue Jul 23 2024 Zdenek Dohnal - 1:2.4.10-3 +- RHEL-49449 Fix checkbox support in web ui + +* Mon Jun 24 2024 Troy Dawson - 1:2.4.10-2 +- Bump release for June 2024 mass rebuild + +* Tue Jun 18 2024 Pavol Zacik - 1:2.4.10-1 +- Rebase cups to upstream version 2.4.10 + +* Wed Jun 12 2024 Pavol Zacik - 1:2.4.9-1 - CVE-2024-35235 cups: Cupsd Listen arbitrary chmod 0140777 +- RHEL-25804 Rebase CUPS to next upstream version - 2.4.9 -* Mon Feb 26 2024 Zdenek Dohnal - 1:2.2.6-57 -- revert RHEL-19200 - no new subpackages are needed +* Tue May 07 2024 Zdenek Dohnal - 1:2.4.7-12 +- RHEL-35695 Remove additional license tags -* Wed Dec 20 2023 Zdenek Dohnal - 1:2.2.6-56 -- RHEL-10702 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents -- RHEL-19200 Recommend new cups-filters subpackages with weak dep for better upgrade exp +* Tue Apr 16 2024 Zdenek Dohnal - 1:2.4.7-11 +- add epochs into conflicts -* Fri Nov 03 2023 Zdenek Dohnal - 1:2.2.6-55 -- RHEL-14933 cupsd memory leak in cupsdDeleteJob() with "PreserveJobHistory Off" -- RHEL-15309 cupsd fails to open cups-files.conf and the resulting error message is lost +* Fri Apr 05 2024 Zdenek Dohnal - 1:2.4.7-10 +- RHEL-31887 cups doesn't send Content-Type header back to client when Set-Cookie is seen first -* Tue Sep 12 2023 Zdenek Dohnal - 1:2.2.6-54 -- RHEL-2612 - cups pulls an unneeded dependency on python3 +* Wed Jan 24 2024 Fedora Release Engineering - 1:2.4.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Tue Aug 29 2023 Zdenek Dohnal - 1:2.2.6-53 -- CVE-2023-32360 cups: Information leak through Cups-Get-Document operation +* Fri Jan 19 2024 Fedora Release Engineering - 1:2.4.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Thu Jun 29 2023 Zdenek Dohnal - 1:2.2.6-52 -- 2217178 - Delays printing to lpd when reserved ports are exhausted -- 2217283 - The command "cancel -x " does not remove job files -- 2217955 - Enlarge backlog queue for listen() in cupsd +* Wed Jan 17 2024 Zdenek Dohnal - 1:2.4.7-7 +- 2257981 - /var/cache/cups is not owned by any package + +* Tue Dec 19 2023 Zdenek Dohnal - 1:2.4.7-6 +- add weak dependency on cups-filters-driverless for F40+ + +* Fri Dec 15 2023 Zdenek Dohnal - 1:2.4.7-5 +- 2254578 - cupsGetJobs() failes because libcups fails to connect to domain socket + +* Mon Dec 11 2023 Zdenek Dohnal - 1:2.4.7-4 +- make a weak dep on cups-browsed to prevent cups-browsed disappearing + during upgrade + +* Mon Nov 06 2023 Zdenek Dohnal - 1:2.4.7-3 +- use pkgconfig in macros.cups and add new macros + +* Mon Oct 30 2023 Zdenek Dohnal - 1:2.4.7-2 +- fix memory leaks when unloading job + +* Wed Sep 20 2023 Zdenek Dohnal - 1:2.4.7-1 +- 2239982 - cups-2.4.7 is available + +* Mon Sep 11 2023 Zdenek Dohnal - 1:2.4.6-6 +- use unified __python macro + +* Mon Aug 14 2023 Zdenek Dohnal - 1:2.4.6-5 +- comply the upgrade script with python2 as well if needed + +* Thu Aug 10 2023 Zdenek Dohnal - 1:2.4.6-4 +- add upgrade script for setting authentication for CUPS-Get-Document operation + +* Wed Jul 26 2023 Zdenek Dohnal - 1:2.4.6-3 +- SPDX migration completed + +* Wed Jul 19 2023 Fedora Release Engineering - 1:2.4.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 27 2023 Zdenek Dohnal - 1:2.4.6-1 +- 2218124 - The command "cancel -x " does not remove job files +- 2218123 - Delays printing to lpd when reserved ports are exhausted - CVE-2023-34241 cups: use-after-free in cupsdAcceptClient() in scheduler/client.c -- CVE-2023-32324 cups: heap buffer overflow may lead to DoS +- 2217043 - cups-2.4.6 is available -* Mon Apr 03 2023 Zdenek Dohnal - 1:2.2.6-51 -- RHEL-316 - Enable fmf tests in centos stream +* Wed Jun 14 2023 Zdenek Dohnal - 1:2.4.5-1 +- 2214860 - cups-2.4.5 is available -* Wed Dec 14 2022 Zdenek Dohnal - 1:2.2.6-51 -- 2130391 - Kerberized IPP Printing Fails +* Wed Jun 07 2023 Zdenek Dohnal - 1:2.4.4-1 +- fixes CVE-2023-32324 +- 2211834 - cups-2.4.4 is available +- 1985917 - Cups ignores black and white setting +- 2094530 - After upgrade 35 to 36 process rastertokpsl (Kyocera cups-filter driver) segfaulted -* Fri Jul 01 2022 Richard Lescak - 1:2.2.6-50 -- 1910415 - corrected manpage patch, one lpoptions usage wasn't changed +* Thu Mar 23 2023 Siddhesh Poyarekar - 1:2.4.2-11 +- Drop unnecessary LDFLAGS addition. -* Thu Jun 16 2022 Richard Lescak - 1:2.2.6-49 -- 1910415 - manpage update to acknowledge order dependency of -h option +* Thu Mar 02 2023 Zdenek Dohnal - 1:2.4.2-10 +- fix loading ippeveps in ippeveprinter if only the command name is provided +- don't override color settings from print dialog +- save the color settings between restarts +- check for cmyk when figuring out default options -* Tue May 31 2022 Zdenek Dohnal - 1:2.2.6-48 -- 2084257 - ErrorPolicy documentation is incorrect +* Mon Feb 20 2023 Zdenek Dohnal - 1:2.4.2-9 +- move /etc/cups into cups-filesystem, since cups-browsed needs it -* Thu May 26 2022 Zdenek Dohnal - 1:2.2.6-47 -- CVE-2022-26691 cups: authorization bypass when using "local" authorization +* Thu Feb 02 2023 Zdenek Dohnal - 1:2.4.2-8 +- 2165612 - IPP-USB as a weak dependency of CUPS and sane-airscan -* Fri May 13 2022 Zdenek Dohnal - 1:2.2.6-46 -- 2074684 - lp to a remote server takes a long time -- 2074736 - CUPS is too chatty about "Removing document files." in debug mode +* Thu Jan 19 2023 Fedora Release Engineering - 1:2.4.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Fri Apr 08 2022 Zdenek Dohnal - 1:2.2.6-45 -- 2071417 - 30-second delays printing to Windows 2016 server via HTTPS +* Thu Dec 08 2022 Zdenek Dohnal - 1:2.4.2-6 +- fix Find New Printers button in Web UI (upstream #518) -* Wed Jan 19 2022 Zdenek Dohnal - 1:2.2.6-44 -- 2015182 - RFE: Implement IdleExitTimeout configuration during build +* Mon Oct 03 2022 Zdenek Dohnal - 1:2.4.2-5 +- 2066528 - use 'localhost' if the mDNS record shows your local hostname -* Thu Jan 06 2022 Zdenek Dohnal - 1:2.2.6-43 -- 2032965 - [RFE] RHEL8 - CUPS Web UI supports adding IPP Everywhere +* Thu Aug 11 2022 Zdenek Dohnal - 1:2.4.2-4 +- 2115002 - Reenable kerberos/gssapi support -* Thu Dec 16 2021 Zdenek Dohnal - 1:2.2.6-42 -- 2013865 - RFE: Implement TimeoutStartSec configuration during build +* Tue Aug 02 2022 Zdenek Dohnal - 1:2.4.2-3 +- fix invalid pointer during resolving mDNS uri -* Mon Nov 29 2021 Zdenek Dohnal - 1:2.2.6-42 -- 2015182 - RFE: Implement IdleExitTimeout configuration during build +* Wed Jul 20 2022 Fedora Release Engineering - 1:2.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Wed Nov 03 2021 Zdenek Dohnal - 1:2.2.6-41 -- 2006987 - Unauthenticated users can't move print jobs in Web UI -- 2017919 - Setting 'MaxJobTime 0' does not set a job time to unlimited -- 1726383 - "lpadmin -p -o cupsSNMPSupplies:false" doesn't work -- 1982891 - Printing of banner before PCL file only prints banner -- 2006591 - Trying to restart and hold a job doesn't work -- 1811716 - lpr to non-existent printer reports incorrect error +* Tue May 31 2022 Zdenek Dohnal - 1:2.4.2-1 +- 2090633 - cups-2.4.2 is available -* Fri May 14 2021 Zdenek Dohnal - 1:2.2.6-40 -- 1955964 - PreserveJobHistory doesn't work with seconds -- 1927452 - CVE-2020-10001 cups: access to uninitialized buffer in ipp.c [rhel-8] +* Thu May 05 2022 Zdenek Dohnal - 1:2.4.1-9 +- add .gz to several files, which are compressed during installation script -* Wed May 05 2021 Zdenek Dohnal - 1:2.2.6-39 -- 1941437 - cupsd doesn't log job ids when logging into journal -- 1782216 - Print queue is paused after ipp backend ends with CUPS_BACKEND_STOP -- 1938384 - CUPS doesn't start if sssd starts after cupsd +* Fri Apr 08 2022 Zdenek Dohnal - 1:2.4.1-8 +- 2073268 - 30-second delays printing to Windows 2016 server via HTTPS -* Tue May 26 2020 Zdenek Dohnal - 1:2.2.6-38 -- 1775590 - rastertoepson filter crashes with paper size A6 +* Thu Mar 31 2022 Zdenek Dohnal - 1:2.4.1-7 +- remove ipp-usb for now until there is a migration path -* Mon May 25 2020 Zdenek Dohnal - 1:2.2.6-37 -- forgot to enable optimization - 1833516 +* Tue Mar 08 2022 Zdenek Dohnal - 1:2.4.1-6 +- fix copyrights in trailer templates +- fix CSS issues in web ui -* Fri May 22 2020 Zdenek Dohnal - 1:2.2.6-36 -- 1838449 - ipp/socket backends connect to turned off device for eternity (contimeout is not applied) -- 1689207 - Add failover backend -- 1833516 - DirtyCleanInterval ignored if there are open client connections +* Wed Mar 02 2022 Zdenek Dohnal - 1:2.4.1-5 +- background thread for add IPP Everywhere printers permanently didn't resolve mDNS -* Tue Apr 21 2020 Zdenek Dohnal - 1:2.2.6-35 -- 1825254 - CVE-2020-3898 cups: heap based buffer overflow in libcups's ppdFindOption() in ppd-mark.c +* Thu Feb 24 2022 Zdenek Dohnal - 1:2.4.1-4 +- jump based on uninitialized value in PPD related CUPS API on ppc64le -* Mon Apr 20 2020 Zdenek Dohnal - 1:2.2.6-34 -- 1809002 - scriptlet issue, /usr/bin/rm: cannot remove '/var/cache/cups/*.data' +* Tue Feb 22 2022 Zdenek Dohnal - 1:2.4.1-3 +- own www/da and www/fr dirs -* Thu Apr 09 2020 Zdenek Dohnal - 1:2.2.6-34 -- 1784884 - cups.service doesn't execute automatically on request +* Wed Feb 16 2022 Zdenek Dohnal - 1:2.4.1-2 +- recommend ipp-usb in case there are devices which support IPP-over-USB -* Wed Apr 08 2020 Zdenek Dohnal - 1:2.2.6-34 -- 1822135 - _ppdOpen() leaks 'string' variable +* Mon Feb 07 2022 Zdenek Dohnal - 1:2.4.1-1 +- 2047665 - cups-2.4.1 is available -* Fri Feb 14 2020 Zdenek Dohnal - 1:2.2.6-33 -- fix more memory leaks found by coverity in 1775668 +* Thu Jan 20 2022 Fedora Release Engineering - 1:2.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Fri Feb 14 2020 Zdenek Dohnal - 1:2.2.6-32 -- fix covscan issues raised by 1775668 +* Wed Jan 12 2022 Richard Lescak - 1:2.4.0-2 +- cups: memory leaks in http_tls_upgrade() and _cupsEncodeOption() -* Thu Feb 06 2020 Zdenek Dohnal - 1:2.2.6-31 -- 1775668 - cupsd eats a lot of memory when lots of queue with extensive PPDs are created +* Tue Jan 04 2022 Zdenek Dohnal - 1:2.4.0-1 +- 2027497 - cups-2.4.0 is available -* Tue Nov 26 2019 Zdenek Dohnal - 1:2.2.6-30 -- 1774462 - CVE-2019-8675 - buffer overflow in SNMP and IPP, memory disclosure and DoS in scheduler -- 1774463 - CVE-2019-8696 +* Mon Nov 29 2021 Zdenek Dohnal - 1:2.3.3op2-11 +- 2018957 - RFE: Implement IdleExitTimeout configuration during build +- 2018953 - RFE: Implement TimeoutStartSec configuration during build -* Mon Oct 07 2019 Zdenek Dohnal - 1:2.2.6-29 -- 1700663 - Stop advertising the HTTP methods that are supported +* Mon Nov 22 2021 Zdenek Dohnal - 1:2.3.3op2-11 +- turn off MD5 Digest authentication by default, because MD5 is marked insecure -* Tue Aug 13 2019 Zdenek Dohnal - 1:2.2.6-28 -- 1650233 - cups uses md5 for hashing credentials sent through tls connection +* Fri Nov 12 2021 Zdenek Dohnal - 1:2.3.3op2-10 +- 2022610 - fix compilation issues reported by annocheck +- 2019845 - Add more warning messages about driver going deprecated (completed) -* Mon Jun 10 2019 Tomas Korbar - 1:2.2.6-27 -- 1677577 - Remove 'View X log' buttons from web ui +* Thu Nov 04 2021 Zdenek Dohnal - 1:2.3.3op2-9 +- stubbed out deprecated httpMD5 functions +- 2019845 - Add more warning messages about drivers going deprecated (web ui part) -* Fri Jun 07 2019 Tomas Korbar - 1:2.2.6-26 -- 1659998 - cups fails to build if clang is installed +* Wed Nov 03 2021 Zdenek Dohnal - 1:2.3.3op2-9 +- 2018950 - Unauthenticated users can't move print jobs in Web UI +- 1999957 - Printing of banner before PCL file only prints banner +- 2006715 - Trying to restart and hold a job doesn't work -* Fri Dec 14 2018 Zdenek Dohnal - 1:2.2.6-25 -- 1659486 - cupsd crash on startup in ippCopyAttribute +* Wed Jul 21 2021 Fedora Release Engineering - 1:2.3.3op2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Fri Dec 14 2018 Zdenek Dohnal - 1:2.2.6-24 -- related to 1659111 - fix for previous releases +* Thu May 13 2021 Zdenek Dohnal - 1:2.3.3op2-7 +- 1960170 - PreserveJobHistory/JobFiles aren't applied after the first cupsd restart right after successful print -* Thu Dec 13 2018 Zdenek Dohnal - 1:2.2.6-23 -- 1659111 - Logs needs to have '-rw------' [regression] +* Thu May 06 2021 Zdenek Dohnal - 1:2.3.3op2-6 +- reflect change of upstream in url too -* Wed Dec 12 2018 Zdenek Dohnal - 1:2.2.6-22 -- 1622431 - Jobs with multiple files don't complete when backend fails -- CVE-2018-4700 cups: Predictable session cookie breaks CSRF protection [rhel-8] +* Fri Apr 30 2021 Zdenek Dohnal - 1:2.3.3op2-5 +- 1955090 - CVE-2021-25317 cups: insecure permissions of /var/log/cups allows for symlink attack -* Fri Sep 21 2018 Zdenek Dohnal - 1:2.2.6-21 -- 1602469 - fixed covscan issues -- 1625899 - cups 2.2.6 lpr command fails against old cups 1.3.9 server -- 1625913 - ssl options aren't initialized when no SSLOptions directive is set in /etc/cups/client.conf -- 1618009 - Enabling cups.path causes high load when jobs are submitted to CUPS -- 1630805 - Make cups systemd unit files more upstream-like +* Wed Apr 14 2021 Zdenek Dohnal - 1:2.3.3op2-4 +- 1935318 - old samsung USB devices malfunction with the current (250ms) timeout for usb bulk transaction +- 1949054 - Use nss-user-lookup.target instead of sssd.service and ypbind.service +- 1949068 - Print queue is paused after ipp backend ends with CUPS_BACKEND_STOP +- backport setting multi-user.target via configure, not via drop-in -* Tue Aug 07 2018 Zdenek Dohnal - 1:2.2.6-20 -- 1613173 - Remove weak SSL/TLS ciphers from CUPS +* Mon Mar 22 2021 Zdenek Dohnal - 1:2.3.3op2-3 +- add [Job N] in logs for better debugging -* Mon Aug 06 2018 Zdenek Dohnal - 1:2.2.6-19 -- 1612933 - cups doesn't restart after cupsctl command +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1:2.3.3op2-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. -* Tue Jul 24 2018 Zdenek Dohnal - 1:2.2.6-18 -- correct license +* Tue Feb 02 2021 Zdenek Dohnal - 1:2.3.3op2-1 +- 1923828 - cups-2.3.3op2 is available -* Mon Jul 23 2018 Zdenek Dohnal - 1:2.2.6-17 -- 1607295 - CVE-2018-4180 CVE-2018-4181 CVE-2018-4182 CVE-2018-4183 cups: various flaws [rhel-8.0] +* Mon Feb 01 2021 Zdenek Dohnal - 1:2.3.3op1-4 +- fix for CVE-2020-10001 +- recommend nss-mdns for Fedora to have a working default for now +- 1921881 - [abrt] cups: __strcmp_avx2(): help.cgi killed by SIGSEGV +- 1909980 - cupsd crashes on parsing malformed Brother PPD -* Wed Jun 13 2018 Zdenek Dohnal - 1:2.2.6-16 -- 1590122 - cups-driverd doesn't recognize static gzipped ppds +* Thu Jan 28 2021 Zdenek Dohnal - 1:2.3.3op1-3 +- remove nss-mdns dependency - let the user decide whether use resolved or nss-mdns +- remove cups dependency on cups-ipptool - actually not needed -* Tue May 29 2018 Zdenek Dohnal - 1:2.2.6-15 -- missing $ in sed +* Tue Jan 26 2021 Fedora Release Engineering - 1:2.3.3op1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Tue Apr 03 2018 Zdenek Dohnal - 1:2.2.6-14 -- substitute default values for invalid job attributes (upstream #5186 and #5229) +* Mon Nov 30 2020 Zdenek Dohnal - 1:2.3.3op1-1 +- 2.3.3op1 + +* Fri Nov 27 2020 Zdenek Dohnal - 1:2.3.3-20 +- make unit files writeable by root +- remove %%post scriptlet - it is covered by drop-in now +- remove cups-filter-debug.patch +- backport cups-synconclose.patch from upstream + +* Thu Nov 26 2020 Zdenek Dohnal - 1:2.3.3-20 +- remove downstream autostart patch - use systemd drop-in + +* Tue Nov 24 2020 Zdenek Dohnal - 1:2.3.3-20 +- fix memory leak during device discovery +- remove logrotate patches and support - journal is now default +- remove eggcups patch - seems to cause no harm +- journal is in Fedora for long time - no need to mention it is Fedora syslog +- fix packaging of printerapp manpages +- wheel is now in system groups by default +- remove old scripts for older migrations +- CREDITS is now in markdown format, so we don't need to convert +- fix requires on nss-mdns for cups-printerapp +- take SNMP OID from upstream +- rename unit files and update their patches + +* Thu Nov 12 2020 Zdenek Dohnal - 1:2.3.3-19 +- 1897023 - Cups service restart sequence during upgrade incorrect + +* Tue Nov 10 2020 Zdenek Dohnal - 1:2.3.3-18 +- 1892426 - Crash:free(): invalid pointer in cups backend + +* Thu Nov 05 2020 Zdenek Dohnal - 1:2.3.3-17 +- make is no longer in buildroot + +* Mon Nov 02 2020 Zdenek Dohnal - 1:2.3.3-16 +- backport cups-ipptool-mdns-uri.patch from upstream +- backport cups-prioritize-print-color-mode.patch from upstream + +* Thu Sep 03 2020 Zdenek Dohnal - 1:2.3.3-14 +- revert previous commit - resolved doesn't work with avahi due missing link + in NetworkManager + +* Mon Aug 31 2020 Zdenek Dohnal - 1:2.3.3-14 +- MDNS resolving should be done by systemd-resolved now + +* Mon Aug 10 2020 Zdenek Dohnal - 1:2.3.3-14 +- CUPS exception isn't in spdx database, use only ASL 2.0 + +* Wed Aug 05 2020 Zdenek Dohnal - 1:2.3.3-13 +- own 'new' directories + +* Tue Aug 04 2020 Zdenek Dohnal - 1:2.3.3-12 +- typo in DESTDIR during 'make install' + +* Sat Aug 01 2020 Fedora Release Engineering - 1:2.3.3-11 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1:2.3.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 22 2020 Zdenek Dohnal - 1:2.3.3-9 +- use %%make_build and %%make_install macros + +* Mon Jul 20 2020 Zdenek Dohnal - 1:2.3.3-8 +- 1848575 - [cups, cups-filters] PPD generators creates invalid cupsManualCopies entry + +* Fri Jul 17 2020 Zdenek Dohnal - 1:2.3.3-7 +- spec cleanup + +* Thu Jun 11 2020 Zdenek Dohnal - 1:2.3.3-6 +- fix patch errors in failover patch +- cgi script creates a bad uri in web ui +- ipptool doesn't support mdns uris + +* Tue Jun 02 2020 Zdenek Dohnal - 1:2.3.3-5 +- remove os ci tests, we use baseos ci + +* Fri May 22 2020 Zdenek Dohnal - 1:2.3.3-4 +- fix space errors in failover patch + +* Thu May 21 2020 Zdenek Dohnal - 1:2.3.3-3 +- use _rundir instead of hardcode /run + +* Wed May 20 2020 Zdenek Dohnal - 1:2.3.3-2 +- 1838455 - ipp/socket backends connect to turned off device for eternity (contimeout is not applied) + +* Tue May 19 2020 Zdenek Dohnal - 1:2.3.3-1 +- 2.3.3 + +* Tue Apr 21 2020 Zdenek Dohnal - 1:2.3.1-9 +- 1826330 - CVE-2020-3898 cups: heap based buffer overflow in libcups's ppdFindOption() in ppd-mark.c + +* Wed Apr 08 2020 Zdenek Dohnal - 1:2.3.1-8 +- 1822154 - cups.service doesn't execute automatically on request + +* Mon Apr 06 2020 Zdenek Dohnal - 1:2.3.1-7 +- make avahi and nss-mdns recommended in main package - so users with older printers + can install cups without it + +* Fri Mar 20 2020 Zdenek Dohnal - 1:2.3.1-6 +- add requires on nss-mdns, because getaddrinfo needs it for resolving .local addresses + +* Tue Jan 28 2020 Fedora Release Engineering - 1:2.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 18 2020 Tom Stellard - 1:2.3.1-4 +- Replace hard-coded gcc and g++ with __cc and __cxx macros + +* Wed Jan 15 2020 Zdenek Dohnal - 1:2.3.1-3 +- add buildrequires on systemd-rpm-macros + +* Thu Jan 02 2020 Zdenek Dohnal - 1:2.3.1-2 +- do not ship ipp backend as 755, breaks kerberized printing +- https://github.com/apple/cups/pull/5710 + +* Mon Dec 16 2019 Zdenek Dohnal - 1:2.3.1-1 +- 2.3.1 + +* Fri Nov 29 2019 Zdenek Dohnal - 1:2.3.0-2 +- 1777921 - cups unit file makes systemd to complain + +* Mon Nov 18 2019 Zdenek Dohnal - 1:2.3.0-1 +- 2.3.0 - new printerapp subpackage + +* Wed Oct 16 2019 Zdenek Dohnal - 1:2.2.12-3 +- 1720688 - [abrt] cups: __strlen_avx2(): printers.cgi killed by SIGSEGV +- 1750904 - cups is unable to add ppd with custom/Custom option + +* Fri Sep 13 2019 Zdenek Dohnal - 1:2.2.12-2 +- fix cupsctl usage + +* Mon Aug 19 2019 Zdenek Dohnal - 1:2.2.12-1 +- 2.2.12 + +* Wed Jul 24 2019 Fedora Release Engineering - 1:2.2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 31 2019 Zdenek Dohnal - 1:2.2.11-3 +- 1708988 - Samsung ML-1676P Laser printer fails to print document + +* Wed Apr 17 2019 Zdenek Dohnal - 1:2.2.11-2 +- 1700664 - Stop advertising the HTTP methods that are supported + +* Tue Mar 26 2019 Zdenek Dohnal - 1:2.2.11-1 +- 2.2.11 + +* Fri Mar 15 2019 Zdenek Dohnal - 1:2.2.10-5 +- 1689209 - Add failover backend + +* Tue Feb 19 2019 Zdenek Dohnal - 1:2.2.10-4 +- automake sometimes fails to generate correct macros - so force it + +* Tue Feb 05 2019 Zdenek Dohnal - 1:2.2.10-3 +- 1672715 - cups fails to build if clang is installed + +* Thu Jan 31 2019 Fedora Release Engineering - 1:2.2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Dec 14 2018 Zdenek Dohnal - 1:2.2.10-1 +- 2.2.10, libcupsmime, libcupsppdc and libcupscgi libraries were removed + +* Fri Dec 14 2018 Zdenek Dohnal - 1:2.2.8-10 +- previous commit - fix for previous releases + +* Thu Dec 13 2018 Zdenek Dohnal - 1:2.2.8-9 +- logs need to have correct permissions + +* Wed Dec 12 2018 Zdenek Dohnal - 1:2.2.8-8 +- 1658673 - Main index.html of web interface doesn't get installed when not installing documentation + +* Mon Dec 10 2018 Zdenek Dohnal - 1:2.2.8-7 +- 1657750 - CVE-2018-4700 cups: Predictable session cookie breaks CSRF protection [fedora-all] + +* Fri Nov 09 2018 Zdenek Dohnal - 1:2.2.8-6 +- 1622432 - Jobs with multiple files don't complete when backend fails +- 1648396 - 'cupsd[998]: [CGI] Unable to execute ippfind utility: No such file or directory' in journal + +* Fri Sep 21 2018 Zdenek Dohnal - 1:2.2.8-5 +- fixed coverity issues + +* Wed Sep 19 2018 Zdenek Dohnal - 1:2.2.8-4 +- 1618018 - Make cups systemd unit files more upstream-like + +* Tue Jul 24 2018 Zdenek Dohnal - 1:2.2.8-3 +- correcting license + +* Thu Jul 12 2018 Fedora Release Engineering - 1:2.2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 27 2018 Zdenek Dohnal - 1:2.2.8-1 +- 2.2.8, removing several downstream patches, adding some upstream patches + +* Tue Jun 12 2018 Zdenek Dohnal - 1:2.2.7-2 +- 1589593 - cupsd LogLevel ignored when logging to journald (syslog) +- 1590123 - cups-driverd doesn't recognize static gzipped ppds + +* Tue Apr 03 2018 Zdenek Dohnal - 1:2.2.7-1 +- rebase to 2.2.7 +- substitute default values for invalid job attributes (upstream issues #5229 and #5186) * Thu Mar 29 2018 Pavel Zhukov - 1:2.2.6-13 - Use dbus fix instead of general attr delete (upstream) diff --git a/macros.cups b/macros.cups new file mode 100644 index 0000000..c1647f8 --- /dev/null +++ b/macros.cups @@ -0,0 +1,3 @@ +%_cups_serverbin %(/usr/bin/pkg-config --variable=cups_serverbin cups) +%_cups_datadir %(/usr/bin/pkg-config --variable=cups_datadir cups) +%_cups_serverroot %(/usr/bin/pkg-config --variable=cups_serverroot cups) diff --git a/sources b/sources new file mode 100644 index 0000000..38c9137 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (cups-2.4.10-source.tar.gz) = 6442207615f79c91de134ff5f438aa5060cbdf764113f7a338a53f7e12ad87bab147ea61302e84c94f259d31950f1a164c4574d11942ca838eb924827375748e +SHA512 (cupsprinter.png) = 8f6c832577e0b9ad90560ecebdba7398fa46fc1e923068d9fe425f09e409f90afa30e8083d390d524693db52fb310bdad2f13f51e46c10be6825407fe2943811 diff --git a/SOURCES/upgrade_get_document.py.in b/upgrade_get_document.py.in similarity index 100% rename from SOURCES/upgrade_get_document.py.in rename to upgrade_get_document.py.in