From 2a7397c71269b3a2491e2466ce4da0ddd851f1ef Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 09 2021 09:57:41 +0000 Subject: import cups-filters-1.20.0-27.el8 --- diff --git a/SOURCES/0001-cups-browsed-Always-save-.-default-option-entries-fr.patch b/SOURCES/0001-cups-browsed-Always-save-.-default-option-entries-fr.patch new file mode 100644 index 0000000..1b871e6 --- /dev/null +++ b/SOURCES/0001-cups-browsed-Always-save-.-default-option-entries-fr.patch @@ -0,0 +1,28 @@ +From 144322be6e06ff12f101fc35e472d62978861e28 Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Thu, 15 Apr 2021 14:26:44 +0200 +Subject: [PATCH] cups-browsed: Always save "...-default" option entries from + printers.conf + +(cherry picked from commit cdd61132e1719a88dd8006c65e8e260c1aaa02e4) +--- + utils/cups-browsed.c | 4 +--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c +index bffd1e09..0c335055 100644 +--- a/utils/cups-browsed.c ++++ b/utils/cups-browsed.c +@@ -5648,9 +5648,7 @@ record_printer_options(const char *printer) { + strcasecmp(key + strlen(key) - strlen(*ptr) + 1, *ptr + 1) == 0)) + break; + if (*ptr != NULL) { +- if (strcasecmp(key, CUPS_BROWSED_DEST_PRINTER "-default") != 0 && +- (ppdname == NULL || +- strncasecmp(key + strlen(key) - 8, "-default", 8))) { ++ if (strcasecmp(key, CUPS_BROWSED_DEST_PRINTER "-default") != 0) { + ippAttributeString(attr, buf, sizeof(buf)); + buf[sizeof(buf) - 1] = '\0'; + c = buf; +-- +2.30.2 diff --git a/SOURCES/0001-libcupsfilters-Fix-page-range-like-10-in-pdftopdf-fi.patch b/SOURCES/0001-libcupsfilters-Fix-page-range-like-10-in-pdftopdf-fi.patch new file mode 100644 index 0000000..1baab50 --- /dev/null +++ b/SOURCES/0001-libcupsfilters-Fix-page-range-like-10-in-pdftopdf-fi.patch @@ -0,0 +1,26 @@ +From 022c34fedb66f706b2ab82d7506d5b5b1fa18e1f Mon Sep 17 00:00:00 2001 +From: Bryan Mason +Date: Fri, 16 Jul 2021 11:19:42 -0700 +Subject: [PATCH] libcupsfilter: Fix page range like "10-" in pdftopdf() + filter function + +--- + filter/pdftopdf/pdftopdf.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/filter/pdftopdf/pdftopdf.cc b/filter/pdftopdf/pdftopdf.cc +index 5725e199..979644f1 100644 +--- a/filter/pdftopdf/pdftopdf.cc ++++ b/filter/pdftopdf/pdftopdf.cc +@@ -256,7 +256,7 @@ static void parseRanges(const char *range,IntervalSet &ret) // {{{ + } else { + upper=strtol(range,(char **)&range,10); + if (upper>=2147483647) { +- ret.add(1); ++ ret.add(lower); + } else { + ret.add(lower,upper+1); + } +-- +2.31.1 + diff --git a/SOURCES/cups-browsed-renew.patch b/SOURCES/cups-browsed-renew.patch new file mode 100644 index 0000000..4157bb2 --- /dev/null +++ b/SOURCES/cups-browsed-renew.patch @@ -0,0 +1,13 @@ +diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c +index 078348a..2b30c63 100644 +--- a/utils/cups-browsed.c ++++ b/utils/cups-browsed.c +@@ -8268,7 +8268,7 @@ int main(int argc, char*argv[]) { + /* Subscribe to CUPS' D-Bus notifications and create a proxy to receive + the notifications */ + subscription_id = create_subscription (); +- g_timeout_add_seconds (NOTIFY_LEASE_DURATION - 60, ++ g_timeout_add_seconds (NOTIFY_LEASE_DURATION / 2, + renew_subscription_timeout, + &subscription_id); + cups_notifier = cups_notifier_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, diff --git a/SPECS/cups-filters.spec b/SPECS/cups-filters.spec index 5f471ae..2bfcc00 100644 --- a/SPECS/cups-filters.spec +++ b/SPECS/cups-filters.spec @@ -4,7 +4,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters Version: 1.20.0 -Release: 24%{?dist} +Release: 27%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -49,6 +49,12 @@ Patch11: foomatic-remove-tmpfile.patch Patch12: poppler-20.11.0.patch # 1894543 - Fix '.setfilladjust' usage after gs upgrade to 9.27 Patch13: 0001-gstoraster-Use-.setfilladjust2-PostScript-command-fo.patch +# 1931603 - cups-browsed doesn't save "-default" options +Patch14: 0001-cups-browsed-Always-save-.-default-option-entries-fr.patch +# 1972981 - cups-browsed doesn't renew DBus subscription in time and all printing comes to a halt +Patch15: cups-browsed-renew.patch +# 1981612 - [RHEL 8] pdftopdf doesn't handle "page-range=10-2147483647" correctly +Patch16: 0001-libcupsfilters-Fix-page-range-like-10-in-pdftopdf-fi.patch Requires: cups-filters-libs%{?_isa} = %{version}-%{release} @@ -187,6 +193,13 @@ This is the development package for OpenPrinting CUPS filters and backends. %patch12 -p1 -b .poppler2011 # 1894543 - Fix '.setfilladjust' usage after gs upgrade to 9.27 %patch13 -p1 -b .setfilladjust +# 1931603 - cups-browsed doesn't save "-default" options +%patch14 -p1 -b .cups-browsed-save-default-options +# 1972981 - cups-browsed doesn't renew DBus subscription in time and all printing comes to a halt +%patch15 -p1 -b .renew +# 1981612 - [RHEL 8] pdftopdf doesn't handle "page-range=10-2147483647" correctly +%patch16 -p1 -b .ranges + %build # work-around Rpath @@ -333,6 +346,15 @@ make check %{_libdir}/libfontembed.so %changelog +* Tue Jul 13 2021 Zdenek Dohnal - 1.20.0-27 +- 1981612 - [RHEL 8] pdftopdf doesn't handle "page-range=10-2147483647" correctly + +* Mon Jun 21 2021 Zdenek Dohnal - 1.20.0-26 +- 1972981 - cups-browsed doesn't renew DBus subscription in time and all printing comes to a halt + +* Thu Jun 03 2021 Richard Lescak - 1.20.0-25 +- 1931603 - cups-browsed doesn't save "*-default" options + * Mon Dec 14 2020 Zdenek Dohnal - 1.20.0-24 - require the explicit gs version