[Devil-linux-commit] build/scripts build-iso, 1.72, 1.73 create_etc, 1.15, 1.16 ebtables, 1.10, 1.1

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16

--- create_etc	3 May 2006 19:44:58 -0000	1.15
+++ create_etc	8 Sep 2006 15:48:57 -0000	1.16
@@ -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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ebtables	4 May 2006 01:15:15 -0000	1.10
+++ ebtables	8 Sep 2006 15:48:57 -0000	1.11
@@ -28,24 +28,32 @@
 case $1 in
 	build )
 		if [ "$CONFIG_EBTABLES" = "y" ]; then
-			if [ ! -f .patch.done ]; then
-				bzcat $DL_DIR/src/ebtables_iets.diff.bz2 | patch -p1 || exit 1
-				touch .patch.done
-			fi
-			if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+			if [ "$CONFIG_LINUX_VERSION" = "2.4" -a ! -f devil-linux-ebtables-kernel-patch.done ]; then
 				zcat $DL_DIR/src/ebtables-brnf-*.diff.gz | patch -p 1 -d $KERNELDIR || exit 1
+				touch devil-linux-ebtables-kernel-patch.done
+
+				# update kernel 
+				for CFG in $(  grep tristate $KERNELDIR/net/bridge/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+					set_kernel_option $CFG m
+				done
+				for CFG in $(  grep bool $KERNELDIR/net/bridge/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+					set_kernel_option $CFG y
+				done
 
 				set_kernel_option CONFIG_IP_NF_MATCH_PHYSDEV m
 			fi	
-			set_all_kernel_options net/bridge/netfilter
-			make MANDIR=/usr/share/man KERNEL_INCLUDES=/usr/src/linux/include $PMAKE all|| exit 1
+			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
 		;;
 
 	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.10
diff -u -d -r1.9 -r1.10
--- pptp-linux	11 Jan 2004 14:43:05 -0000	1.9
+++ pptp-linux	8 Sep 2006 15:48:57 -0000	1.10
@@ -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.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- build-iso	25 May 2006 18:35:40 -0000	1.72
+++ build-iso	8 Sep 2006 15:48:57 -0000	1.73
@@ -31,6 +31,7 @@
 
 case $1 in
 	iso )
+
 		# we need to set aside a few loop devices. I chose (in reverse order of their appearance)
 		# -- loop1 for the boot image
 		# -- loop2 for the ram disk image
@@ -90,9 +91,7 @@
 		if [ "$CONFIG_ZISOFS" = "y" ]; then
 			echo creating compressed ISO filesystem
 			test -d $CDDIR.z && rm -rf $CDDIR.z
-			PMAKE=""
-			test -n "$CONFIG_PMAKE" && PMAKE="-p $CONFIG_PMAKE"
-			mkzftree -z 9 $PMAKE $CDDIR $CDDIR.z || exit 1
+			mkzftree -z 9 -p $CONFIG_PMAKE $CDDIR $CDDIR.z || exit 1
 			MKISOFS_PARAM="$MKISOFS_PARAM -z"
 
 			# now we need to restore the files which shouldn't be compressed
@@ -132,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
 
@@ -181,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/
 
@@ -215,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"
@@ -273,10 +265,10 @@
 			BOOT_OPTION_RAMDISK="ramdisk_blocksize=4096"
 		fi
 		if [ "$CONFIG_INITRD_FS" = "EXT2" ]; then
-			BOOT_OPTION_RAMDISK="rw ramdisk_size=$ISIZE"
+			BOOT_OPTION_RAMDISK="ro ramdisk_size=$ISIZE"
 		fi
 
-		#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz [rw ramdisk=$ISIZE][ramdisk_blocksize=4096]
+		#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz [ro ramdisk=$ISIZE][ramdisk_blocksize=4096]
 		BOOT_OPTIONS_DL="root=/dev/ram0 initrd=/boot/initrd.gz init=/linuxrc $BOOT_OPTION_RAMDISK"
 		cat > $CDDIR/isolinux.cfg <<-EOF
 		default $BOOT_OPTION_DEFAULT
@@ -356,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





[Devil-linux-commit] build/scripts build-iso, 1.72, 1.73 create_etc, 1.15, 1.16 ebtables, 1.10, 1.1

[Devil-linux-commit] build/scripts build-iso, 1.72, 1.73 create_etc, 1.15, 1.16 ebtables, 1.10, 1.11 pptp-linux, 1.9, 1.10