rpms/cups/devel cups-strict-ppd-line-length.patch, NONE, 1.1 cups.spec, 1.378, 1.379
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Wed Jan 9 17:47:23 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22156
Modified Files:
cups.spec
Added Files:
cups-strict-ppd-line-length.patch
Log Message:
* Wed Jan 9 2008 Tim Waugh <twaugh at 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).
cups-strict-ppd-line-length.patch:
--- NEW FILE cups-strict-ppd-line-length.patch ---
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...
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- cups.spec 9 Jan 2008 12:17:54 -0000 1.378
+++ cups.spec 9 Jan 2008 17:46:46 -0000 1.379
@@ -44,6 +44,7 @@
Patch19: cups-eggcups.patch
Patch20: cups-getpass.patch
Patch21: cups-driverd-timeout.patch
+Patch22: cups-strict-ppd-line-length.patch
Patch25: cups-usb-paperout.patch
Patch100: cups-lspp.patch
Epoch: 1
@@ -155,6 +156,7 @@
%patch19 -p1 -b .eggcups
%patch20 -p1 -b .getpass
%patch21 -p1 -b .driverd-timeout
+%patch22 -p1 -b .strict-ppd-line-length
%patch25 -p1 -b .usb-paperout
%if %lspp
@@ -448,6 +450,9 @@
%changelog
* Wed Jan 9 2008 Tim Waugh <twaugh at 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).
* Thu Jan 3 2008 Tim Waugh <twaugh at redhat.com>
More information about the fedora-extras-commits
mailing list