From c32401531438da84b86d7729c7673b51ebe4c8cf Mon Sep 17 00:00:00 2001 From: merdely Date: Mon, 10 Sep 2007 17:49:23 +0000 Subject: [PATCH] Update to Squid 2.6.STABLE16. From brad (MAINTAINER) ok sthen@ --- www/squid/Makefile | 7 ++-- www/squid/distinfo | 10 +++--- www/squid/patches/patch-configure_in | 8 ++--- www/squid/patches/patch-errors_Makefile_in | 8 ++--- .../patch-helpers_basic_auth_MSNT_Makefile_in | 10 +++--- www/squid/patches/patch-icons_Makefile_in | 8 ++--- www/squid/patches/patch-src_Makefile_in | 20 +++++------ www/squid/patches/patch-src_cf_data_pre | 10 +++--- www/squid/patches/patch-src_client_side_c | 8 ++--- www/squid/pkg/PLIST | 33 ++++++++++++++++++- 10 files changed, 76 insertions(+), 46 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index 05c1f1615b7..9713da27585 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.88 2007/09/01 20:11:21 kili Exp $ +# $OpenBSD: Makefile,v 1.89 2007/09/10 17:49:23 merdely Exp $ COMMENT= WWW and FTP proxy cache and accelerator -DISTNAME= squid-2.6.STABLE13 -PKGNAME= ${DISTNAME}p0 +DISTNAME= squid-2.6.STABLE16 CATEGORIES= www MASTER_SITES= ${HOMEPAGE}Versions/v2/2.6/ DIST_SUBDIR= squid @@ -35,7 +34,7 @@ PATCH_LIST= patch-* gcc-* .endif SEPARATE_BUILD= concurrent -AUTOCONF_VERSION= 2.59 +AUTOCONF_VERSION= 2.61 CONFIGURE_STYLE= autoconf MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/cfgaux CONFIGURE_ARGS+=--datadir="${PREFIX}/share/squid" \ diff --git a/www/squid/distinfo b/www/squid/distinfo index b0f981f615d..a6f2b435760 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,5 +1,5 @@ -MD5 (squid/squid-2.6.STABLE13.tar.gz) = 8VIiTD7bwKy7hVZcGUIzKw== -RMD160 (squid/squid-2.6.STABLE13.tar.gz) = agGhBILtHOlxWuiZBWKUchA705Q= -SHA1 (squid/squid-2.6.STABLE13.tar.gz) = bleDySgyWzZSpaf/tbFnMY1ZN/E= -SHA256 (squid/squid-2.6.STABLE13.tar.gz) = HDImXsFa98+ijewS81bJq8scOOz5feJjZ0u2FzLUB2s= -SIZE (squid/squid-2.6.STABLE13.tar.gz) = 1627479 +MD5 (squid/squid-2.6.STABLE16.tar.gz) = XZEP0wzo0okWoJQQ1YTp8w== +RMD160 (squid/squid-2.6.STABLE16.tar.gz) = pqHeNrryjDaRbgmnE8ow0zoQBUo= +SHA1 (squid/squid-2.6.STABLE16.tar.gz) = blbfcnBRL5Z2sgpNnlqW9nWqDSM= +SHA256 (squid/squid-2.6.STABLE16.tar.gz) = Aya9C7Ntnxk0m14QP5T2db1OrSJXZmRQNbe+x0Uv5y8= +SIZE (squid/squid-2.6.STABLE16.tar.gz) = 1710035 diff --git a/www/squid/patches/patch-configure_in b/www/squid/patches/patch-configure_in index 5b2feef78f9..5a92c5c1799 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.24 2007/05/20 00:52:32 todd Exp $ ---- configure.in.orig Thu May 10 19:59:36 2007 -+++ configure.in Sat May 12 23:44:43 2007 -@@ -2231,18 +2231,6 @@ dnl during compile. +$OpenBSD: patch-configure_in,v 1.25 2007/09/10 17:49:23 merdely Exp $ +--- configure.in.orig Wed Sep 5 18:25:42 2007 ++++ configure.in Wed Sep 5 21:01:07 2007 +@@ -2248,18 +2248,6 @@ dnl during compile. ;; esac diff --git a/www/squid/patches/patch-errors_Makefile_in b/www/squid/patches/patch-errors_Makefile_in index dc6046fa1b0..17afd745c43 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.9 2006/11/13 02:11:39 brad Exp $ ---- errors/Makefile.in.orig Sun Oct 29 21:21:13 2006 -+++ errors/Makefile.in Sat Nov 4 15:50:31 2006 -@@ -229,7 +229,7 @@ sbindir = @sbindir@ +$OpenBSD: patch-errors_Makefile_in,v 1.10 2007/09/10 17:49:23 merdely Exp $ +--- errors/Makefile.in.orig Wed Aug 22 20:14:40 2007 ++++ errors/Makefile.in Sun Sep 2 20:17:49 2007 +@@ -237,7 +237,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ diff --git a/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in b/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in index 26100bb9cdb..185d5a97cfa 100644 --- a/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in +++ b/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in @@ -1,8 +1,8 @@ -$OpenBSD: patch-helpers_basic_auth_MSNT_Makefile_in,v 1.3 2006/11/13 02:11:39 brad Exp $ ---- helpers/basic_auth/MSNT/Makefile.in.orig Sun Oct 29 21:21:17 2006 -+++ helpers/basic_auth/MSNT/Makefile.in Sat Nov 4 15:50:31 2006 -@@ -263,7 +263,7 @@ prefix = @prefix@ - program_transform_name = @program_transform_name@ +$OpenBSD: patch-helpers_basic_auth_MSNT_Makefile_in,v 1.4 2007/09/10 17:49:23 merdely Exp $ +--- helpers/basic_auth/MSNT/Makefile.in.orig Sun Aug 12 08:40:48 2007 ++++ helpers/basic_auth/MSNT/Makefile.in Sun Sep 2 20:17:49 2007 +@@ -271,7 +271,7 @@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ diff --git a/www/squid/patches/patch-icons_Makefile_in b/www/squid/patches/patch-icons_Makefile_in index 80677bca8a1..c0abad8a1a9 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.9 2006/11/13 02:11:39 brad Exp $ ---- icons/Makefile.in.orig Sun Oct 29 21:21:32 2006 -+++ icons/Makefile.in Sat Nov 4 15:50:31 2006 -@@ -266,7 +266,7 @@ ICON2 = anthony-bomb.gif \ +$OpenBSD: patch-icons_Makefile_in,v 1.10 2007/09/10 17:49:23 merdely Exp $ +--- icons/Makefile.in.orig Sun Aug 12 08:41:05 2007 ++++ icons/Makefile.in Sun Sep 2 20:17:49 2007 +@@ -274,7 +274,7 @@ ICON2 = anthony-bomb.gif \ anthony-xbm.gif \ anthony-xpm.gif diff --git a/www/squid/patches/patch-src_Makefile_in b/www/squid/patches/patch-src_Makefile_in index 916fa3c1a48..9b1bf92bb9e 100644 --- a/www/squid/patches/patch-src_Makefile_in +++ b/www/squid/patches/patch-src_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_in,v 1.13 2007/05/20 00:52:32 todd Exp $ ---- src/Makefile.in.orig Sat May 5 18:06:55 2007 -+++ src/Makefile.in Sat May 12 23:44:43 2007 -@@ -223,7 +223,7 @@ CPP = @CPP@ +$OpenBSD: patch-src_Makefile_in,v 1.14 2007/09/10 17:49:23 merdely Exp $ +--- src/Makefile.in.orig Wed Sep 5 17:57:25 2007 ++++ src/Makefile.in Wed Sep 5 21:01:07 2007 +@@ -224,7 +224,7 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CRYPTLIB = @CRYPTLIB@ CYGPATH_W = @CYGPATH_W@ @@ -10,8 +10,8 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2007/05/20 00:52:32 todd Exp $ DEPDIR = @DEPDIR@ DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@ ECHO_C = @ECHO_C@ -@@ -373,7 +373,7 @@ prefix = @prefix@ - program_transform_name = @program_transform_name@ +@@ -382,7 +382,7 @@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ @@ -19,7 +19,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2007/05/20 00:52:32 todd Exp $ target_alias = @target_alias@ @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c -@@ -610,8 +610,8 @@ EXTRA_DIST = \ +@@ -622,8 +622,8 @@ EXTRA_DIST = \ DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@ DEFAULT_ICP_PORT = @CACHE_ICP_PORT@ DEFAULT_PREFIX = $(prefix) @@ -30,7 +30,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2007/05/20 00:52:32 todd Exp $ DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_LOG_PREFIX = $(localstatedir)/logs DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log -@@ -871,37 +871,37 @@ distclean-compile: +@@ -884,37 +884,37 @@ distclean-compile: uninstall-info-am: install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) @@ -78,7 +78,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2007/05/20 00:52:32 todd Exp $ done # This directory's subdirectories are mostly independent; you can cd -@@ -1084,7 +1084,7 @@ check: $(BUILT_SOURCES) +@@ -1097,7 +1097,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(PROGRAMS) $(DATA) installdirs: installdirs-recursive installdirs-am: @@ -87,7 +87,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.13 2007/05/20 00:52:32 todd Exp $ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -1222,7 +1222,7 @@ cf.data: cf.data.pre Makefile +@@ -1236,7 +1236,7 @@ cf.data: cf.data.pre Makefile sed "\ s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\ s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\ diff --git a/www/squid/patches/patch-src_cf_data_pre b/www/squid/patches/patch-src_cf_data_pre index f5c3974fc41..d2ff35f180e 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.24 2007/05/20 00:52:32 todd Exp $ ---- src/cf.data.pre.orig Tue Apr 24 17:30:03 2007 -+++ src/cf.data.pre Sat May 12 23:44:31 2007 -@@ -3311,7 +3311,7 @@ DOC_END +$OpenBSD: patch-src_cf_data_pre,v 1.25 2007/09/10 17:49:23 merdely Exp $ +--- src/cf.data.pre.orig Wed Sep 5 17:50:15 2007 ++++ src/cf.data.pre Wed Sep 5 21:00:34 2007 +@@ -3374,7 +3374,7 @@ DOC_END NAME: cache_effective_user TYPE: string @@ -10,7 +10,7 @@ $OpenBSD: patch-src_cf_data_pre,v 1.24 2007/05/20 00:52:32 todd Exp $ LOC: Config.effectiveUser DOC_START If you start Squid as root, it will change its effective/real -@@ -3326,7 +3326,7 @@ DOC_END +@@ -3388,7 +3388,7 @@ DOC_END NAME: cache_effective_group TYPE: string diff --git a/www/squid/patches/patch-src_client_side_c b/www/squid/patches/patch-src_client_side_c index f58ab2ea477..e4e8fb93a55 100644 --- a/www/squid/patches/patch-src_client_side_c +++ b/www/squid/patches/patch-src_client_side_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_client_side_c,v 1.13 2007/05/20 00:52:32 todd Exp $ ---- src/client_side.c.orig Tue Mar 20 17:26:34 2007 -+++ src/client_side.c Sat May 12 23:44:31 2007 -@@ -4435,7 +4435,7 @@ clientNatLookup(ConnStateData * conn) +$OpenBSD: patch-src_client_side_c,v 1.14 2007/09/10 17:49:23 merdely Exp $ +--- src/client_side.c.orig Mon Sep 3 09:13:36 2007 ++++ src/client_side.c Wed Sep 5 21:00:34 2007 +@@ -4441,7 +4441,7 @@ clientNatLookup(ConnStateData * conn) static int pffd = -1; static time_t last_reported = 0; if (pffd < 0) { diff --git a/www/squid/pkg/PLIST b/www/squid/pkg/PLIST index 526cbd32ca6..19c904b8e8b 100644 --- a/www/squid/pkg/PLIST +++ b/www/squid/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.25 2006/10/03 05:00:49 brad Exp $ +@comment $OpenBSD: PLIST,v 1.26 2007/09/10 17:49:23 merdely Exp $ @newgroup _squid:515 @newuser _squid:515:_squid:daemon:Squid Account:/nonexistent:/sbin/nologin bin/RunCache @@ -20,6 +20,37 @@ share/examples/squid/ @sample ${SYSCONFDIR}/squid/ share/examples/squid/errors/ @sample share/squid/errors/ +share/examples/squid/errors/Armenian/ +share/examples/squid/errors/Armenian/ERR_ACCESS_DENIED +share/examples/squid/errors/Armenian/ERR_CACHE_ACCESS_DENIED +share/examples/squid/errors/Armenian/ERR_CACHE_MGR_ACCESS_DENIED +share/examples/squid/errors/Armenian/ERR_CANNOT_FORWARD +share/examples/squid/errors/Armenian/ERR_CONNECT_FAIL +share/examples/squid/errors/Armenian/ERR_DNS_FAIL +share/examples/squid/errors/Armenian/ERR_FORWARDING_DENIED +share/examples/squid/errors/Armenian/ERR_FTP_DISABLED +share/examples/squid/errors/Armenian/ERR_FTP_FAILURE +share/examples/squid/errors/Armenian/ERR_FTP_FORBIDDEN +share/examples/squid/errors/Armenian/ERR_FTP_NOT_FOUND +share/examples/squid/errors/Armenian/ERR_FTP_PUT_CREATED +share/examples/squid/errors/Armenian/ERR_FTP_PUT_ERROR +share/examples/squid/errors/Armenian/ERR_FTP_PUT_MODIFIED +share/examples/squid/errors/Armenian/ERR_FTP_UNAVAILABLE +share/examples/squid/errors/Armenian/ERR_INVALID_REQ +share/examples/squid/errors/Armenian/ERR_INVALID_RESP +share/examples/squid/errors/Armenian/ERR_INVALID_URL +share/examples/squid/errors/Armenian/ERR_LIFETIME_EXP +share/examples/squid/errors/Armenian/ERR_NO_RELAY +share/examples/squid/errors/Armenian/ERR_ONLY_IF_CACHED_MISS +share/examples/squid/errors/Armenian/ERR_READ_ERROR +share/examples/squid/errors/Armenian/ERR_READ_TIMEOUT +share/examples/squid/errors/Armenian/ERR_SHUTTING_DOWN +share/examples/squid/errors/Armenian/ERR_SOCKET_FAILURE +share/examples/squid/errors/Armenian/ERR_TOO_BIG +share/examples/squid/errors/Armenian/ERR_UNSUP_REQ +share/examples/squid/errors/Armenian/ERR_URN_RESOLVE +share/examples/squid/errors/Armenian/ERR_WRITE_ERROR +share/examples/squid/errors/Armenian/ERR_ZERO_SIZE_OBJECT share/examples/squid/errors/Azerbaijani/ share/examples/squid/errors/Azerbaijani/ERR_ACCESS_DENIED share/examples/squid/errors/Azerbaijani/ERR_CACHE_ACCESS_DENIED