This commit is contained in:
Henrik Nordstrom 2011-08-29 08:24:34 +02:00
parent 811bcccc57
commit 895bce2cf3
3 changed files with 13 additions and 8 deletions

2
.gitignore vendored
View File

@ -22,3 +22,5 @@ squid-3.1-10021.patch
/squid-3.2.0.9.tar.bz2
/squid-3.2.0.10.tar.bz2
/squid-3.2.0.10.tar.bz2.asc
/squid-3.2.0.11.tar.bz2
/squid-3.2.0.11.tar.bz2.asc

View File

@ -1,2 +1,2 @@
0f893253d58c04c3498272ad15b20902 squid-3.2.0.10.tar.bz2
c4fb36efe9a436d5dc3bf2b6c4b012e9 squid-3.2.0.10.tar.bz2.asc
51d8434bb2f036d993d6b3ddb047afd7 squid-3.2.0.11.tar.bz2
f9d2bc564e1288662ae81424471214f3 squid-3.2.0.11.tar.bz2.asc

View File

@ -3,7 +3,7 @@
## % define __find_requires %{SOURCE99}
Name: squid
Version: 3.2.0.10
Version: 3.2.0.11
Release: 3%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
@ -11,8 +11,8 @@ Epoch: 7
License: GPLv2+ and (LGPLv2+ and MIT and BSD and Public Domain)
Group: System Environment/Daemons
URL: http://www.squid-cache.org
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
Source0: http://www.squid-cache.org/Versions/v3/3.2/squid-%{version}.tar.bz2
Source1: http://www.squid-cache.org/Versions/v3/3.2/squid-%{version}.tar.bz2.asc
Source2: squid.init
Source3: squid.logrotate
Source4: squid.sysconfig
@ -23,7 +23,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-11294.patch
#Patch001: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-XXXXX.patch
# Local patches
# Applying upstream patches first makes it less likely that local patches
@ -86,7 +86,7 @@ The squid-sysvinit contains SysV initscritps support.
%prep
%setup -q
%patch001 -p0
#patch001 -p0
%patch201 -p1 -b .config
%patch202 -p1 -b .location
@ -296,7 +296,10 @@ fi
/sbin/chkconfig --add squid >/dev/null 2>&1 || :
%changelog
* Sat Aug 27 2011 Henrik Nordstrom <henrik@henriknordstrom.net> - 3.2.0.10-3
* Mon Aug 29 2011 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.2.0.11-3
- update to latest upstream 3.2.0.11
* Sat Aug 27 2011 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.2.0.10-3
- Fix for SQUID-2011:3 Gopher vulnerability
* Thu Aug 18 2011 Jiri Skala <jskala@redhat.com> - 7:3.2.0.10-2