From a93e0acfe49a50ab1812bec9a689966d8794e8cc Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 25 Oct 2006 14:30:24 +0000 Subject: [PATCH] - added upstream fixes: Assertion error HttpHeader.c:914: "str" Delay pools fairness, correction to first patch Crash on exit in certain conditions where cache.log is not writeable Delay pools fairness when multiple connections compete for bandwidth Clarify the select/poll/kqueue/epoll configure --enable/disable options - reworked fd patch for STABLE4 --- squid.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/squid.spec b/squid.spec index ca0703d..0f31925 100644 --- a/squid.spec +++ b/squid.spec @@ -31,6 +31,12 @@ Patch109: squid-2.6.STABLE4-mem-leak-ncsa.patch Patch110: squid-2.6.STABLE4-time.patch Patch111: squid-2.6.STABLE4-aio-done.patch Patch112: squid-2.6.STABLE4-reconfigure.patch +Patch113: squid-2.6.STABLE4-configure.patch +Patch114: squid-2.6.STABLE4-delay-pools.patch +Patch115: squid-2.6.STABLE4-log.patch +Patch116: squid-2.6.STABLE4-delay-pools-2.patch +Patch117: squid-2.6.STABLE4-http-header.patch + # External patches @@ -42,7 +48,7 @@ Patch202: squid-2.5.STABLE4-location.patch Patch203: squid-2.6.STABLE2-build.patch Patch204: squid-2.5.STABLE4-perlpath.patch Patch205: squid-2.5.STABLE12-smb-path.patch -Patch206: squid-2.6.STABLE1-fd-config-updated.patch +Patch206: squid-2.6.STABLE4-fd-config-updated.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig logrotate shadow-utils @@ -79,6 +85,11 @@ lookup program (dnsserver), a program for retrieving FTP data %patch110 -p1 %patch111 -p1 %patch112 -p1 +%patch113 -p1 +%patch114 -p1 +%patch115 -p1 +%patch116 -p1 +%patch117 -p1 %patch201 -p1 -b .config %patch202 -p1 -b .location @@ -351,6 +362,13 @@ fi %changelog * Tue Oct 25 2006 Martin Stransky - 7:2.6.STABLE4-3 - added fix for #183869 - squid can abort when getting status +- added upstream fixes: + * Bug #1796: Assertion error HttpHeader.c:914: "str" + * Bug #1779: Delay pools fairness, correction to first patch + * Bug #1802: Crash on exit in certain conditions where cache.log is not writeable + * Bug #1779: Delay pools fairness when multiple connections compete for bandwidth + * Clarify the select/poll/kqueue/epoll configure --enable/disable options +- reworked fd patch for STABLE4 * Tue Oct 17 2006 Martin Stransky - 7:2.6.STABLE4-2 - upstream fixes: