This commit is contained in:
Henrik Nordstrom 2010-08-20 15:17:49 +02:00
parent 507bd43922
commit 0021051b4a

View File

@ -3,15 +3,15 @@
## % define __find_requires %{SOURCE99} ## % define __find_requires %{SOURCE99}
Name: squid Name: squid
Version: 3.1.5 Version: 3.1.6
Release: 2%{?dist} Release: 1%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.squid-cache.org URL: http://www.squid-cache.org
Source0: 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 Source1: http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
Source2: squid.init Source2: squid.init
Source3: squid.logrotate Source3: squid.logrotate
Source4: squid.sysconfig Source4: squid.sysconfig
@ -21,10 +21,7 @@ Source98: perl-requires-squid.sh
## Source99: filter-requires-squid.sh ## Source99: filter-requires-squid.sh
# Upstream patches # Upstream patches
Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10017.patch #Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXXX.patch
Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10018.patch
Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10019.patch
Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10021.patch
# Local patches # Local patches
# Applying upstream patches first makes it less likely that local patches # Applying upstream patches first makes it less likely that local patches
@ -74,10 +71,6 @@ lookup program (dnsserver), a program for retrieving FTP data
%setup -q %setup -q
#patch001 -p0 #patch001 -p0
%patch001 -p0
%patch002 -p0
%patch003 -p0
%patch004 -p0
%patch201 -p1 -b .config %patch201 -p1 -b .config
%patch202 -p1 -b .location %patch202 -p1 -b .location
@ -269,6 +262,10 @@ fi
%changelog %changelog
* Fri Aug 20 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.6-1
- Upstream 3.1.6 bugfix release
- Build with system libtool-ltdl
* Thu Jul 15 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.5-2 * Thu Jul 15 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.5-2
- Upstream 3.1.5 bugfix release - Upstream 3.1.5 bugfix release
- Upstream patch for Bug #614665: Squid crashes with ident auth - Upstream patch for Bug #614665: Squid crashes with ident auth