- Integrate the following vendor patches:

  - LDAP helpers do not work with TLS (-Z option)
    (squid bug #1389)
  - Incorrect store dir selection debug message on objects >2G
    (squid bug #1343)
  - Enums cannot be assumed to be signed ints
    (squid bug #1343)
  - Allow leaving core dumps on Linux
    (squid bug #1335)
  - Do not let clients bypass delay pools by faking a cache hit
    (squid bug #500)
  - Fix problems regarding CONNECT requests when squid is configured with
    "pipeline_prefetch on"
  - Fix a possible DOS condition which may be triggered by certain NTLM
    authentication requests
    (squid bug #1391)
- Remove patching relevant to recently removed pf from ports option

PR:		ports/86179
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

3 files changed, 23 insertions, 31 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index c64c1eef7263..f5da3f7efae3 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -66,7 +66,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -103,7 +103,14 @@ PATCHFILES=	squid-2.5.STABLE10-content_length.patch \
 		squid-2.5.STABLE10-STORE_PENDING.patch \
 		squid-2.5.STABLE10-ldap_auth-U.patch \
 		squid-2.5.STABLE10-cacheClientTable.patch \
-		squid-2.5.STABLE10-mail_from.patch
+		squid-2.5.STABLE10-mail_from.patch \
+		squid-2.5.STABLE10-LDAP_TLS.patch \
+		squid-2.5.STABLE10-storedir_objsize_debug.patch \
+		squid-2.5.STABLE10-header_id_enum.patch \
+		squid-2.5.STABLE10-allow_coredump.patch \
+		squid-2.5.STABLE10-delay_pools.patch \
+		squid-2.5.STABLE10-pipeline-CONNECT.patch \
+		squid-2.5.STABLE10-NTLM-scheme_assert.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
@@ -364,15 +371,6 @@ PLIST_FILES+=	${error_files:S,^,etc/squid/errors/${d}/,}
 .endfor
 PLIST_DIRS+=	etc/squid/errors etc/squid squid/logs squid/cache squid
 
-pre-patch:
-# Check whether we need to create the extra patch that makes pf(4)
-# visible to squid's configure script:
-.if defined(pf_includedir)
-	@${SED} -e 's|%%PF_INCLUDEDIR%%|${pf_includedir}|g' \
-	    -e 's|%%PF_AC_INCLUDEPATH%%|${pf_includedir:S,/,_,g}|g' \
-	    ${PATCHDIR}/pf_from_ports.patch.in >${WRKDIR}/pf_from_ports.patch
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 205d28d1bc42..c6b74e5e55d2 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -50,3 +50,17 @@ MD5 (squid2.5/squid-2.5.STABLE10-cacheClientTable.patch) = d3e76dbab6c22dcb18eea
 SIZE (squid2.5/squid-2.5.STABLE10-cacheClientTable.patch) = 632
 MD5 (squid2.5/squid-2.5.STABLE10-mail_from.patch) = 8a944c1d3f3bac0d1dadcb7aace0ad68
 SIZE (squid2.5/squid-2.5.STABLE10-mail_from.patch) = 1863
+MD5 (squid2.5/squid-2.5.STABLE10-LDAP_TLS.patch) = be16c3bd42c1e72c84db9107d91fb1d7
+SIZE (squid2.5/squid-2.5.STABLE10-LDAP_TLS.patch) = 2466
+MD5 (squid2.5/squid-2.5.STABLE10-storedir_objsize_debug.patch) = 50c480674cc3cf8de7362e0a440c2753
+SIZE (squid2.5/squid-2.5.STABLE10-storedir_objsize_debug.patch) = 1289
+MD5 (squid2.5/squid-2.5.STABLE10-header_id_enum.patch) = df2c547c9390f060333683e7e60b6363
+SIZE (squid2.5/squid-2.5.STABLE10-header_id_enum.patch) = 628
+MD5 (squid2.5/squid-2.5.STABLE10-allow_coredump.patch) = 14184adb5452ddac77c8511ee1202689
+SIZE (squid2.5/squid-2.5.STABLE10-allow_coredump.patch) = 3496
+MD5 (squid2.5/squid-2.5.STABLE10-delay_pools.patch) = bd4e5d3d8fbea996d29cfe6d6132cb0a
+SIZE (squid2.5/squid-2.5.STABLE10-delay_pools.patch) = 7782
+MD5 (squid2.5/squid-2.5.STABLE10-pipeline-CONNECT.patch) = 9e264ac64f93755ccfdce33f14a470c3
+SIZE (squid2.5/squid-2.5.STABLE10-pipeline-CONNECT.patch) = 6316
+MD5 (squid2.5/squid-2.5.STABLE10-NTLM-scheme_assert.patch) = e62ba264eaa7c248ef8d8cbb3777110c
+SIZE (squid2.5/squid-2.5.STABLE10-NTLM-scheme_assert.patch) = 1203
diff --git a/www/squid/files/pf_from_ports.patch.in b/www/squid/files/pf_from_ports.patch.in
deleted file mode 100644
index dd0617e41500..000000000000
--- a/www/squid/files/pf_from_ports.patch.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Thu Jun 10 12:22:06 2004
-+++ configure	Thu Jun 10 13:31:53 2004
-@@ -3781,7 +3781,7 @@
- 	memory.h \
- 	mount.h \
- 	net/if.h \
--	net/pfvar.h \
-+	%%PF_INCLUDEDIR%%/net/pfvar.h \
- 	netdb.h \
- 	netinet/if_ether.h \
- 	netinet/in.h \
-@@ -7604,7 +7604,7 @@
-     echo $ac_n "checking if PF header file is installed""... $ac_c" 1>&6
- echo "configure:7606: checking if PF header file is installed" >&5
-     # hold on to your hats...
--    if test "$ac_cv_header_net_pfvar_h" = "yes"; then
-+    if test "$ac_cv_header_%%PF_AC_INCLUDEPATH%%_net_pfvar_h" = "yes"; then
-         PF_TRANSPARENT="yes"
-         cat >> confdefs.h <<\EOF
- #define PF_TRANSPARENT 1