rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Apply patch to prevent overlong PPD lines from causing failures except in

Browse Source 
strict mode (bug #405061). Needed for compatibility with older versions
    of foomatic (e.g. Red Hat Enterprise Linux 3/4).
This commit is contained in:
Tim Waugh 2008-01-09 17:46:46 +00:00
parent 2179c4bb4e
commit 93acf3de8a
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cups-strict-ppd-line-length.patch Normal file
View File

@ -0,0 +1,30 @@
diff -up cups-1.3.5/cups/ppd.c~ cups-1.3.5/cups/ppd.c
--- cups-1.3.5/cups/ppd.c~ 2007-11-30 19:29:50.000000000 +0000
+++ cups-1.3.5/cups/ppd.c 2008-01-09 12:08:48.000000000 +0000
@@ -2801,7 +2801,7 @@ ppd_read(cups_file_t *fp, /* I - Fil
*lineptr++ = ch;
col ++;
- if (col > (PPD_MAX_LINE - 1))
+ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT)
{
/*
* Line is too long...
@@ -2868,7 +2868,7 @@ ppd_read(cups_file_t *fp, /* I - Fil
{
col ++;
- if (col > (PPD_MAX_LINE - 1))
+ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT)
{
/*
* Line is too long...
@@ -2931,7 +2931,7 @@ ppd_read(cups_file_t *fp, /* I - Fil
{
col ++;
- if (col > (PPD_MAX_LINE - 1))
+ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT)
{
/*
* Line is too long...

5
cups.spec
View File

@ -44,6 +44,7 @@ Patch18: cups-str2650.patch
Patch19: cups-eggcups.patch Patch19: cups-eggcups.patch
Patch20: cups-getpass.patch Patch20: cups-getpass.patch
Patch21: cups-driverd-timeout.patch Patch21: cups-driverd-timeout.patch
Patch22: cups-strict-ppd-line-length.patch
Patch25: cups-usb-paperout.patch Patch25: cups-usb-paperout.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
Epoch: 1 Epoch: 1
@ -155,6 +156,7 @@ lpd emulation.
%patch19 -p1 -b .eggcups %patch19 -p1 -b .eggcups
%patch20 -p1 -b .getpass %patch20 -p1 -b .getpass
%patch21 -p1 -b .driverd-timeout %patch21 -p1 -b .driverd-timeout
%patch22 -p1 -b .strict-ppd-line-length
%patch25 -p1 -b .usb-paperout %patch25 -p1 -b .usb-paperout
%if %lspp %if %lspp
@ -448,6 +450,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Jan 9 2008 Tim Waugh <twaugh@redhat.com> * Wed Jan 9 2008 Tim Waugh <twaugh@redhat.com>
- Apply patch to prevent overlong PPD lines from causing failures except
in strict mode (bug #405061). Needed for compatibility with older
versions of foomatic (e.g. Red Hat Enterprise Linux 3/4).
- Applied upstream patch to fix cupsctl --remote-any (bug #421411, STR #2650). - Applied upstream patch to fix cupsctl --remote-any (bug #421411, STR #2650).
* Thu Jan 3 2008 Tim Waugh <twaugh@redhat.com> * Thu Jan 3 2008 Tim Waugh <twaugh@redhat.com>