From 063e5c9eec04caaf295be9ef086a73e1a00817a7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 09:59:13 +0000 Subject: [PATCH] import CS cups-filters-1.28.7-15.el9 --- ...location-from-server-if-available-ot.patch | 29 +++++++++++++++++++ SPECS/cups-filters.spec | 14 ++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 SOURCES/0001-Use-description-location-from-server-if-available-ot.patch diff --git a/SOURCES/0001-Use-description-location-from-server-if-available-ot.patch b/SOURCES/0001-Use-description-location-from-server-if-available-ot.patch new file mode 100644 index 0000000..8cdf96a --- /dev/null +++ b/SOURCES/0001-Use-description-location-from-server-if-available-ot.patch @@ -0,0 +1,29 @@ +diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c +index d4396d7..6dba2ed 100644 +--- a/utils/cups-browsed.c ++++ b/utils/cups-browsed.c +@@ -8793,6 +8793,10 @@ gboolean update_cups_queues(gpointer unused) { + IPP_PRINTER_IDLE); + /* ... and accepting jobs */ + ippAddBoolean(request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1); ++ // Location (only if the remote server actually provides a location string) ++ if (p->location && p->location[0]) ++ ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, ++ "printer-location", NULL, p->location); + num_options = 0; + options = NULL; + /* Device URI: ipp(s)://:631/printers/ +@@ -8808,6 +8812,13 @@ gboolean update_cups_queues(gpointer unused) { + num_options = cupsAddOption(p->options[i].name, + p->options[i].value, + num_options, &options); ++ ++ // Description (only if the remote server actually provides a description ++ // string) ++ if (p->info && p->info[0]) ++ num_options = cupsAddOption("printer-info", p->info, ++ num_options, &options); ++ + /* Encode option list into IPP attributes */ + cupsEncodeOptions2(request, num_options, options, IPP_TAG_OPERATION); + cupsEncodeOptions2(request, num_options, options, IPP_TAG_PRINTER); diff --git a/SPECS/cups-filters.spec b/SPECS/cups-filters.spec index 32dda51..ab96a43 100644 --- a/SPECS/cups-filters.spec +++ b/SPECS/cups-filters.spec @@ -11,7 +11,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters Version: 1.28.7 -Release: 13%{?dist} +Release: 15%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -40,6 +40,8 @@ Patch02: 0001-cups-browsed.c-Make-NotifLeaseDuration-configurable-.patch Patch03: 0001-libcupsfilters-Fix-page-range-like-10-in-pdftopdf-fi.patch # CVE-2023-24805 cups-filters: remote code execution in cups-filters, beh CUPS backend Patch04: beh-cve2023.patch +# RHEL-16026 Cups Browsed does not correctly pull printer location and description information from print server +Patch05: 0001-Use-description-location-from-server-if-available-ot.patch # autogen.sh @@ -108,8 +110,6 @@ BuildRequires: systemd-rpm-macros %if 0%{?fedora} Recommends: nss-mdns %endif -# Avahi is needed for device discovery for newer (2012+) devices and its sharing - make it recommended -Recommends: avahi # ippfind is used in driverless backend, not needed classic PPD based print queue Recommends: cups-ipptool @@ -134,7 +134,6 @@ Requires: poppler-utils # cups-browsed # cups-browsed needs to have cups.service to run -Requires: cups Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -408,6 +407,13 @@ done %endif %changelog +* Mon Feb 26 2024 Zdenek Dohnal - 1.28.7-15 +- RHEL-19201 redhat-lsb unnecessary pulls in cups and avahi dependencies + +* Wed Dec 20 2023 Zdenek Dohnal - 1.28.7-14 +- RHEL-19201 redhat-lsb unnecessary pulls in cups and avahi dependencies +- RHEL-16026 Cups Browsed does not correctly pull printer location and description information from print server + * Tue Aug 08 2023 Zdenek Dohnal - 1.28.7-13 - 2229784 - Add textonly driver back, but as lftocrlf