[Devil-linux-commit] build/scripts build-iso, 1.65.2.3, 1.65.2.4 create_etc, 1.14.2.1, 1.14.2.2 ebtables, 1.7.2.2, 1.7.2.3 pptp-linux, 1.9, 1.9.2.1

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

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

Modified Files:
      Tag: rel-1-2-patches
	build-iso create_etc ebtables pptp-linux 
Log Message:
- added default /etc/sysctl.conf (Kari Mattson + Heiko)
- ebtables is correctly build again (unkown + Heiko)
- updated Linux-PAM to 0.99.6.3
- updated cdrtools to 2.01.01a13
- updated mrtg to 2.14.7
- updated openssl to 0.9.7k
- updated pptp to 1.7.1
- updated pptpd to 1.3.3


Index: create_etc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/create_etc,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- create_etc	3 May 2006 18:12:25 -0000	1.14.2.1
+++ create_etc	8 Sep 2006 15:48:02 -0000	1.14.2.2
@@ -30,6 +30,7 @@
 		cp -dpR $DL_DIR/config/etc $ETCDIR/ || exit 1
 		rm -rf $ETCDIR/etc/initrd || exit 1
 		cp -dpR $DL_DIR/config/etc/initrd/* $INITRDDIR/ || exit 1
+		cp -dpR $DL_DIR/config/etc/init.d/functions $INITRDDIR/ || exit 1
 		rm -rf $INITRDDIR/CVS 
 
 		pushd $ETCDIR/etc > /dev/null

Index: ebtables
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ebtables,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- ebtables	12 Jun 2006 20:12:21 -0000	1.7.2.2
+++ ebtables	8 Sep 2006 15:48:02 -0000	1.7.2.3
@@ -42,6 +42,10 @@
 
 				set_kernel_option CONFIG_IP_NF_MATCH_PHYSDEV m
 			fi	
+			if [ ! -f devil-linux-ebtables-makefile-patch.done ]; then
+				bzcat $DL_DIR/src/ebtables-v2.0.8-rc2.patch.bz2 | patch  || exit 1
+				touch devil-linux-ebtables-makefile-patch.done
+			fi
 			make MANDIR=/usr/share/man $PMAKE CC="gcc -fno-stack-protector" all || exit 1
 			strip_debug
 		fi
@@ -49,7 +53,7 @@
 
 	install )
 		if [ "$CONFIG_EBTABLES" = "y" ]; then
-			make install MANDIR=$CDDIR/usr/share/man ETHERTYPESPATH=$ETCDIR/etc BINPATH=$CDDIR/sbin/ || exit 1
+			make install MANDIR=$CDDIR/usr/share/man ETHERTYPESPATH=$ETCDIR/etc BINDIR=$CDDIR/sbin INITDIR=$ETCDIR/etc/init.d SYSCONFIGDIR=$ETCDIR/etc/sysconfig LIBDIR=$CDDIR/usr/lib SCRIPTSYSCONFIGDIR=/etc/sysconfig SCRIPTBINDIR=/sbin || exit 1
 		fi
 	;;
 

Index: pptp-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pptp-linux,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- pptp-linux	11 Jan 2004 14:43:05 -0000	1.9
+++ pptp-linux	8 Sep 2006 15:48:02 -0000	1.9.2.1
@@ -25,6 +25,8 @@
 
 MYNAME=PPTP_CLIENT
 
+cd $(find_src_dir pptp) || exit 1
+
 case $1 in
     build )
 	if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_PPTP_CLIENT" = "y" ]; then

Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.65.2.3
retrieving revision 1.65.2.4
diff -u -d -r1.65.2.3 -r1.65.2.4
--- build-iso	25 May 2006 18:35:40 -0000	1.65.2.3
+++ build-iso	8 Sep 2006 15:48:02 -0000	1.65.2.4
@@ -131,7 +131,6 @@
 
 			# store version
 			echo $DL_VERSION > $INITRDDIR/VERSION
-			cp -p $ETCDIR/etc/initrd/linuxrc $INITRDDIR
 			mkfs.cramfs $INITRDDIR/ $BOOTIMAGEDIR/initrd
 			gzip -f -9 $BOOTIMAGEDIR/initrd
 
@@ -180,12 +179,6 @@
 			# store version
 			echo $DL_VERSION > $WORKDIR/mnt/loop2/VERSION
 
-			# we need the linuxrc and links scripts
-			cp -p $ETCDIR/etc/initrd/linuxrc $INITRDDIR
-
-			# and the functions script
-			cp -p $ETCDIR/etc/init.d/functions $INITRDDIR
-
 			# then we copy the contents of our initrdtree to this filesystem
 			cp -dpR $INITRDDIR/* $WORKDIR/mnt/loop2/
 
@@ -214,7 +207,7 @@
 			rm $WORKDIR/ramdisk
 
 			# how much is the contents of the bootimagetree?
-			#ISIZE=`du -s -k $BOOTIMAGEDIR | awk '{print $1}'`
+			#ISIZE=`du -s -k $BOOTIMAGEDIR | awk \'{print $1}'`
 			#echo "Boot image size is $ISIZE KB"
 
 			echo "done"
@@ -355,13 +348,11 @@
 		mkisofs -b boot/isolinux.bin -c boot/boot.cat \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
 		-o $WORKDIR/bootcd.iso \
-		-J -l -L -R $MKISOFS_PARAM \
-		-p "he...@de..." \
-		-P "Devil Linux Developer Team" \
+		-J -l -R $MKISOFS_PARAM \
+		-allow-leading-dots -allow-lowercase -allow-multidot \
 		-A "Devil-Linux v$DL_VERSION" \
 		-iso-level 2 \
 		-quiet .
-		#-r
 
 
 		popd > /dev/null