summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2013-05-05 11:08:09 +0000
committertron <tron@pkgsrc.org>2013-05-05 11:08:09 +0000
commit4cb0e1ab2d4ee4fcc186187ccc8bcbd92a4c2461 (patch)
tree83767401de53972f8df9bab632c600d15ac16933
parent365d7e8627e9879d414d1759bc20abc6f4536401 (diff)
downloadpkgsrc-4cb0e1ab2d4ee4fcc186187ccc8bcbd92a4c2461.tar.gz
Pullup ticket #4131 - requested by obache
www/squid3: build fix Revisions pulled up: - www/squid3/PLIST 1.4 - www/squid3/options.mk 1.6 --- Module Name: pkgsrc Committed By: obache Date: Sat May 4 06:08:44 UTC 2013 Modified Files: pkgsrc/www/squid3: PLIST options.mk Log Message: enabled file_userip external acl helper require more tweak. related to PR pkg/47784
-rw-r--r--www/squid3/PLIST4
-rw-r--r--www/squid3/options.mk4
2 files changed, 5 insertions, 3 deletions
diff --git a/www/squid3/PLIST b/www/squid3/PLIST
index c072408f32f..9c0873ed444 100644
--- a/www/squid3/PLIST
+++ b/www/squid3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/03/05 01:59:51 taca Exp $
+@comment $NetBSD: PLIST,v 1.3.2.1 2013/05/05 11:08:09 tron Exp $
bin/purge
bin/squidclient
${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
@@ -10,6 +10,7 @@ ${PLIST.ba_PAM}libexec/basic_pam_auth
libexec/cachemgr.cgi
${PLIST.da_LDAP}libexec/digest_ldap_auth
${PLIST.diskd}libexec/diskd
+${PLIST.eacl_file_userip}libexec/ext_file_userip_acl
${PLIST.eacl_LDAP_group}libexec/ext_ldap_group_acl
${PLIST.eacl_unix_group}libexec/ext_unix_group_acl
libexec/helper-mux.pl
@@ -28,6 +29,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.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
${PLIST.ta_kerberos}man/man8/negotiate_kerberos_auth.8
diff --git a/www/squid3/options.mk b/www/squid3/options.mk
index 41a2df439a8..33bb3702f42 100644
--- a/www/squid3/options.mk
+++ b/www/squid3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4.2.1 2013/04/30 19:31:29 tron Exp $
+# $NetBSD: options.mk,v 1.4.2.2 2013/05/05 11:08:09 tron Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.squid
PKG_SUPPORTED_OPTIONS= inet6 snmp ssl squid-backend-aufs squid-backend-diskd \
@@ -15,7 +15,7 @@ PLIST_VARS+= ba_LDAP ba_MSNT ba_NCSA ba_NIS ba_PAM ba_getpwnam
PLIST_VARS+= da_LDAP
PLIST_VARS+= na_SMB
PLIST_VARS+= ta_kerberos
-PLIST_VARS+= eacl_ip_user eacl_LDAP_group eacl_unix_group
+PLIST_VARS+= eacl_file_userip eacl_LDAP_group eacl_unix_group
PKG_SUGGESTED_OPTIONS= inet6 snmp ssl squid-backend-diskd squid-carp \
squid-pam-helper squid-unlinkd