diff --git a/.gitignore b/.gitignore index fef8309..f57d089 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ squid-3.1-10021.patch /squid-3.2.0.14.tar.bz2 /squid-3.2.0.14.tar.bz2.asc /squid-3.2-11480.patch +/squid-3.2-11494.patch +/squid-3.2-11496.patch diff --git a/sources b/sources index 5a0ada5..f9508ad 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ b71beaa91e8d0a9f89956ac3685478a8 squid-3.2.0.14.tar.bz2 d05ae51cde36421424214d4be7938847 squid-3.2.0.14.tar.bz2.asc 4b5c832c50e511e7af4a5b8ee1791d70 squid-3.2-11480.patch +cc8598d73b87db0257dffcab356807de squid-3.2-11494.patch +8f4feabaf26a30d07fcbb225285d5922 squid-3.2-11496.patch diff --git a/squid.spec b/squid.spec index 1f49a37..8ccc9e8 100644 --- a/squid.spec +++ b/squid.spec @@ -4,7 +4,7 @@ Name: squid Version: 3.2.0.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code @@ -25,12 +25,11 @@ Source98: perl-requires-squid.sh # Upstream patches Patch001: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11480.patch +Patch002: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11494.patch +Patch003: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11496.patch # Backported patches -# RHBZ #772483 -# http://www.squid-cache.org/Versions/v3/3.HEAD/changesets/squid-3-11969.patch -# http://www.squid-cache.org/Versions/v3/3.HEAD/changesets/squid-3-11970.patch -Patch101: squid-3.2-mem_node.patch +#Patch101: squid-3.2-mem_node.patch # Local patches # Applying upstream patches first makes it less likely that local patches @@ -41,7 +40,6 @@ Patch203: squid-3.0.STABLE1-perlpath.patch Patch204: squid-3.2.0.9-fpic.patch Patch205: squid-3.1.9-ltdl.patch Patch206: squid-3.2.0.13-errname.patch -Patch207: squid-3.2.0.14-gcc47.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: bash >= 2.0 @@ -97,9 +95,11 @@ The squid-sysvinit contains SysV initscritps support. # Upstream patches %patch001 -p0 +%patch002 -p0 +%patch003 -p0 # Backported patches -%patch101 -p1 -b .mem_node +#patch101 -p1 -b .mem_node # Local patches %patch201 -p1 -b .config @@ -108,7 +108,6 @@ The squid-sysvinit contains SysV initscritps support. %patch204 -p1 -b .fpic %patch205 -p1 -b .ltdl %patch206 -p1 -b .errname -%patch207 -p1 -b .gcc47 %build %ifarch sparcv9 sparc64 s390 s390x @@ -316,6 +315,9 @@ fi /sbin/chkconfig --add squid >/dev/null 2>&1 || : %changelog +* Wed Feb 01 2012 Henrik Nordstrom - 7:3.2.0.14-7 +- update with upstreamed patch versions + * Tue Jan 17 2012 Henrik Nordstrom - 7:3.2.0.14-6 - upstream gcc-4.7 patch - fix for bug #772483 running out of memory, mem_node growing out of bounds