rpms/cups/F-9 cups-str2831.patch,NONE,1.1 cups.spec,1.431,1.432

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32036

Modified Files:
	cups.spec 
Added Files:
	cups-str2831.patch 
Log Message:
* Tue Dec  9 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-3
- Attempt to unbreak the fix for STR #2831 (bug #474742).


cups-str2831.patch:

--- NEW FILE cups-str2831.patch ---
diff -up cups-1.3.9/filter/pstops.c.str2831 cups-1.3.9/filter/pstops.c
--- cups-1.3.9/filter/pstops.c.str2831	2008-12-05 11:13:29.000000000 +0000
+++ cups-1.3.9/filter/pstops.c	2008-12-05 11:13:58.000000000 +0000
@@ -1547,9 +1547,6 @@ copy_page(cups_file_t  *fp,		/* I - File
       else if (!strncmp(line, "%%Include", 9))
 	continue;
 
-      if (line[0] != '%' && !feature)
-        break;
-
       if (!feature || (doc->number_up == 1 && !doc->fitplot))
 	doc_write(doc, line, linelen);
     }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- cups.spec	3 Dec 2008 12:50:20 -0000	1.431
+++ cups.spec	9 Dec 2008 11:14:06 -0000	1.432
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.9
-Release: 2%{?svn:.svn%{svn}}%{?dist}
+Release: 3%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -52,6 +52,7 @@
 Patch25: cups-str3023.patch
 Patch26: cups-CVE-2008-5183.patch
 Patch27: cups-CVE-2008-5286.patch
+Patch28: cups-str2831.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -177,6 +178,7 @@
 %patch25 -p1 -b .str3023
 %patch26 -p1 -b .CVE-2008-5183
 %patch27 -p1 -b .CVE-2008-5286
+%patch28 -p1 -b .str2831
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -459,6 +461,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Dec  9 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-3
+- Attempt to unbreak the fix for STR #2831 (bug #474742).
+
 * Wed Dec  3 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-2
 - Applied patch to fix STR #2974 (bug #473905, CVE-2008-5286,
   CVE-2008-1722).