rpms/squid/F-12 .cvsignore, 1.56, 1.57 sources, 1.59, 1.60 squid.spec, 1.157, 1.158

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26536

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Patch for Squid security advisory SQUID-2010:2, denial of service issue in HTCP processing


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	6 Feb 2010 23:32:46 -0000	1.56
+++ .cvsignore	18 Feb 2010 01:54:15 -0000	1.57
@@ -1,2 +1,4 @@
 squid-3.1.0.16.tar.bz2
 squid-3.1.0.16.tar.bz2.asc
+squid-3.1-9881.patch
+squid-3.1-9882.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	6 Feb 2010 23:32:46 -0000	1.59
+++ sources	18 Feb 2010 01:54:15 -0000	1.60
@@ -1,2 +1,4 @@
 e795d79cf37ec91f59d09c6804a2555b  squid-3.1.0.16.tar.bz2
 454d2e4205e1b3d4444b057fa417973b  squid-3.1.0.16.tar.bz2.asc
+3c6cc1e7feac49fed423d5fd56ac3fa4  squid-3.1-9881.patch
+e0e7cb7f286efcf9c027aec904674f55  squid-3.1-9882.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/squid.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- squid.spec	6 Feb 2010 23:32:47 -0000	1.157
+++ squid.spec	18 Feb 2010 01:54:15 -0000	1.158
@@ -4,13 +4,13 @@
 
 Name:     squid
 Version:  3.1.0.16
-Release:  5%{?dist}
+Release:  6%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
 Group:    System Environment/Daemons
 URL:      http://www.squid-cache.org
-Source:   http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2
+Source0:  http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2
 Source1:  http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
 Source2:  squid.init
 Source3:  squid.logrotate
@@ -21,7 +21,8 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9881.patch
+Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9882.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -69,7 +70,8 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-#patch001 -p0 -b .3.1-XXXX
+%patch001 -p0 -b .3.1-9881
+%patch002 -p0 -b .3.1-9882
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -256,6 +258,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Feb 15 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.16-6
+- Patch for Squid security advisory SQUID-2010:2, denial of service
+  issue in HTCP processing (CVE-2010-0639)
+
 * Sun Feb 07 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.16-5
 - Rebuild 3.1.0.16 with corrected upstream release.