1848575 - [cups, cups-filters] PPD generators creates invalid cupsManualCopies entry

This commit is contained in:
Zdenek Dohnal 2020-07-20 15:21:05 +02:00
parent 9fab8ac248
commit 302ef5ca7a
2 changed files with 21 additions and 1 deletions

13
cups-manual-copies.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index b1b53e4..84a1b88 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -3179,7 +3179,7 @@ _ppdCreateFromIPP(char *buffer, /* I - Filename buffer */
cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 10 -\"\n");
}
else
- cupsFilePuts(fp, "*cupsManualCopies: true\n");
+ cupsFilePuts(fp, "*cupsManualCopies: True\n");
if (is_apple)
cupsFilePuts(fp, "*cupsFilter2: \"image/urf image/urf 100 -\"\n");
if (is_pwg)

View File

@ -15,7 +15,7 @@ Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 2.2.12
Release: 10%{?dist}
Release: 11%{?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
@ -118,6 +118,9 @@ Patch46: cups-etimedout.patch
Patch47: cups-webui-uri.patch
# ipptool doesn't support mdns uris
Patch48: cups-ipptool-mdns-uri.patch
# ppd generator creates invalid cupsManualCopies entry, causing
# copies being ignored in driverless printing
Patch49: cups-manual-copies.patch
##### Patches removed because IMHO they aren't no longer needed
##### but still I'll leave them in git in case their removal
@ -377,6 +380,7 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch46 -p1 -b .etimedout
%patch47 -p1 -b .webui-uri
%patch48 -p1 -b .ipptool-mdns-uri
%patch49 -p1 -b .manual-copies
# if cupsd is set to log into /var/log/cups, then 'MaxLogSize 0' needs to be
# in cupsd.conf to disable cupsd logrotate functionality and use logrotated
@ -790,6 +794,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
* Mon Jul 20 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.12-11
- 1848575 - [cups, cups-filters] PPD generators creates invalid cupsManualCopies entry
* Mon Jun 08 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.12-10
- cgi script sets a bad uri when creating print queue via web ui
- ipptool doesn't support mDNS uris