rpms/squid/devel squid.logrotate,1.4,1.5 squid.spec,1.153,1.154

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4583

Modified Files:
	squid.logrotate squid.spec 
Log Message:
3.1.0.16 DoS fix (Squid-2010:1)


Index: squid.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.logrotate,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- squid.logrotate	18 Sep 2009 00:30:49 -0000	1.4
+++ squid.logrotate	1 Feb 2010 12:32:08 -0000	1.5
@@ -6,7 +6,7 @@
     missingok
     sharedscripts
     postrotate
-      # Asks squid to reopen its logs. (log_rotate 0 is set in squid.conf)
+      # Asks squid to reopen its logs. (logfile_rotate 0 is set in squid.conf)
       # errors redirected to make it silent if squid is not running
       /usr/sbin/squid -k rotate 2>/dev/null
       # Wait a little to allow Squid to catch up before the logs is compressed


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- squid.spec	9 Jan 2010 11:00:43 -0000	1.153
+++ squid.spec	1 Feb 2010 12:32:08 -0000	1.154
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.0.15
-Release:  3%{?dist}
+Version:  3.1.0.16
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -22,11 +22,6 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9816.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9818.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9822.patch
-Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9826.patch
-Patch005: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9827.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -74,11 +69,7 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-%patch001 -p0 -b .9816
-%patch002 -p0 -b .9818
-%patch003 -p0 -b .9822
-%patch004 -p0 -b .9826
-%patch005 -p0 -b .9827
+#patch001 -p0 -b .XXXX
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -265,6 +256,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb 01 2010 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE22-1
+- Upgrade to 3.1.0.16 for DNS related DoS fix (Squid-2010:1)
+
 * Sat Jan 09 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.15-3
 - fixed #551302 PROXY needs libcap. Also increases security a little.
 - merged relevant upstream bugfixes waiting for next 3.1 release