aboutsummaryrefslogtreecommitdiffstats
path: root/www/squid30
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2009-11-12 18:52:01 +0800
committermiwi <miwi@FreeBSD.org>2009-11-12 18:52:01 +0800
commit37c7f06f76ac3f3f5682c458376448f8062daf43 (patch)
tree770a94dd8b0d5e2539438a46b1087f0a82b5168f /www/squid30
parentadf4fb57a15aab9b378caf1d67b1d863727ac1d4 (diff)
downloadfreebsd-ports-gnome-37c7f06f76ac3f3f5682c458376448f8062daf43.tar.gz
freebsd-ports-gnome-37c7f06f76ac3f3f5682c458376448f8062daf43.tar.zst
freebsd-ports-gnome-37c7f06f76ac3f3f5682c458376448f8062daf43.zip
- Update to 3.0.STABLE20
- Implement additional options vor SQUID_KERB_AUTH and SQUID_NIS_AUTH; users cannot be expected to duplicate src.conf(5) settings into make.conf(5). Keep the test for the old make.conf(5) macros in place for POLA reasons. See ports/139760. PR: 140394 Submitted by: Thomas-Martin Seck <tmseck@web.de> (maintainer)
Diffstat (limited to 'www/squid30')
-rw-r--r--www/squid30/Makefile12
-rw-r--r--www/squid30/distinfo6
2 files changed, 11 insertions, 7 deletions
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index be21ba931b5c..0940c17bf95d 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -99,7 +99,7 @@ COMMENT= HTTP Caching Proxy
LATEST_LINK= squid30
-SQUID_STABLE_VER= 19
+SQUID_STABLE_VER= 20
CONFLICTS= squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]*
GNU_CONFIGURE= yes
@@ -117,7 +117,9 @@ PORTEXAMPLES= *
SUB_FILES+= pkg-deinstall pkg-install pkg-message
SUB_LIST+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
-OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
+OPTIONS= SQUID_KERB_AUTH "Install Kerberos authentication helpers" on \
+ SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
+ SQUID_NIS_AUTH "Install NIS/YP authentication helpers" on \
SQUID_SASL_AUTH "Install SASL authentication helpers" off \
SQUID_DELAY_POOLS "Enable delay pools" off \
SQUID_SNMP "Enable SNMP support" on \
@@ -222,7 +224,8 @@ LDFLAGS+= -L${LOCALBASE}/lib
basic_auth+= SASL
libexec+= sasl_auth
.endif
-.if !defined(NO_NIS) && !defined(WITHOUT_NIS)
+# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
+.if defined(WITH_SQUID_NIS_AUTH) && !defined(NO_NIS) && !defined(WITHOUT_NIS)
basic_auth+= YP
libexec+= yp_auth
.endif
@@ -231,7 +234,8 @@ CONFIGURE_ARGS+= --enable-auth="basic digest negotiate ntlm" \
--enable-digest-auth-helpers="${digest_auth}" \
--enable-external-acl-helpers="${external_acl}" \
--enable-ntlm-auth-helpers="SMB"
-.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
+# 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-squid_kerb_auth:
CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth"
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index f27cec9120e5..7c62c48cdd36 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,3 +1,3 @@
-MD5 (squid3.0/squid-3.0.STABLE19.tar.bz2) = edf0f2baf06d342652f06d131f8a6082
-SHA256 (squid3.0/squid-3.0.STABLE19.tar.bz2) = 134d9ed34b4546b6822b931adbf6dc10e0e14bc50e34e6d386c8e2b3ff222884
-SIZE (squid3.0/squid-3.0.STABLE19.tar.bz2) = 1797869
+MD5 (squid3.0/squid-3.0.STABLE20.tar.bz2) = 9efcbdda8045d2a9eb5d9915449ef175
+SHA256 (squid3.0/squid-3.0.STABLE20.tar.bz2) = 7163b208855540e3a94e19f9e03fb6cee8cbc208515fc8e7d6b94419a7ccdf69
+SIZE (squid3.0/squid-3.0.STABLE20.tar.bz2) = 1801899