[Devil-linux-commit] build/scripts squid,1.23,1.24

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv8579/scripts

Modified Files:
	squid 
Log Message:
- updated i2c to 2.10.1
- updated l7-protocols to 2006-09-10
- updated lm_sensors to 2.10.1
- updated netfilter-layer7 to v2.6
- updated openssh to 4.4p1
- updated openssl to 0.9.7l
- updated psmisc to 22.3
- updated squid to 2.6.STABLE4
- updated unrarsrc to 3.6.8


Index: squid
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squid,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- squid	6 Nov 2005 17:32:29 -0000	1.23
+++ squid	5 Oct 2006 18:12:28 -0000	1.24
@@ -24,7 +24,8 @@
 source $MYDIR/settings
 
 MYNAME=SQUID
-AUTH_HELPERS="MSNT NCSA SMB YP getpwnam multi-domain-NTLM winbind"
+AUTH_HELPERS="MSNT NCSA PAM SMB YP getpwnam multi-domain-NTLM"
+AUTH_HELPERS_NTLM="SMB"
 
 case $1 in
     build )
@@ -39,13 +40,17 @@
 			AUTH_HELPERS="${AUTH_HELPERS} LDAP"
 		fi
 			
+		if [ "$CONFIG_NET_SNMP" = "y" ]; then
+			ENABLE_SNMP="--enable-snmp"
+		fi
+
 		./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/sbin --libexecdir=/usr/sbin \
 			--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-basic-auth-helpers="$AUTH_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
-		# --enable-snmp
 		make $PMAKE all || exit 1
 		strip_debug
 	fi