rpms/cups/F-10 cups-str2831.patch,NONE,1.1 cups.spec,1.450,1.451

[Tim Waugh]

Author: twaugh

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

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-6
- 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-09 12:11:55.000000000 +0000
+++ cups-1.3.9/filter/pstops.c	2008-12-09 12:12:19.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-10/cups.spec,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- cups.spec	8 Dec 2008 18:43:37 -0000	1.450
+++ cups.spec	9 Dec 2008 12:14:31 -0000	1.451
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.9
-Release: 5%{?svn:.svn%{svn}}%{?dist}
+Release: 6%{?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 @@
 Patch26: cups-str3023.patch
 Patch27: cups-CVE-2008-5183.patch
 Patch28: cups-CVE-2008-5286.patch
+Patch29: cups-str2831.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -190,6 +191,7 @@
 %patch26 -p1 -b .str3023
 %patch27 -p1 -b .CVE-2008-5183
 %patch28 -p1 -b .CVE-2008-5286
+%patch29 -p1 -b .str2831
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -478,6 +480,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Dec  9 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-6
+- Attempt to unbreak the fix for STR #2831 (bug #474742).
+
 * Mon Dec  8 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-5
 - Removed dnssd backend as it was causing problems (bug #475230).