rpms/cups/F-8 .cvsignore, 1.37, 1.38 cups.spec, 1.377, 1.378 pstoraster, 1.2, 1.3 sources, 1.40, 1.41 cups-CVE-2007-4352, 5392, 5393.patch, 1.1, NONE cups-str2600.patch, 1.1, NONE

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	.cvsignore cups.spec pstoraster sources 
Removed Files:
	cups-CVE-2007-4352,5392,5393.patch cups-str2600.patch 
Log Message:
* Thu Jan  3 2008 Tim Waugh <twaugh at redhat.com> 1.3.5-1
- 1.3.5.  No longer need str2600, CVE-2007-4352,5392,5393 patches.
- Efficiency fix for pstoraster (bug #416871).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	1 Nov 2007 15:50:27 -0000	1.37
+++ .cvsignore	3 Jan 2008 16:16:13 -0000	1.38
@@ -29,3 +29,4 @@
 cups-1.3.2-source.tar.bz2
 cups-1.3.3-source.tar.bz2
 cups-1.3.4-source.tar.bz2
+cups-1.3.5-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- cups.spec	30 Nov 2007 09:23:37 -0000	1.377
+++ cups.spec	3 Jan 2008 16:16:13 -0000	1.378
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.4
-Release: 4%{?dist}
+Version: 1.3.5
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -41,12 +41,10 @@
 Patch15: cups-undo-str2537.patch
 Patch16: cups-pid.patch
 Patch17: cups-foomatic-recommended.patch
-Patch18: cups-str2600.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
 Patch25: cups-usb-paperout.patch
-Patch26: cups-CVE-2007-4352,5392,5393.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -154,12 +152,10 @@
 %patch15 -p1 -b .undo-str2537
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .foomatic-recommended
-%patch18 -p1 -b .str2600
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
 %patch25 -p1 -b .usb-paperout
-%patch26 -p1 -b .CVE-2007-4352,5392,5393
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -451,6 +447,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jan  3 2008 Tim Waugh <twaugh at redhat.com> 1.3.5-1
+- 1.3.5.  No longer need str2600, CVE-2007-4352,5392,5393 patches.
+- Efficiency fix for pstoraster (bug #416871).
+
 * Fri Nov 30 2007 Tim Waugh <twaugh at redhat.com>
 - CVE-2007-4045 patch is not necessarily because cupsd_client_t objects are
   not moved in array operations, only pointers to them.


Index: pstoraster
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/pstoraster,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pstoraster	9 Sep 2004 04:01:05 -0000	1.2
+++ pstoraster	3 Jan 2008 16:16:13 -0000	1.3
@@ -46,7 +46,7 @@
 
 # See if we have a filename on the command-line...
 if test -z "$6"; then
-	ifile="-"
+	ifile="-_"
 else
 	ifile="$6"
 fi


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	1 Nov 2007 15:50:27 -0000	1.40
+++ sources	3 Jan 2008 16:16:13 -0000	1.41
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-4bd20d69bb083b42632346a383b6aefb  cups-1.3.4-source.tar.bz2
+355705c528e9a8d0d439da15454d79a6  cups-1.3.5-source.tar.bz2

***** Not enough context to create diffstat for file: cups-CVE-2007-4352,5392,5393.patch,1.1,NONE
***** Not enough context to create diff for file: cups-CVE-2007-4352,5392,5393.patch,1.1,NONE

--- cups-str2600.patch DELETED ---