[Devil-linux-commit] build/scripts openldap,1.20,1.20.2.1

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

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

Modified Files:
      Tag: rel-1-2-patches
	openldap 
Log Message:
- openldap now supports proxy mode


Index: openldap
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openldap,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -d -r1.20 -r1.20.2.1
--- openldap	31 Mar 2004 01:58:25 -0000	1.20
+++ openldap	26 Dec 2006 15:36:18 -0000	1.20.2.1
@@ -28,7 +28,7 @@
 		if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
 			./configure --prefix=/usr --libexecdir=/usr/sbin --localstatedir=/var --sysconfdir=/etc \
 				--mandir=/usr/share/man --enable-syslog --enable-dynamic --enable-ipv6 \
-				--enable-slurpd --enable-slapd || exit 1
+				--enable-slurpd --enable-slapd --enable-rewrite || exit 1
 			make $PMAKE depend || exit 1
 			make $PMAKE all || exit 1
 			strip_debug
@@ -39,24 +39,24 @@
 
 	install )
 		if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp || exit 1
-			make install DESTDIR=$WORKDIR/tmp || exit 1
-			copy_docs $WORKDIR/tmp
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR || exit 1
+			make install DESTDIR=$TMPDIR || exit 1
+			copy_docs $TMPDIR
 
-			rm $WORKDIR/tmp/usr/bin/ldapadd || exit
-			ln -sf ldapmodify $WORKDIR/tmp/usr/bin/ldapadd || exit
+			rm $TMPDIR/usr/bin/ldapadd || exit
+			ln -sf ldapmodify $TMPDIR/usr/bin/ldapadd || exit
 
 			# Libraries
-			rm $WORKDIR/tmp/usr/lib/*a || exit 1
-			rm -rf $WORKDIR/tmp/usr/include || exit 1
-			cp -fdpR $WORKDIR/tmp/usr/lib/* $CDDIR/usr/lib/ || exit 1
-			copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1
+			rm $TMPDIR/usr/lib/*a || exit 1
+			rm -rf $TMPDIR/usr/include || exit 1
+			cp -fdpR $TMPDIR/usr/lib/* $CDDIR/usr/lib/ || exit 1
+			copy_files $TMPDIR/etc $ETCDIR/ || exit 1
 
 			# All the Binaries
 			if [ "$CONFIG_OPENLDAP_FULL" = "y" ]; then
-				cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1
-				cp -dpR $WORKDIR/tmp/var $CDDIR/ || exit 1
+				cp -dpR $TMPDIR/usr $CDDIR/ || exit 1
+				cp -dpR $TMPDIR/var $CDDIR/ || exit 1
 				echo "# start the Stand-alone LDAP Daemon?" >> $CONFIGFILE
 				echo "START_SLAPD=no" >> $CONFIGFILE
 				echo >> $CONFIGFILE
@@ -70,7 +70,7 @@
 				cp $MYDIR/scripts/slurpd $ETCDIR/etc/init.d || exit 1
 			fi
 
-			rm -rf $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
 
 		fi
 		;;