From c813d99c13bf9dfb49b6034770f7841d5e3ad11a Mon Sep 17 00:00:00 2001 From: brad Date: Sat, 29 Oct 2005 23:26:38 +0000 Subject: [PATCH] upgrade to 2.5.STABLE12 - [Major] Error introduced in 2.5.STABLE11 causing truncated responses when using delay pools (Bug #1405) --- www/squid/Makefile | 4 ++-- www/squid/distinfo | 8 +++---- www/squid/patches/patch-configure_in | 8 +++---- www/squid/patches/patch-errors_Makefile_in | 8 +++---- www/squid/patches/patch-icons_Makefile_in | 8 +++---- www/squid/patches/patch-src_Makefile_in | 26 +++++++++++----------- www/squid/patches/patch-src_cf_data_pre | 10 ++++----- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index 35e54f335a7..e2c9650e823 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.74 2005/09/25 17:03:32 brad Exp $ +# $OpenBSD: Makefile,v 1.75 2005/10/29 23:26:38 brad Exp $ COMMENT= "WWW and FTP proxy cache and accelerator" -DISTNAME= squid-2.5.STABLE11 +DISTNAME= squid-2.5.STABLE12 CATEGORIES= www MASTER_SITES= ${HOMEPAGE}Versions/v2/2.5/ DIST_SUBDIR= squid diff --git a/www/squid/distinfo b/www/squid/distinfo index 90982d576f3..900092186ed 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,4 +1,4 @@ -MD5 (squid/squid-2.5.STABLE11.tar.gz) = ab2b6f7bf930323b4ebfbcf7233f9af9 -RMD160 (squid/squid-2.5.STABLE11.tar.gz) = ca4e0ee0acf23c349e361ce1ff4bcb48528008ad -SHA1 (squid/squid-2.5.STABLE11.tar.gz) = c4509b6d1874b13c6e02d14a627f0dd55a4b1525 -SIZE (squid/squid-2.5.STABLE11.tar.gz) = 1392629 +MD5 (squid/squid-2.5.STABLE12.tar.gz) = de6238427bed63728970b7e3d6cba40a +RMD160 (squid/squid-2.5.STABLE12.tar.gz) = ce2b368915e5f927a59b6aeaabecbd1911d66329 +SHA1 (squid/squid-2.5.STABLE12.tar.gz) = c47480d9130c1857e2fe54ea2e3acb47b8ed760a +SIZE (squid/squid-2.5.STABLE12.tar.gz) = 1394653 diff --git a/www/squid/patches/patch-configure_in b/www/squid/patches/patch-configure_in index 3cece0b5e45..7f2beb1a747 100644 --- a/www/squid/patches/patch-configure_in +++ b/www/squid/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.17 2005/09/25 17:03:32 brad Exp $ ---- configure.in.orig Fri Sep 16 18:11:37 2005 -+++ configure.in Mon Sep 19 11:02:26 2005 -@@ -1733,18 +1733,6 @@ dnl during compile. +$OpenBSD: patch-configure_in,v 1.18 2005/10/29 23:26:39 brad Exp $ +--- configure.in.orig Sat Oct 22 05:56:01 2005 ++++ configure.in Tue Oct 25 21:27:31 2005 +@@ -1735,18 +1735,6 @@ dnl during compile. ;; esac diff --git a/www/squid/patches/patch-errors_Makefile_in b/www/squid/patches/patch-errors_Makefile_in index a9b97e4e205..3761f3fc88b 100644 --- a/www/squid/patches/patch-errors_Makefile_in +++ b/www/squid/patches/patch-errors_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-errors_Makefile_in,v 1.6 2005/05/25 02:27:13 brad Exp $ ---- errors/Makefile.in.orig Fri Mar 18 19:55:41 2005 -+++ errors/Makefile.in Wed May 18 18:10:12 2005 -@@ -119,7 +119,7 @@ am__quote = @am__quote@ +$OpenBSD: patch-errors_Makefile_in,v 1.7 2005/10/29 23:26:39 brad Exp $ +--- errors/Makefile.in.orig Wed Sep 28 16:57:16 2005 ++++ errors/Makefile.in Tue Oct 25 21:27:32 2005 +@@ -121,7 +121,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ makesnmplib = @makesnmplib@ diff --git a/www/squid/patches/patch-icons_Makefile_in b/www/squid/patches/patch-icons_Makefile_in index 7fc16d74688..67a9b66710a 100644 --- a/www/squid/patches/patch-icons_Makefile_in +++ b/www/squid/patches/patch-icons_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-icons_Makefile_in,v 1.6 2005/05/25 02:27:13 brad Exp $ ---- icons/Makefile.in.orig Fri Mar 18 19:55:51 2005 -+++ icons/Makefile.in Wed May 18 18:10:12 2005 -@@ -147,7 +147,7 @@ ICON2 = anthony-bomb.gif \ +$OpenBSD: patch-icons_Makefile_in,v 1.7 2005/10/29 23:26:39 brad Exp $ +--- icons/Makefile.in.orig Wed Sep 28 16:57:20 2005 ++++ icons/Makefile.in Tue Oct 25 21:27:32 2005 +@@ -149,7 +149,7 @@ ICON2 = anthony-bomb.gif \ anthony-xpm.gif diff --git a/www/squid/patches/patch-src_Makefile_in b/www/squid/patches/patch-src_Makefile_in index d346b5fc91d..770f42006e1 100644 --- a/www/squid/patches/patch-src_Makefile_in +++ b/www/squid/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_Makefile_in,v 1.9 2005/05/25 02:27:13 brad Exp $ ---- src/Makefile.in.orig Sat Apr 23 20:12:08 2005 -+++ src/Makefile.in Wed May 18 18:11:44 2005 +$OpenBSD: patch-src_Makefile_in,v 1.10 2005/10/29 23:26:39 brad Exp $ +--- src/Makefile.in.orig Wed Sep 28 16:57:21 2005 ++++ src/Makefile.in Wed Oct 26 21:42:47 2005 @@ -33,7 +33,7 @@ bindir = @bindir@ sbindir = @sbindir@ libexecdir = @libexecdir@ @@ -10,9 +10,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.9 2005/05/25 02:27:13 brad Exp $ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ -@@ -376,9 +376,9 @@ EXTRA_DIST = \ - - +@@ -380,9 +380,9 @@ EXTRA_DIST = \ + DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@ + DEFAULT_ICP_PORT = @CACHE_ICP_PORT@ DEFAULT_PREFIX = $(prefix) -DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf -DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf @@ -23,7 +23,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.9 2005/05/25 02:27:13 brad Exp $ DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_LOG_PREFIX = $(localstatedir)/logs DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log -@@ -393,7 +393,7 @@ DEFAULT_ICON_DIR = $(datadir)/icons +@@ -397,7 +397,7 @@ DEFAULT_ICON_DIR = $(datadir)/icons DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ DEFAULT_MIB_PATH = $(datadir)/mib.txt @@ -32,7 +32,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.9 2005/05/25 02:27:13 brad Exp $ # Don't automatically uninstall config files -@@ -447,7 +447,7 @@ am_cachemgr__CGIEXT__OBJECTS = cachemgr_ +@@ -451,7 +451,7 @@ am_cachemgr__CGIEXT__OBJECTS = cachemgr_ cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS) cachemgr__CGIEXT__LDADD = $(LDADD) cachemgr__CGIEXT__DEPENDENCIES = @@ -41,7 +41,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.9 2005/05/25 02:27:13 brad Exp $ am_cf_gen_OBJECTS = cf_gen.$(OBJEXT) cf_gen_OBJECTS = $(am_cf_gen_OBJECTS) cf_gen_LDADD = $(LDADD) -@@ -856,37 +856,37 @@ CCDEPMODE = @CCDEPMODE@ +@@ -860,37 +860,37 @@ CCDEPMODE = @CCDEPMODE@ uninstall-info-am: install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) @@ -89,7 +89,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.9 2005/05/25 02:27:13 brad Exp $ done # This directory's subdirectories are mostly independent; you can cd -@@ -1020,7 +1020,7 @@ check: check-recursive +@@ -1024,7 +1024,7 @@ check: check-recursive all-am: Makefile $(PROGRAMS) $(DATA) installdirs: installdirs-recursive installdirs-am: @@ -98,10 +98,10 @@ $OpenBSD: patch-src_Makefile_in,v 1.9 2005/05/25 02:27:13 brad Exp $ install: install-recursive install-exec: install-exec-recursive -@@ -1144,7 +1144,7 @@ cf_gen_defines.h: $(srcdir)/cf_gen_defin - - cf.data: cf.data.pre Makefile +@@ -1150,7 +1150,7 @@ cf.data: cf.data.pre Makefile sed "\ + s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\ + s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\ - s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ + s%@DEFAULT_MIME_TABLE@%$(sysconfdir)/mime.conf%g;\ s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\ diff --git a/www/squid/patches/patch-src_cf_data_pre b/www/squid/patches/patch-src_cf_data_pre index 5651e4574db..4ea33c8b8e8 100644 --- a/www/squid/patches/patch-src_cf_data_pre +++ b/www/squid/patches/patch-src_cf_data_pre @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_cf_data_pre,v 1.18 2005/09/25 17:03:32 brad Exp $ ---- src/cf.data.pre.orig Tue Sep 13 09:44:35 2005 -+++ src/cf.data.pre Mon Sep 19 11:01:59 2005 -@@ -2471,7 +2471,7 @@ DOC_END +$OpenBSD: patch-src_cf_data_pre,v 1.19 2005/10/29 23:26:39 brad Exp $ +--- src/cf.data.pre.orig Thu Oct 20 13:28:08 2005 ++++ src/cf.data.pre Tue Oct 25 21:27:32 2005 +@@ -2482,7 +2482,7 @@ DOC_END NAME: cache_effective_user TYPE: string @@ -10,7 +10,7 @@ $OpenBSD: patch-src_cf_data_pre,v 1.18 2005/09/25 17:03:32 brad Exp $ LOC: Config.effectiveUser DOC_START If you start Squid as root, it will change its effective/real -@@ -2486,7 +2486,7 @@ DOC_END +@@ -2497,7 +2497,7 @@ DOC_END NAME: cache_effective_group TYPE: string