Backport OpenSSL 1.0 fix from HEAD

This commit is contained in:
Henrik Nordström 2010-02-25 13:28:01 +00:00
parent ba07d10e8d
commit c937a1c67b
3 changed files with 6 additions and 4 deletions

View File

@ -1,2 +1,3 @@
squid-3.1.0.17.tar.bz2 squid-3.1.0.17.tar.bz2
squid-3.1.0.17.tar.bz2.asc squid-3.1.0.17.tar.bz2.asc
squid-3-10294.patch

View File

@ -1,2 +1,3 @@
5acabbc26f52363389703a8ce510c88d squid-3.1.0.17.tar.bz2 5acabbc26f52363389703a8ce510c88d squid-3.1.0.17.tar.bz2
f70d58df04ffc2d92d89e90f8e62352b squid-3.1.0.17.tar.bz2.asc f70d58df04ffc2d92d89e90f8e62352b squid-3.1.0.17.tar.bz2.asc
4dad838e5d3571b47713e83144525950 squid-3-10294.patch

View File

@ -4,7 +4,7 @@
Name: squid Name: squid
Version: 3.1.0.17 Version: 3.1.0.17
Release: 1%{?dist} Release: 2%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
License: GPLv2 License: GPLv2
@ -21,7 +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-XXXX.patch Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10294.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
@ -70,7 +70,7 @@ lookup program (dnsserver), a program for retrieving FTP data
%prep %prep
%setup -q %setup -q
#patch001 -p0 -b .3.1-xxxx %patch001 -p0 -b .3-10294
%patch201 -p1 -b .config %patch201 -p1 -b .config
%patch202 -p1 -b .location %patch202 -p1 -b .location
@ -262,7 +262,7 @@ fi
%changelog %changelog
* Thu Feb 25 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.17-1 * Thu Feb 25 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.17-2
- Upgrade to 3.1.0.17 - Upgrade to 3.1.0.17
* Thu Feb 18 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.16-7 * Thu Feb 18 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.16-7