diff --git a/.cvsignore b/.cvsignore index 9843615..36ac628 100644 --- a/.cvsignore +++ b/.cvsignore @@ -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 diff --git a/sources b/sources index 5b474a6..1fd4ad8 100644 --- a/sources +++ b/sources @@ -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 diff --git a/squid.spec b/squid.spec index 9db1825..806b072 100644 --- a/squid.spec +++ b/squid.spec @@ -4,7 +4,7 @@ Name: squid Version: 3.1.0.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Squid proxy caching server Epoch: 7 License: GPLv2 @@ -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 @@ -68,7 +69,8 @@ lookup program (dnsserver), a program for retrieving FTP data %prep %setup -q -#patch001 -p0 -b .3.1-XXXX +%patch001 -p0 -b .3.1-9881 +%patch002 -p0 -b .3.1-9883 %patch201 -p1 -b .config %patch202 -p1 -b .location @@ -259,6 +261,10 @@ fi %changelog +* Sun Feb 14 2010 Henrik Nordstrom - 7:3.1.0.16-6 +- Patch for Squid security advisory SQUID-2010:2, denial of service + issue in HTCP processing + * Sun Feb 07 2010 Henrik Nordstrom - 7:3.1.0.16-5 - Rebuild 3.1.0.16 with corrected upstream release.