- Update to 2.7.STABLE8

PR:		144668
Submitted by:	Thomas-Martin Seck <tmseck@web.de> (maintainer)

4 files changed, 7 insertions, 49 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index fe1c66a1cc72..d29c8edd9872 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -76,7 +76,6 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.7.${SQUID_STABLE_VER}
-PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
@@ -107,13 +106,13 @@ PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www2.tw.squid-cache.org/%SUBDIR%/
 PATCH_SITE_SUBDIR=	Versions/v2/2.7/changesets
-PATCHFILES=	12600.patch
+PATCHFILES=
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@web.de
 COMMENT=	HTTP Caching Proxy
 
-SQUID_STABLE_VER=	7
+SQUID_STABLE_VER=	8
 
 CONFLICTS=	squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]*
 GNU_CONFIGURE=	yes
@@ -248,7 +247,7 @@ CONFIGURE_ARGS+=	--enable-auth="basic digest negotiate ntlm" \
 # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
 .if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
 # XXX This currently only works with heimdal from the base system,
-#     see files/patch-helpers_negotiate_auth-squid_kerb_auth_*
+#     see files/patch-squid_kerb_auth:
 CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
 libexec+=	squid_kerb_auth
 .endif
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 6057f8673a9e..3ca9e8be3308 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,6 +1,3 @@
-MD5 (squid2.7/squid-2.7.STABLE7.tar.bz2) = c18b0371fca813d5e7c7e0baf87baa22
-SHA256 (squid2.7/squid-2.7.STABLE7.tar.bz2) = 6c4e50708ff9ed2d2f43acf3300cbc826749d7fdc722465654415b285d6f7015
-SIZE (squid2.7/squid-2.7.STABLE7.tar.bz2) = 1341869
-MD5 (squid2.7/12600.patch) = 4bf7fb22ef3715b50650c89f679bc47d
-SHA256 (squid2.7/12600.patch) = 828f386ba6468e3b810ec22691f9f920f57cf91548d2edb266c726b1e6b1b829
-SIZE (squid2.7/12600.patch) = 1194
+MD5 (squid2.7/squid-2.7.STABLE8.tar.bz2) = c061ba1c9ae39d0aaa8eca137f7dd18b
+SHA256 (squid2.7/squid-2.7.STABLE8.tar.bz2) = 9409b02fc53518e334395df803a1ae30f4ed385b0f041fb310b4c75e2a49138c
+SIZE (squid2.7/squid-2.7.STABLE8.tar.bz2) = 1348473
diff --git a/www/squid/files/patch-squid-advisory-2010:1 b/www/squid/files/patch-squid-advisory-2010:1
deleted file mode 100644
index 5cb07b7d9b49..000000000000
--- a/www/squid/files/patch-squid-advisory-2010:1
+++ /dev/null
@@ -1,38 +0,0 @@
-FreeBSD-Patch for Squid-Advisory 2010:1, prepared by Thomas-Martin Seck,
-<tmseck@web.de>, 2010-02-01.
-
-Removed one directory level and the first hunk with CVS meta-information
-from the original patch. The original patch can be downloaded from:
-http://www.squid-cache.org/Versions/v2/HEAD/changesets/12597.patch
-
----------------------
-PatchSet 12597 
-Date: 2010/01/15 11:40:30
-Author: amosjeffries
-Branch: HEAD
-Tag: (none) 
-Log:
-Handle DNS header-only packets as invalid.
-
-Members: 
-	lib/rfc1035.c:1.30->1.31 
-
-Index: lib/rfc1035.c
-===================================================================
-RCS file: /cvsroot/squid/squid/lib/rfc1035.c,v
-retrieving revision 1.30
-retrieving revision 1.31
-diff -u -r1.30 -r1.31
---- lib/rfc1035.c	15 Jun 2008 03:49:55 -0000	1.30
-+++ lib/rfc1035.c	15 Jan 2010 11:40:30 -0000	1.31
-@@ -286,7 +286,9 @@
-     size_t len;
-     assert(ns > 0);
-     do {
--	assert((*off) < sz);
-+	if ((*off) >= sz) {
-+	    return 1;
-+	}
- 	c = *(buf + (*off));
- 	if (c > 191) {
- 	    /* blasted compression */
diff --git a/www/squid/files/squid.in b/www/squid/files/squid.in
index a472cd80b4fd..06539f133f19 100644
--- a/www/squid/files/squid.in
+++ b/www/squid/files/squid.in
@@ -32,7 +32,7 @@
 # squid_pidfile:
 #		The name (including the full path) of the Squid
 #		master process' PID file.
-#		Default: %%PREFIX%%/squid/squid.pid.
+#		Default: %%PREFIX%%/logs/squid/squid.pid.
 #		You only need to change this if you changed the
 #		corresponding entry in your Squid configuration.
 #