diff options
-rw-r--r-- | www/squid3/Makefile | 3 | ||||
-rw-r--r-- | www/squid3/PLIST | 4 | ||||
-rw-r--r-- | www/squid3/options.mk | 28 |
3 files changed, 30 insertions, 5 deletions
diff --git a/www/squid3/Makefile b/www/squid3/Makefile index 05468d48562..a9ff56c5530 100644 --- a/www/squid3/Makefile +++ b/www/squid3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2013/04/27 17:51:24 tron Exp $ +# $NetBSD: Makefile,v 1.8 2013/05/16 12:04:57 obache Exp $ DISTNAME= squid-3.3.4 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \ ${SQUID_MASTER_SITES} diff --git a/www/squid3/PLIST b/www/squid3/PLIST index 0bf2fea1dce..acc51352898 100644 --- a/www/squid3/PLIST +++ b/www/squid3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2013/05/04 06:08:44 obache Exp $ +@comment $NetBSD: PLIST,v 1.5 2013/05/16 12:04:57 obache Exp $ bin/purge bin/squidclient ${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth @@ -8,6 +8,7 @@ ${PLIST.ba_NCSA}libexec/basic_ncsa_auth ${PLIST.ba_NIS}libexec/basic_nis_auth ${PLIST.ba_PAM}libexec/basic_pam_auth libexec/cachemgr.cgi +${PLIST.da_file}libexec/digest_file_auth ${PLIST.da_LDAP}libexec/digest_ldap_auth ${PLIST.diskd}libexec/diskd ${PLIST.eacl_file_userip}libexec/ext_file_userip_acl @@ -29,6 +30,7 @@ ${PLIST.ba_getpwnam}man/man8/basic_getpwnam_auth.8 ${PLIST.ba_LDAP}man/man8/basic_ldap_auth.8 ${PLIST.ba_NCSA}man/man8/basic_ncsa_auth.8 ${PLIST.ba_PAM}man/man8/basic_pam_auth.8 +${PLIST.da_file}man/man8/digest_file_auth.8 ${PLIST.eacl_file_userip}man/man8/ext_file_userip_acl.8 ${PLIST.eacl_LDAP_group}man/man8/ext_ldap_group_acl.8 ${PLIST.eacl_unix_group}man/man8/ext_unix_group_acl.8 diff --git a/www/squid3/options.mk b/www/squid3/options.mk index d4cb48cc681..1d27352702a 100644 --- a/www/squid3/options.mk +++ b/www/squid3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2013/05/04 06:08:44 obache Exp $ +# $NetBSD: options.mk,v 1.7 2013/05/16 12:04:57 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squid PKG_SUPPORTED_OPTIONS= inet6 snmp ssl squid-backend-aufs squid-backend-diskd \ @@ -12,7 +12,7 @@ PKG_OPTIONS_LEGACY_OPTS= diskd:squid-backend-diskd \ PLIST_VARS+= diskd snmp unlinkd PLIST_VARS+= ba_LDAP ba_MSNT ba_NCSA ba_NIS ba_PAM ba_getpwnam -PLIST_VARS+= da_LDAP +PLIST_VARS+= da_file da_LDAP PLIST_VARS+= na_SMB PLIST_VARS+= ta_kerberos PLIST_VARS+= eacl_file_userip eacl_LDAP_group eacl_unix_group @@ -58,7 +58,7 @@ PKG_SUPPORTED_OPTIONS+= squid-arp-acl SQUID_BACKENDS?= ufs SQUID_BASIC_AUTH_HELPERS?= MSNT NCSA NIS getpwnam -SQUID_DIGEST_AUTH_HELPERS?= password +SQUID_DIGEST_AUTH_HELPERS?= file SQUID_NTLM_AUTH_HELPERS?= SMB SQUID_EXTERNAL_ACL_HELPERS?= file_userip unix_group @@ -144,6 +144,12 @@ CONFIGURE_ARGS+= --enable-auth-basic=${SQUID_BASIC_AUTH_HELPERS:Q} . for i in ${SQUID_BASIC_AUTH_HELPERS} PLIST.ba_${i}= yes . endfor +.PHONY: squid-enable-helper-basic_auth +pre-configure: squid-enable-helper-basic_auth +squid-enable-helper-basic_auth: +. for i in ${SQUID_BASIC_AUTH_HELPERS} + ${ECHO} "exit 0" > ${WRKSRC}/helpers/basic_auth/${i}/config.test +. endfor .endif .if empty(SQUID_DIGEST_AUTH_HELPERS) @@ -153,6 +159,10 @@ CONFIGURE_ARGS+= --enable-auth-digest=${SQUID_DIGEST_AUTH_HELPERS:Q} . for i in ${SQUID_DIGEST_AUTH_HELPERS} PLIST.da_${i}= yes . endfor +pre-configure: +. for i in ${SQUID_DIGEST_AUTH_HELPERS} + ${ECHO} "exit 0" > ${WRKSRC}/helpers/digest_auth/${i}/config.test +. endfor .endif .if empty(SQUID_NEGOTIATE_AUTH_HELPERS) @@ -162,6 +172,12 @@ CONFIGURE_ARGS+= --enable-auth-negotiate=${SQUID_NEGOTIATE_AUTH_HELPERS:Q} . for i in ${SQUID_NEGOTIATE_AUTH_HELPERS} PLIST.ta_${i}= yes . endfor +.PHONY: squid-enable-helper-negotiate_auth +pre-configure: squid-enable-helper-negotiate_auth +squid-enable-helper-negotiate_auth: +. for i in ${SQUID_NEGOTIATE_AUTH_HELPERS} + ${ECHO} "exit 0" > ${WRKSRC}/helpers/negotiate_auth/${i}/config.test +. endfor .endif .if empty(SQUID_NTLM_AUTH_HELPERS) @@ -180,4 +196,10 @@ CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:Q} . for i in ${SQUID_EXTERNAL_ACL_HELPERS} PLIST.eacl_${i}= yes . endfor +.PHONY: squid-enable-helper-external_auth +pre-configure: squid-enable-helper-external_auth +squid-enable-helper-external_auth: +. for i in ${SQUID_EXTERNAL_AUTH_HELPERS} + ${ECHO} "exit 0" > ${WRKSRC}/helpers/external_auth/${i}/config.test +. endfor .endif |