From c937a1c67b30e43fc837ed74ebaa2ad0cab711f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= Date: Thu, 25 Feb 2010 13:28:01 +0000 Subject: [PATCH] Backport OpenSSL 1.0 fix from HEAD --- .cvsignore | 1 + sources | 1 + squid.spec | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 45f4d49..bb225b7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ squid-3.1.0.17.tar.bz2 squid-3.1.0.17.tar.bz2.asc +squid-3-10294.patch diff --git a/sources b/sources index e0b4f10..5d51427 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 5acabbc26f52363389703a8ce510c88d squid-3.1.0.17.tar.bz2 f70d58df04ffc2d92d89e90f8e62352b squid-3.1.0.17.tar.bz2.asc +4dad838e5d3571b47713e83144525950 squid-3-10294.patch diff --git a/squid.spec b/squid.spec index 929c3af..742f7dc 100644 --- a/squid.spec +++ b/squid.spec @@ -4,7 +4,7 @@ Name: squid Version: 3.1.0.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Squid proxy caching server Epoch: 7 License: GPLv2 @@ -21,7 +21,7 @@ Source98: perl-requires-squid.sh ## Source99: filter-requires-squid.sh # 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 # 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 %setup -q -#patch001 -p0 -b .3.1-xxxx +%patch001 -p0 -b .3-10294 %patch201 -p1 -b .config %patch202 -p1 -b .location @@ -262,7 +262,7 @@ fi %changelog -* Thu Feb 25 2010 Henrik Nordstrom - 7:3.1.0.17-1 +* Thu Feb 25 2010 Henrik Nordstrom - 7:3.1.0.17-2 - Upgrade to 3.1.0.17 * Thu Feb 18 2010 Henrik Nordstrom - 7:3.1.0.16-7