From fb7071356702fc76aa5ce66c8bf1602302bd9237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= Date: Sun, 28 Feb 2010 22:09:48 +0000 Subject: [PATCH] Bug 569120, fails to open unbound ipv4 listening sockets --- .cvsignore | 3 ++- sources | 3 ++- squid.spec | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index bb225b7..2b2354b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ squid-3.1.0.17.tar.bz2 squid-3.1.0.17.tar.bz2.asc -squid-3-10294.patch +squid-3.1-9896.patch +squid-3.1-9897.patch diff --git a/sources b/sources index 5d51427..0ca2ad7 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 5acabbc26f52363389703a8ce510c88d squid-3.1.0.17.tar.bz2 f70d58df04ffc2d92d89e90f8e62352b squid-3.1.0.17.tar.bz2.asc -4dad838e5d3571b47713e83144525950 squid-3-10294.patch +e3734a3334586883eeb7df3163c2de12 squid-3.1-9896.patch +bcc79c6c068e097dc7c05609962ded6b squid-3.1-9897.patch diff --git a/squid.spec b/squid.spec index 742f7dc..2554820 100644 --- a/squid.spec +++ b/squid.spec @@ -4,7 +4,7 @@ Name: squid Version: 3.1.0.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Squid proxy caching server Epoch: 7 License: GPLv2 @@ -21,7 +21,8 @@ Source98: perl-requires-squid.sh ## Source99: filter-requires-squid.sh # Upstream patches -Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10294.patch +Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9896.patch +Patch02: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9897.patch # Local patches # Applying upstream patches first makes it less likely that local patches @@ -70,7 +71,8 @@ lookup program (dnsserver), a program for retrieving FTP data %prep %setup -q -%patch001 -p0 -b .3-10294 +%patch001 -p0 -b .3.1-9896 +%patch002 -p0 -b .3.1-9897 %patch201 -p1 -b .config %patch202 -p1 -b .location @@ -262,6 +264,9 @@ fi %changelog +* Sun Feb 28 2010 Henrik Nordstrom - 7:3.1.0.17-3 +- Bug 569120, fails to open unbound ipv4 listening sockets + * Thu Feb 25 2010 Henrik Nordstrom - 7:3.1.0.17-2 - Upgrade to 3.1.0.17