From 39a113db4fa2a33e214f9d19d017ee7f15742f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= Date: Mon, 15 Mar 2010 09:11:33 +0000 Subject: [PATCH] 3.1.0.18 --- .cvsignore | 6 ++---- sources | 6 ++---- squid.spec | 13 +++++++------ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2b2354b..8a1e276 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,2 @@ -squid-3.1.0.17.tar.bz2 -squid-3.1.0.17.tar.bz2.asc -squid-3.1-9896.patch -squid-3.1-9897.patch +squid-3.1.0.18.tar.bz2 +squid-3.1.0.18.tar.bz2.asc diff --git a/sources b/sources index 0ca2ad7..3777fdb 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -5acabbc26f52363389703a8ce510c88d squid-3.1.0.17.tar.bz2 -f70d58df04ffc2d92d89e90f8e62352b squid-3.1.0.17.tar.bz2.asc -e3734a3334586883eeb7df3163c2de12 squid-3.1-9896.patch -bcc79c6c068e097dc7c05609962ded6b squid-3.1-9897.patch +8792f4d8e94398484b8d018105e6ae91 squid-3.1.0.18.tar.bz2 +44721bf715bf3d4fd626e41929ec6093 squid-3.1.0.18.tar.bz2.asc diff --git a/squid.spec b/squid.spec index 2554820..165e093 100644 --- a/squid.spec +++ b/squid.spec @@ -3,8 +3,8 @@ ## % define __find_requires %{SOURCE99} Name: squid -Version: 3.1.0.17 -Release: 3%{?dist} +Version: 3.1.0.18 +Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 License: GPLv2 @@ -21,8 +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-9896.patch -Patch02: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9897.patch +#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXX.patch # Local patches # Applying upstream patches first makes it less likely that local patches @@ -71,8 +70,7 @@ lookup program (dnsserver), a program for retrieving FTP data %prep %setup -q -%patch001 -p0 -b .3.1-9896 -%patch002 -p0 -b .3.1-9897 +#patch001 -p0 -b .3.1-XXXX %patch201 -p1 -b .config %patch202 -p1 -b .location @@ -264,6 +262,9 @@ fi %changelog +* Mon Mar 15 2010 Henrik Nordstrom - 7:3.1.0.18-1 +- Upgrade to 3.1.0.18 fixing Digest authentication and improved HTTP/1.1 support + * Sun Feb 28 2010 Henrik Nordstrom - 7:3.1.0.17-3 - Bug 569120, fails to open unbound ipv4 listening sockets