From e2948f4f60483e36e1f208561f3782a68bc195de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= Date: Sat, 1 Aug 2009 11:26:45 +0000 Subject: [PATCH] Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof" --- .cvsignore | 3 +++ sources | 3 +++ squid.spec | 26 ++++++++++++++++++-------- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index f915bb2..d581886 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,4 @@ squid-3.0.STABLE17.tar.bz2 +b9080.patch +b9081.patch +b9082.patch diff --git a/sources b/sources index 94c29cd..8e4fdfe 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ 68b4cdb2590f36e9475e7a8c1c4a4046 squid-3.0.STABLE17.tar.bz2 +b176387a9afcef85ef6467845c999f34 b9080.patch +5948038b5629a9babd9f56ae1a25363e b9081.patch +345873eb1e301a6aa3e70ae8708d0c43 b9082.patch diff --git a/squid.spec b/squid.spec index 22e4bc3..28a4f09 100644 --- a/squid.spec +++ b/squid.spec @@ -4,7 +4,7 @@ Name: squid Version: 3.0.STABLE17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Squid proxy caching server Epoch: 7 License: GPLv2+ @@ -22,6 +22,10 @@ Source98: perl-requires-squid.sh # Upstream patches #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch +Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9080.patch +Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9081.patch +Patch003: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9082.patch + # External patches @@ -59,6 +63,9 @@ lookup program (dnsserver), a program for retrieving FTP data %prep %setup -q +%patch001 -p0 -b .b9080 +%patch002 -p0 -b .b9081 +%patch003 -p0 -b .b9082 %patch201 -p1 -b .config %patch202 -p1 -b .location %patch203 -p1 -b .build @@ -340,29 +347,32 @@ fi chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog -* Mon Jul 27 2009 Henrik Nordstrom - 3.0.STABLE17-1 +* Sat Aug 01 2009 Henrik Nordstrom - 7:3.0.STABLE17-3 +- Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof" + +* Mon Jul 27 2009 Henrik Nordstrom - 7:3.0.STABLE17-2 - Bug #514014, update to 3.0.STABLE17 fixing the denial of service issues mentioned in Squid security advisory SQUID-2009_2. * Sun Jul 26 2009 Fedora Release Engineering - 7:3.0.STABLE16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Wed Jul 01 2009 Jiri Skala 3.0.STABLE16-2 +* Wed Jul 01 2009 Jiri Skala 7:3.0.STABLE16-2 - fixed patch parameter of bXXX patches -* Mon Jun 29 2009 Henrik Nordstrom 3.0.STABLE16-1 +* Mon Jun 29 2009 Henrik Nordstrom - 7:3.0.STABLE16-1 - Upgrade to 3.0.STABLE16 -* Sat May 23 2009 Henrik Nordstrom - 3.0.STABLE15-2 +* Sat May 23 2009 Henrik Nordstrom - 7:3.0.STABLE15-2 - Bug #453304 - Squid requires restart after Network Manager connection setup -* Sat May 09 2009 Henrik Nordstrom 3.0.STABLE15-1 +* Sat May 09 2009 Henrik Nordstrom - 7:3.0.STABLE15-1 - Upgrade to 3.0.STABLE15 -* Tue Apr 28 2009 Jiri Skala - 3.0.STABLE14-3 +* Tue Apr 28 2009 Jiri Skala - 7:3.0.STABLE14-3 - fixed ambiguous condition in the init script (exit 4) -* Mon Apr 20 2009 Henrik Nordstrom - 3.0.STABLE14-2 +* Mon Apr 20 2009 Henrik Nordstrom - 7:3.0.STABLE14-2 - Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64" * Sun Apr 19 2009 Henrik Nordstrom - 7:3.0.STABLE14-1