[Devil-linux-commit] build/scripts ipsec-tools,1.1,1.2 lm_sensors,1.13,1.14

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv14731/scripts

Modified Files:
	ipsec-tools lm_sensors 
Log Message:
checked in more fixes from Oliver (ipsec-tools, typos)
added pax support for kernel 2.4
added some more exclusions to the menuconfig, so user can't set incompatible
options


Index: ipsec-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ipsec-tools,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ipsec-tools	16 Jan 2004 01:47:55 -0000	1.1
+++ ipsec-tools	16 Jan 2004 19:16:56 -0000	1.2
@@ -37,7 +37,7 @@
 	automake
 	autoconf
 	cd ../..
-	./configure --prefix=/usr --sysconfdir=/etc/ipsec --with-kernel-headers=$KERNELDIR/include
+	./configure --prefix=/usr --sysconfdir=/etc/ipsec-tools --with-kernel-headers=$KERNELDIR/include
 	make  || exit 1
 	make install || exit 1
 	strip_debug
@@ -50,12 +50,28 @@
         mkdir -p $TMPDIR/usr/sbin 
         mkdir -p $TMPDIR/usr/bin 
         mkdir -p $TMPDIR/usr/lib 
-        mkdir -p $TMPDIR/etc/ipsec 
-        mkdir -p $TMPDIR/etc/ipsec/racoon 
+        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 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 $CDDIR/usr
+	cp -p $MYDIR/scripts/ipsec-tools $ETCDIR/etc/init.d || exit 1
+	chmod +x $ETCDIR/etc/init.d/ipsec-tools
 	rm -rf $TMPDIR
     	;;
 

Index: lm_sensors
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lm_sensors,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- lm_sensors	16 Jan 2004 01:47:55 -0000	1.13
+++ lm_sensors	16 Jan 2004 19:16:56 -0000	1.14
@@ -39,7 +39,6 @@
 				for CFG in $(  grep bool $KERNELDIR/drivers/sensors/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 					set_kernel_option $CFG y
 				done
-				done
 				for CFG in $(  grep tristate $KERNELDIR/drivers/i2c/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 					set_kernel_option $CFG m
 				done