fixing discovering of remote CUPS queues and LDAP queues

This commit is contained in:
Zdenek Dohnal 2018-04-05 08:16:08 +02:00
parent b5d9adf81e
commit 12094716ea
2 changed files with 22 additions and 0 deletions

15
cups-filters-no-txt.patch Normal file
View File

@ -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);

View File

@ -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 <zdohnal@redhat.com> - 1.20.2-1
- 1.20.2
- fixing discovering of remote CUPS queues and LDAP queues
* Fri Mar 23 2018 Marek Kasik <mkasik@redhat.com> - 1.20.1-4
- Rebuild for poppler-0.63.0