[Devil-linux-commit] build/scripts curl, 1.2, 1.3 openldap, 1.23, 1.24 openswan, 1.4, NONE

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

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

Modified Files:
	curl openldap 
Removed Files:
	openswan 
Log Message:
- updated cdrtools to 2.01.01a27
- updated clamav to 0.91.2
- updated libpng to 1.2.19
- updated openldap to 2.3.38
- updated php to 5.2.3
- updated sudo to 1.6.9p4


Index: curl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/curl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- curl	7 May 2006 14:07:21 -0000	1.2
+++ curl	22 Aug 2007 23:19:13 -0000	1.3
@@ -32,11 +32,11 @@
 				--with-ssl=/usr --with-ca-bundle=/etc/curl/ca.crt \
 				--enable-crypto-auth --with-zlib=/usr \
 				--enable-cookies --enable-file --enable-ftp --enable-http --enable-ipv6 --enable-ldap \
-				--disable-dict --disable-gopher --disable-telnet || exit 1
+				--disable-dict --disable-gopher --disable-telnet --enable-nonblocking --enable-thread || exit 1
 			make $PMAKE || exit 1
 			strip_debug
 
-			#
+			# install it, other programs need the libraries
 			make install || exit 1
 		fi
 		;;

Index: openldap
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openldap,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- openldap	10 Jan 2007 02:12:00 -0000	1.23
+++ openldap	22 Aug 2007 23:19:13 -0000	1.24
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       openldap
-# Required-Start: $basebuildtools glibc libmcrypt libgcrypt gdbm db-4 openssl
+# Required-Start: $basebuildtools glibc libmcrypt libgcrypt gdbm db-4 openssl krb5
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -26,9 +26,20 @@
 case $1 in
 	build )
 		if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
+			OPTIONS=""
+			# we can't use sasl at the moment, otherwise we get a dependency loop
+			#if [ "$CONFIG_CYRUS_SASL" = "y" ]; then
+			#    OPTIONS="$OPTIONS --with-cyrus-sasl --enable-spasswd"
+			#fi
+			if [ "$CONFIG_KERBEROS5" = "y" ]; then
+			    OPTIONS="$OPTIONS --with-kerberos --enable-kpasswd"
+			fi
 			./configure --prefix=/usr --libexecdir=/usr/sbin --localstatedir=/var --sysconfdir=/etc \
 				--mandir=/usr/share/man --enable-syslog --enable-dynamic --enable-ipv6 \
-				--enable-slurpd --enable-slapd --enable-rewrite || exit 1
+				--enable-slurpd --enable-slapd --enable-rewrite --with-tls --enable-rewrite \
+				--enable-bdb --enable-dnssrv --enable-hdb --enable-ldap --enable-ldbm --enable-passwd \
+				--enable-perl --enable-meta --enable-monitor --enable-null \
+				--enable-overlays=mod --enable-modules $OPTIONS || exit 1
 			make $PMAKE depend || exit 1
 			make $PMAKE all || exit 1
 			strip_debug
@@ -67,6 +78,10 @@
 				echo "START_SLURPD=no" >> $CONFIGFILE
 				echo >> $CONFIGFILE
 				echo "HELP_SLURPD=\"Standalone LDAP Update Replication Daemon (OpenLDAP)\"" >> $SOFTWAREHELP
+				echo "# start the daemon with TLS support?" >> $CONFIGFILE
+				echo "# you will have to create certificates first and configure slapd accordingly?" >> $CONFIGFILE
+				echo "SLAPD_USE_TLS=no" >> $CONFIGFILE
+				echo >> $CONFIGFILE
 				cp $MYDIR/scripts/slurpd $ETCDIR/etc/init.d || exit 1
 			fi
 

--- openswan DELETED ---