From 12094716ea115652d55bc353e9bb5cc50c0a5df5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Apr 05 2018 06:16:08 +0000 Subject: fixing discovering of remote CUPS queues and LDAP queues --- diff --git a/cups-filters-no-txt.patch b/cups-filters-no-txt.patch new file mode 100644 index 0000000..e63ae5c --- /dev/null +++ b/cups-filters-no-txt.patch @@ -0,0 +1,15 @@ +diff -up cups-filters-1.20.2/utils/cups-browsed.c.no-txt cups-filters-1.20.2/utils/cups-browsed.c +--- cups-filters-1.20.2/utils/cups-browsed.c.no-txt 2018-04-05 07:51:45.698241089 +0200 ++++ cups-filters-1.20.2/utils/cups-browsed.c 2018-04-05 07:57:28.117234138 +0200 +@@ -5333,6 +5333,11 @@ examine_discovered_printer_record(const + /* This is a remote CUPS queue or class */ + is_cups_queue = 1; + #endif /* HAVE_AVAHI */ ++ /* If we do not have a TXT record the printer was not discovered via ++ DNS-SD but via CUPS legacy or LDAP, so it is a remote CUPS queue ++ and not an IPP network printer. */ ++ if (txt == NULL) ++ is_cups_queue = 1; + if (is_cups_queue) { + debug_printf("Found CUPS queue/class: %s on host %s.\n", + strchr(resource, '/') + 1, remote_host); diff --git a/cups-filters.spec b/cups-filters.spec index d2a2f3b..b9d6108 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -22,6 +22,9 @@ Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{versio Patch01: cups-filters-createall.patch +# upstream patches, remove with new release +Patch100: cups-filters-no-txt.patch + Requires: cups-filters-libs%{?_isa} = %{version}-%{release} # gcc and gcc-c++ is not in buildroot by default @@ -112,8 +115,11 @@ This is the development package for OpenPrinting CUPS filters and backends. %prep %setup -q +# set LocalQueueNamingRemoteCUPS and CreateIPPPrinterQueues by default %patch01 -p1 -b .createall +# discover remote CUPS queues and LDAP queues (upstream https://github.com/OpenPrinting/cups-filters/issues/34) +%patch100 -p1 -b .no-txt %build # work-around Rpath @@ -288,6 +294,7 @@ fi %changelog * Wed Apr 04 2018 Zdenek Dohnal - 1.20.2-1 - 1.20.2 +- fixing discovering of remote CUPS queues and LDAP queues * Fri Mar 23 2018 Marek Kasik - 1.20.1-4 - Rebuild for poppler-0.63.0