From 06a26c13ee536f363350881f4a9c096aa1cb06b8 Mon Sep 17 00:00:00 2001 From: pav Date: Thu, 15 Sep 2005 20:10:59 +0000 Subject: - 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 (maintainer) --- www/squid27/Makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'www/squid27/Makefile') diff --git a/www/squid27/Makefile b/www/squid27/Makefile index c64c1eef7263..f5da3f7efae3 100644 --- a/www/squid27/Makefile +++ b/www/squid27/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' \ -- cgit