[Devil-linux-commit] build/scripts ipsec-tools,1.12,1.13

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

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27306

Modified Files:
	ipsec-tools 
Log Message:

- the script is more correct now, no functionality changes


Index: ipsec-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ipsec-tools,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ipsec-tools	23 Oct 2008 03:20:37 -0000	1.12
+++ ipsec-tools	12 Dec 2008 19:16:17 -0000	1.13
@@ -23,67 +23,58 @@
 # source functions and config
 source $MYDIR/settings
 
-# not supported without backport of ipsec from kernel 2.6
-test ! "$CONFIG_LINUX_VERSION" = "2.6" && exit 0
-
-test ! "$CONFIG_IPSEC_TOOLS" = "y" && exit 0
-
-
 case $1 in
     build )
-	LIBS="--with-libradius=$(find_src_dir libradius-linux)"
-	if [ "$CONFIG_KERBEROS5" = "y" ]; then
-	    LIBS="$LIBS --enable-gssapi=$(find /usr/ -name krb5-config)"
-	fi
-	if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
-	    LIBS="$LIBS --with-libldap"
+	if [ "$CONFIG_IPSEC_TOOLS"  = "y" ]; then
+		LIBS="--with-libradius=$(find_src_dir libradius-linux)"
+		if [ "$CONFIG_KERBEROS5" = "y" ]; then
+		    LIBS="$LIBS --enable-gssapi=$(find /usr/ -name krb5-config)"
+		fi
+		if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
+		    LIBS="$LIBS --with-libldap"
+		fi
+		./bootstrap
+		CC="gcc -D_FORTIFY_SOURCE=0" ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/ipsec-tools --with-kernel-headers=/usr/include \
+		    --enable-frag --enable-dpd --enable-natt --with-libpam $LIBS --enable-hybrid \
+		    --enable-adminport --enable-fastquit --disable-security-context || exit 1
+		make  || exit 1
+		make install || exit 1
+		strip_debug
 	fi
-	./bootstrap
-	CC="gcc -D_FORTIFY_SOURCE=0" ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/ipsec-tools --with-kernel-headers=/usr/include \
-	    --enable-frag --enable-dpd --enable-natt --with-libpam $LIBS --enable-hybrid \
-	    --enable-adminport --enable-fastquit --disable-security-context || exit 1
-	make  || exit 1
-	make install || exit 1
-	strip_debug
         ;;
 
     install )
-	TMPDIR=$WORKDIR/ipsec-tmp
-	rm -rf $TMPDIR 2>/dev/null
-	mkdir -p $WORKDIR/ipsec-tmp
-        mkdir -p $TMPDIR/usr/sbin 
-        mkdir -p $TMPDIR/usr/bin 
-        mkdir -p $TMPDIR/usr/lib 
-        mkdir -p $TMPDIR/etc/ipsec-tools
-        mkdir -p $TMPDIR/etc/ipsec-tools/racoon 
-        mkdir -p $TMPDIR/usr/share/man/man{1,2,5,8} 
-        make install install-man DESTDIR=$TMPDIR
-
-	setkeycfg=$TMPDIR/etc/ipsec-tools/setkey.cfg
-	setkeyreset=$TMPDIR/etc/ipsec-tools/setkey.reset
-	echo "#!/usr/sbin/setkey -f" >$setkeycfg
-	echo "" >>$TMPDIR/etc/ipsec-tools/setkey.cfg
-	echo "# Flush the SAD and SPD" >>$setkeycfg
-	echo "flush;" >>$setkeycfg
-	echo "spdflush;" >>$setkeycfg
-	cp $setkeycfg $setkeyreset
-	echo "# sample for a vpn between 2 networks" >>$setkeycfg
-	echo "spdadd 172.16.1.0/24 172.16.2.0/24 any -P out ipsec esp/tunnel/192.168.1.1-192.168.2.1/require;" >>$setkeycfg
-	echo "spdadd 172.16.2.0/24 172.16.1.0/24 any -P in ipsec esp/tunnel/192.168.2.1-192.168.1.1/require;" >>$setkeycfg
-	chmod +x $setkeycfg
-	chmod +x $setkeyreset
-  	copy_files $TMPDIR/etc $ETCDIR
-  	copy_files $TMPDIR/usr/sbin $CDDIR/usr/
-  	copy_man $TMPDIR/usr/share/man/man5
-  	copy_man $TMPDIR/usr/share/man/man8  	  	
-	cp -p $MYDIR/scripts/ipsec-tools $ETCDIR/etc/init.d || exit 1
-	chmod +x $ETCDIR/etc/init.d/ipsec-tools
-	rm -rf $TMPDIR 2>/dev/null
-
-        echo "# Start Racoon/IPSec suppoty?" >> $CONFIGFILE
-        echo "START_IPSEC_TOOLS=no" >> $CONFIGFILE
-        echo >> $CONFIGFILE
-        echo "HELP_IPSEC_TOOLS=\"IPSec VPN tunnel support\"" >> $SOFTWAREHELP
+	if [ "$CONFIG_IPSEC_TOOLS"  = "y" ]; then
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR || exit 1
+	        make install install-man DESTDIR=$TMPDIR
+		mkdir -p $TMPDIR/etc/ipsec-tools/
+		setkeycfg=$TMPDIR/etc/ipsec-tools/setkey.cfg
+		setkeyreset=$TMPDIR/etc/ipsec-tools/setkey.reset
+		echo "#!/usr/sbin/setkey -f" >$setkeycfg
+		echo "" >>$TMPDIR/etc/ipsec-tools/setkey.cfg
+		echo "# Flush the SAD and SPD" >>$setkeycfg
+		echo "flush;" >>$setkeycfg
+		echo "spdflush;" >>$setkeycfg
+		cp $setkeycfg $setkeyreset
+		echo "# sample for a vpn between 2 networks" >>$setkeycfg
+		echo "spdadd 172.16.1.0/24 172.16.2.0/24 any -P out ipsec esp/tunnel/192.168.1.1-192.168.2.1/require;" >>$setkeycfg
+		echo "spdadd 172.16.2.0/24 172.16.1.0/24 any -P in ipsec esp/tunnel/192.168.2.1-192.168.1.1/require;" >>$setkeycfg
+		chmod +x $setkeycfg
+		chmod +x $setkeyreset
+		rm -rf $TMPDIR/usr/{include,lib} || exit 1
+	  	copy_files $TMPDIR/etc $ETCDIR
+		rm -rf $TMPDIR/etc || exit 1
+	  	cp -dvpfR $TMPDIR/* $CDDIR/ || exit 1
+		cp -p $MYDIR/scripts/ipsec-tools $ETCDIR/etc/init.d || exit 1
+		chmod +x $ETCDIR/etc/init.d/ipsec-tools
+		rm -rf $TMPDIR 2>/dev/null
+	
+	        echo "# Start Racoon/IPSec suppoty?" >> $CONFIGFILE
+	        echo "START_IPSEC_TOOLS=no" >> $CONFIGFILE
+	        echo >> $CONFIGFILE
+	        echo "HELP_IPSEC_TOOLS=\"IPSec VPN tunnel support\"" >> $SOFTWAREHELP
+	fi
     	;;
 
     * )