From f85782e6be9c78f8837b2ce02a862600c5dd0bd1 Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Mon, 6 Feb 2012 08:11:03 +0100 Subject: [PATCH] 4.3.0.15 --- .gitignore | 2 ++ sources | 7 ++----- squid.spec | 15 +++++++-------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index f57d089..bbf2c02 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ squid-3.1-10021.patch /squid-3.2-11480.patch /squid-3.2-11494.patch /squid-3.2-11496.patch +/squid-3.2.0.15.tar.bz2 +/squid-3.2.0.15.tar.bz2.asc diff --git a/sources b/sources index f9508ad..3243411 100644 --- a/sources +++ b/sources @@ -1,5 +1,2 @@ -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 +fae515eb44aa31de73529934d5fb07ce squid-3.2.0.15.tar.bz2 +73ad45a33685876b9cbe635e7bed457d squid-3.2.0.15.tar.bz2.asc diff --git a/squid.spec b/squid.spec index 8ccc9e8..e60822a 100644 --- a/squid.spec +++ b/squid.spec @@ -3,8 +3,8 @@ ## % define __find_requires %{SOURCE99} Name: squid -Version: 3.2.0.14 -Release: 7%{?dist} +Version: 3.2.0.15 +Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code @@ -24,9 +24,7 @@ Source98: perl-requires-squid.sh ## Source99: filter-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 +#Patch001: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11480.patch # Backported patches #Patch101: squid-3.2-mem_node.patch @@ -94,9 +92,7 @@ The squid-sysvinit contains SysV initscritps support. %setup -q # Upstream patches -%patch001 -p0 -%patch002 -p0 -%patch003 -p0 +#patch001 -p0 # Backported patches #patch101 -p1 -b .mem_node @@ -315,6 +311,9 @@ fi /sbin/chkconfig --add squid >/dev/null 2>&1 || : %changelog +* Mon Feb 06 2012 Henrik Nordstrom - 7: 3.2.0.15-1 +- Upstream 3.2.0.15 bugfix release + * Wed Feb 01 2012 Henrik Nordstrom - 7:3.2.0.14-7 - update with upstreamed patch versions