rpms/cups/FC-4 cups-CVE-2005-3625, 6, 7.patch, NONE, 1.1 cups.spec, 1.104, 1.105

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv30490

Modified Files:
	cups.spec 
Added Files:
	cups-CVE-2005-3625,6,7.patch 
Log Message:
* Wed Jan  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.1.23-15.3
- Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627
  (bug #176868).


***** Not enough context to create diffstat for file: cups-CVE-2005-3625,6,7.patch,NONE,1.1
***** Not enough context to create diff for file: cups-CVE-2005-3625,6,7.patch,NONE,1.1

Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-4/cups.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- cups.spec	14 Dec 2005 17:33:53 -0000	1.104
+++ cups.spec	4 Jan 2006 18:36:21 -0000	1.105
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.23
-Release: 15.2
+Release: 15.3
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2
@@ -49,7 +49,8 @@
 Patch33: cups-CAN-2004-0888.patch
 Patch34: cups-CAN-2005-2097.patch
 Patch35: cups-CVE-2005-3191_2_3.patch
-Patch36: cups-dbus.patch
+Patch36: cups-CVE-2005-3625,6,7.patch
+Patch37: cups-dbus.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -143,8 +144,9 @@
 %patch33 -p1 -b .CAN-2004-0888
 %patch34 -p1 -b .CAN-2005-2097
 %patch35 -p1 -b .CVE-2005-3191_2_3
+%patch36 -p1 -b .CVE-2005-3625,6,7
 %if %use_dbus
-%patch36 -p1 -b .dbus
+%patch37 -p1 -b .dbus
 %endif
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
@@ -409,6 +411,10 @@
 %{_libdir}/cups/daemon/cups-lpd
 
 %changelog
+* Wed Jan  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.1.23-15.3
+- Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627
+  (bug #176868).
+
 * Wed Dec 14 2005 Tim Waugh <twaugh at redhat.com> 1:1.1.23-15.2
 - Applied patch to fix CVE-2005-3191/2/3 (bug #175646).