[Devil-linux-commit] build/scripts squid,1.30,1.31

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13429/scripts

Modified Files:
	squid 
Log Message:

- added "--enable-external-acl-helpers" (closed feature request #85)


Index: squid
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squid,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- squid	6 Jan 2010 15:27:21 -0000	1.30
+++ squid	18 Aug 2010 04:26:45 -0000	1.31
@@ -17,18 +17,21 @@
 MYNAME=SQUID
 AUTH_HELPERS="MSNT NCSA PAM SMB YP getpwnam multi-domain-NTLM"
 AUTH_HELPERS_NTLM="SMB"
+EXTERNAL_HELPERS="ip_user session unix_group wbinfo_group"
 
 case $1 in
     build )
 	if [ "$CONFIG_SQUID" = "y" ]; then
 		if [ ! -f .patches.done ]; then
 			pushd helpers/basic_auth/YP/ > /dev/null
-			bzcat $DL_DIR/src/yp_auth.patch.bz2 | patch || exit 1
+			bzcat $SRCDIR/yp_auth.patch.bz2 | patch || exit 1
 			popd > /dev/null
+			patch -Np1 -i $SRCDIR/squid-3.0-with_new_linux_headers_capability.patch || exit 1
 			touch .patches.done
 		fi
 		if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
 			AUTH_HELPERS="${AUTH_HELPERS} LDAP"
+			EXTERNAL_HELPERS="$EXTERNAL_HELPERS ldap_group"
 		fi
 			
 		if [ "$CONFIG_NET_SNMP" = "y" ]; then
@@ -41,7 +44,7 @@
 			--datadir=/usr/share/squid --localstatedir=/var/squid --sharedstatedir=/var/squid \
 			--enable-delay-pools --enable-useragent-log --enable-referer-log --enable-arp-acl \
 			--enable-ssl --with-openssl --enable-htcp --enable-linux-netfilter \
-			--enable-basic-auth-helpers="$AUTH_HELPERS" $ENABLE_SNMP \
+			--enable-basic-auth-helpers="$AUTH_HELPERS" --enable-external-acl-helpers="$EXTERNAL_HELPERS" $ENABLE_SNMP \
 			--enable-auth="basic ntlm" --enable-ntlm-auth-helpers="$AUTH_HELPERS_NTLM"  \
 			--enable-default-err-language=English --enable-err-languages="English" || exit 1
 		make $PMAKE all || exit 1