pool/cups
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 597767 from home:jsmeix:branches:Printing

Browse Source 
CUPS bugfix for https://github.com/apple/cups/issues/5296 (follow-up of boo#936309 and bsc#577936 starting at comment 13)

OBS-URL: https://build.opensuse.org/request/show/597767
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=349
This commit is contained in:
Johannes Meixner 2018-04-18 12:39:26 +00:00 committed by Git OBS Bridge
parent 83580d13b3
commit f9ebe8e151
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cups.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Apr 18 13:44:46 CEST 2018 - jsmeix@suse.de
- issue5296_fix_policy_limits_using_All.patch fixes
https://github.com/apple/cups/issues/5296
by only the actually relevant part of
https://github.com/apple/cups/commit/0873f681e43c04972b3d6bc90bdbdedb29e6e913
(follow-up of boo#936309 and bsc#577936 starting at comment 13)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 28 13:58:32 CEST 2018 - jsmeix@suse.de Wed Mar 28 13:58:32 CEST 2018 - jsmeix@suse.de

8
cups.spec
View File

@ -47,6 +47,10 @@ Source106: Postscript-level2.ppd.gz
Source108: cups-client.conf Source108: cups-client.conf
Source109: baselibs.conf Source109: baselibs.conf
# Patch0...Patch9 is for patches from upstream: # Patch0...Patch9 is for patches from upstream:
# Patch1 fixes CUPS upstream isssue https://github.com/apple/cups/issues/5296
# by only the actually relevant part of CUPS upstream commit
# https://github.com/apple/cups/commit/0873f681e43c04972b3d6bc90bdbdedb29e6e913
Patch1: issue5296_fix_policy_limits_using_All.patch
# Source10...Source99 is for sources from SUSE which are intended for upstream: # Source10...Source99 is for sources from SUSE which are intended for upstream:
# Patch10...Patch99 is for patches from SUSE which are intended for upstream: # Patch10...Patch99 is for patches from SUSE which are intended for upstream:
# Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl: # Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl:
@ -296,6 +300,10 @@ printer drivers for CUPS.
%prep %prep
%setup -q %setup -q
# Patch0...Patch9 is for patches from upstream: # Patch0...Patch9 is for patches from upstream:
# Patch1 fixes CUPS upstream isssue https://github.com/apple/cups/issues/5296
# by only the actually relevant part of CUPS upstream commit
# https://github.com/apple/cups/commit/0873f681e43c04972b3d6bc90bdbdedb29e6e913
%patch1 -b issue5296_fix_policy_limits_using_All.orig
# Patch10...Patch99 is for patches from SUSE which are intended for upstream: # Patch10...Patch99 is for patches from SUSE which are intended for upstream:
# Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl: # Patch10 cups-2.1.0-choose-uri-template.patch adds 'smb://...' URIs to templates/choose-uri.tmpl:
%patch10 -b choose-uri-template.orig %patch10 -b choose-uri-template.orig

11
issue5296_fix_policy_limits_using_All.patch Normal file
View File

@ -0,0 +1,11 @@
--- scheduler/conf.c.orig 2018-03-23 21:39:17.000000000 +0100
+++ scheduler/conf.c 2018-04-18 13:38:45.000000000 +0200
@@ -3853,7 +3853,7 @@ read_policy(cups_file_t *fp, /* I - Con
if (num_ops < (int)(sizeof(ops) / sizeof(ops[0])))
{
if (!_cups_strcasecmp(value, "All"))
- ops[num_ops] = IPP_ANY_OPERATION;
+ ops[num_ops ++] = IPP_ANY_OPERATION;
else if ((ops[num_ops] = ippOpValue(value)) == IPP_BAD_OPERATION)
cupsdLogMessage(CUPSD_LOG_ERROR,
"Bad IPP operation name \"%s\" on line %d of %s.",