rpms/cups/F-8 cups-strict-ppd-line-length.patch, NONE, 1.1 cups.spec, 1.379, 1.380

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22097

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/F-8/cups.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- cups.spec	9 Jan 2008 12:15:57 -0000	1.379
+++ cups.spec	9 Jan 2008 17:45:36 -0000	1.380
@@ -45,6 +45,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
@@ -157,6 +158,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
@@ -450,6 +452,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> 1.3.5-1