Here is an update to Squid 2.7-STABLE3. Please take it for
a spin and let me know how it goes.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/squid/Makefile,v
retrieving revision 1.94
diff -u -p -r1.94 Makefile
--- Makefile 31 May 2008 10:07:45 -0000 1.94
+++ Makefile 29 Jun 2008 07:08:26 -0000
@@ -2,9 +2,9 @@
COMMENT= WWW and FTP proxy cache and accelerator
-DISTNAME= squid-2.6.STABLE20
+DISTNAME= squid-2.7.STABLE3
CATEGORIES= www
-MASTER_SITES= ${HOMEPAGE}Versions/v2/2.6/
+MASTER_SITES= ${HOMEPAGE}Versions/v2/2.7/
DIST_SUBDIR= squid
HOMEPAGE= http://www.squid-cache.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/squid/distinfo,v
retrieving revision 1.48
diff -u -p -r1.48 distinfo
--- distinfo 31 May 2008 10:07:45 -0000 1.48
+++ distinfo 29 Jun 2008 07:03:42 -0000
@@ -1,5 +1,5 @@
-MD5 (squid/squid-2.6.STABLE20.tar.gz) = cuOFmKICQjSezrLSHxS1qg==
-RMD160 (squid/squid-2.6.STABLE20.tar.gz) = CA/uV7CKl6v96Yp7xxZWgwHi9pY=
-SHA1 (squid/squid-2.6.STABLE20.tar.gz) = eY+nfcVv0Nv63aNBqpCZvBnOa+w=
-SHA256 (squid/squid-2.6.STABLE20.tar.gz) =
smVdignyTmUL6Kmh3rHZ62TOh08oEzGXQ0kPBraUE+Y=
-SIZE (squid/squid-2.6.STABLE20.tar.gz) = 1738871
+MD5 (squid/squid-2.7.STABLE3.tar.gz) = pNdghpbitheqWFPH0j4lsA==
+RMD160 (squid/squid-2.7.STABLE3.tar.gz) = gEEM4n86vQYB4Qq11pCZ2fPKryg=
+SHA1 (squid/squid-2.7.STABLE3.tar.gz) = DJkFTV/WU32kZ6y/KZ/+XxpUKuM=
+SHA256 (squid/squid-2.7.STABLE3.tar.gz) =
2YdXjGyibKjI1vrZIFgMw5tuvpXI/3J7G208ViX+Qo0=
+SIZE (squid/squid-2.7.STABLE3.tar.gz) = 1782040
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-configure_in,v
retrieving revision 1.26
diff -u -p -r1.26 patch-configure_in
--- patches/patch-configure_in 31 May 2008 10:07:45 -0000 1.26
+++ patches/patch-configure_in 29 Jun 2008 07:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.26 2008/05/31 10:07:45 jasper Exp $
---- configure.in.orig Thu Jan 10 07:34:23 2008
-+++ configure.in Wed Apr 9 17:00:51 2008
-@@ -2248,18 +2248,6 @@ dnl during compile.
+--- configure.in.orig Wed Jun 25 18:18:55 2008
++++ configure.in Sun Jun 29 03:10:24 2008
+@@ -2286,18 +2286,6 @@ dnl during compile.
;;
esac
@@ -20,7 +20,7 @@ $OpenBSD: patch-configure_in,v 1.26 2008
# Recommended by Balint Nagy Endre <[EMAIL PROTECTED]>
case "$host" in
*-univel-sysv4.2MP)
-@@ -2790,12 +2778,14 @@ AC_ARG_WITH(maxfd,
+@@ -2836,12 +2824,14 @@ AC_ARG_WITH(maxfd,
;;
esac
])
Index: patches/patch-errors_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-errors_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-errors_Makefile_in
--- patches/patch-errors_Makefile_in 10 Sep 2007 17:49:23 -0000 1.10
+++ patches/patch-errors_Makefile_in 29 Jun 2008 07:10:54 -0000
@@ -1,7 +1,7 @@
$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@
+--- errors/Makefile.in.orig Sat Feb 23 20:17:16 2008
++++ errors/Makefile.in Sun Jun 29 03:10:24 2008
+@@ -235,7 +235,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
Index: patches/patch-helpers_basic_auth_MSNT_Makefile_in
===================================================================
RCS file:
/cvs/ports/www/squid/patches/patch-helpers_basic_auth_MSNT_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-helpers_basic_auth_MSNT_Makefile_in
--- patches/patch-helpers_basic_auth_MSNT_Makefile_in 10 Sep 2007 17:49:23
-0000 1.4
+++ patches/patch-helpers_basic_auth_MSNT_Makefile_in 29 Jun 2008 07:10:54
-0000
@@ -1,7 +1,7 @@
$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@
+--- helpers/basic_auth/MSNT/Makefile.in.orig Sun Nov 11 20:13:58 2007
++++ helpers/basic_auth/MSNT/Makefile.in Sun Jun 29 03:10:24 2008
+@@ -269,7 +269,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
Index: patches/patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in
===================================================================
RCS file:
/cvs/ports/www/squid/patches/patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in
--- patches/patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in 31 May
2008 10:07:45 -0000 1.1
+++ patches/patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in 29 Jun
2008 07:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-helpers_negotiate_auth_squid_kerb_auth_Makefile_in,v 1.1
2008/05/31 10:07:45 jasper Exp $
---- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig Sun Aug 12
08:40:59 2007
-+++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in Wed Apr 9 17:12:22 2008
-@@ -270,12 +270,12 @@ LDADD = $(KERBLIBS)
+--- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig Sun Nov 11
20:14:15 2007
++++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in Sun Jun 29 03:10:24 2008
+@@ -268,12 +268,12 @@ LDADD = $(KERBLIBS)
#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
# HEIMDAL
Index: patches/patch-icons_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-icons_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-icons_Makefile_in
--- patches/patch-icons_Makefile_in 10 Sep 2007 17:49:23 -0000 1.10
+++ patches/patch-icons_Makefile_in 29 Jun 2008 07:10:54 -0000
@@ -1,7 +1,7 @@
$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 \
+--- icons/Makefile.in.orig Sun Nov 11 20:14:19 2007
++++ icons/Makefile.in Sun Jun 29 03:10:24 2008
+@@ -272,7 +272,7 @@ ICON2 = anthony-bomb.gif \
anthony-xbm.gif \
anthony-xpm.gif
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_Makefile_in,v
retrieving revision 1.14
diff -u -p -r1.14 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 10 Sep 2007 17:49:23 -0000 1.14
+++ patches/patch-src_Makefile_in 29 Jun 2008 07:10:57 -0000
@@ -1,7 +1,7 @@
$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@
+--- src/Makefile.in.orig Wed Jan 2 20:16:40 2008
++++ src/Makefile.in Sun Jun 29 03:10:24 2008
+@@ -241,7 +241,7 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRYPTLIB = @CRYPTLIB@
CYGPATH_W = @CYGPATH_W@
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.14 2
DEPDIR = @DEPDIR@
DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@
ECHO_C = @ECHO_C@
-@@ -382,7 +382,7 @@ program_transform_name = @program_transform_name@
+@@ -397,7 +397,7 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.14 2
target_alias = @target_alias@
@[EMAIL PROTECTED] = dns_internal.c
@[EMAIL PROTECTED] = dns.c
-@@ -622,8 +622,8 @@ EXTRA_DIST = \
+@@ -650,8 +650,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.14 2
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed
'$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_LOG_PREFIX = $(localstatedir)/logs
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
-@@ -884,37 +884,37 @@ distclean-compile:
+@@ -926,37 +926,37 @@ distclean-compile:
uninstall-info-am:
install-dataDATA: $(data_DATA)
@$(NORMAL_INSTALL)
@@ -78,7 +78,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.14 2
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -1097,7 +1097,7 @@ check: $(BUILT_SOURCES)
+@@ -1139,7 +1139,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.14 2
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
-@@ -1236,7 +1236,7 @@ cf.data: cf.data.pre Makefile
+@@ -1278,7 +1278,7 @@ cf.data: cf.data.pre Makefile
sed "\
[EMAIL PROTECTED]@%$(DEFAULT_HTTP_PORT)%g;\
[EMAIL PROTECTED]@%$(DEFAULT_ICP_PORT)%g;\
Index: patches/patch-src_cf_data_pre
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_cf_data_pre,v
retrieving revision 1.27
diff -u -p -r1.27 patch-src_cf_data_pre
--- patches/patch-src_cf_data_pre 31 May 2008 10:07:45 -0000 1.27
+++ patches/patch-src_cf_data_pre 29 Jun 2008 07:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_cf_data_pre,v 1.27 2008/05/31 10:07:45 jasper Exp $
---- src/cf.data.pre.orig Mon Mar 17 19:34:14 2008
-+++ src/cf.data.pre Fri Apr 18 18:27:32 2008
-@@ -3390,7 +3390,7 @@ DOC_END
+--- src/cf.data.pre.orig Tue Jun 24 18:54:18 2008
++++ src/cf.data.pre Sun Jun 29 03:10:15 2008
+@@ -3753,7 +3753,7 @@ DOC_END
NAME: cache_effective_user
TYPE: string
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_cf_data_pre,v 1.27 2
LOC: Config.effectiveUser
DOC_START
If you start Squid as root, it will change its effective/real
-@@ -3404,7 +3404,7 @@ DOC_END
+@@ -3767,7 +3767,7 @@ DOC_END
NAME: cache_effective_group
TYPE: string
Index: patches/patch-src_client_side_c
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_client_side_c,v
retrieving revision 1.14
diff -u -p -r1.14 patch-src_client_side_c
--- patches/patch-src_client_side_c 10 Sep 2007 17:49:23 -0000 1.14
+++ patches/patch-src_client_side_c 29 Jun 2008 07:10:54 -0000
@@ -1,7 +1,7 @@
$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)
+--- src/client_side.c.orig Tue Jun 24 18:54:47 2008
++++ src/client_side.c Sun Jun 29 03:10:15 2008
+@@ -4519,7 +4519,7 @@ clientNatLookup(ConnStateData * conn)
static int pffd = -1;
static time_t last_reported = 0;
if (pffd < 0) {
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/squid/pkg/MESSAGE,v
retrieving revision 1.16
diff -u -p -r1.16 MESSAGE
--- pkg/MESSAGE 3 Oct 2006 18:32:44 -0000 1.16
+++ pkg/MESSAGE 29 Jun 2008 07:45:40 -0000
@@ -1,4 +1,4 @@
-NOTES ON OpenBSD POST-INSTALLATION OF SQUID 2.6
+NOTES ON OpenBSD POST-INSTALLATION OF SQUID 2.7
The local (OpenBSD) differences are:
- configuration files are in ${SYSCONFDIR}/squid
Index: pkg/PFRAG.ldap
===================================================================
RCS file: /cvs/ports/www/squid/pkg/PFRAG.ldap,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.ldap
--- pkg/PFRAG.ldap 31 May 2008 10:07:45 -0000 1.1
+++ pkg/PFRAG.ldap 29 Jun 2008 07:17:14 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PFRAG.ldap,v 1.1 2008/05/31 10:07:45 jasper Exp $
-libexec/digest_ldap_auth
-libexec/squid_ldap_auth
-libexec/squid_ldap_group
[EMAIL PROTECTED] libexec/digest_ldap_auth
[EMAIL PROTECTED] libexec/squid_ldap_auth
[EMAIL PROTECTED] libexec/squid_ldap_group
@man man/man8/squid_ldap_auth.8
@man man/man8/squid_ldap_group.8
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/squid/pkg/PLIST,v
retrieving revision 1.28
diff -u -p -r1.28 PLIST
--- pkg/PLIST 31 May 2008 10:07:45 -0000 1.28
+++ pkg/PLIST 29 Jun 2008 07:13:16 -0000
@@ -4,22 +4,23 @@
@newgroup _squid:515
@newuser _squid:515:_squid:daemon:Squid Account:/nonexistent:/sbin/nologin
bin/RunCache
-bin/squidclient
-libexec/cachemgr.cgi
-libexec/digest_pw_auth
-libexec/diskd-daemon
-libexec/ip_user_check
-libexec/ncsa_auth
-libexec/squid_kerb_auth
-libexec/squid_unix_group
-libexec/unlinkd
-libexec/yp_auth
[EMAIL PROTECTED] bin/squidclient
[EMAIL PROTECTED] libexec/cachemgr.cgi
[EMAIL PROTECTED] libexec/digest_pw_auth
[EMAIL PROTECTED] libexec/diskd-daemon
[EMAIL PROTECTED] libexec/ip_user_check
[EMAIL PROTECTED] libexec/logfile-daemon
[EMAIL PROTECTED] libexec/ncsa_auth
[EMAIL PROTECTED] libexec/squid_kerb_auth
[EMAIL PROTECTED] libexec/squid_unix_group
[EMAIL PROTECTED] libexec/unlinkd
[EMAIL PROTECTED] libexec/yp_auth
@man man/man8/cachemgr.cgi.8
@man man/man8/ncsa_auth.8
@man man/man8/squid.8
@man man/man8/squid_unix_group.8
%%ldap%%
-sbin/squid
[EMAIL PROTECTED] sbin/squid
share/examples/squid/
@sample ${SYSCONFDIR}/squid/
share/examples/squid/errors/
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
