upgrade to 2.5.STABLE12

- [Major] Error introduced in 2.5.STABLE11 causing truncated responses
  when using delay pools (Bug #1405)
This commit is contained in:
brad 2005-10-29 23:26:38 +00:00
parent c939acf470
commit c813d99c13
7 changed files with 36 additions and 36 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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@

View File

@ -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

View File

@ -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;\

View File

@ -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