[Devil-linux-commit] build/scripts prepare, 1.93, 1.94 util-linux, 1.51, 1.52

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

Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv5908/scripts

Modified Files:
	prepare util-linux 
Log Message:
- updated cryptsetup to 1.4.1
- updated e2fsprogs to 1.42
- updated iptables to 1.4.12.2
- updated loop-AES to v3.6e
- updated util-linux to 2.20.1
- updated xtables-addons to 1.41


Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- util-linux	5 Dec 2011 09:11:38 -0000	1.51
+++ util-linux	31 Jan 2012 17:37:35 -0000	1.52
@@ -16,22 +16,10 @@
 
 case $1 in
     build )
-	if [ ! -f util-linux-patch.done ]; then
-		echo "patch loop-AES "
-		patch -p1 -i $(find_src_dir loop-AES)/util-linux-2.19.1.diff || exit 1
-		#echo "other patches"
-		touch util-linux-patch.done
-	fi
+	patch_from_file 1 $(find_src_dir loop-AES)/util-linux-2.20.1.diff || exit 1
 	
 	./configure --enable-arch --enable-partx --enable-write --disable-wall || exit 1
 
-	#cd lib || exit 1
-	#for libradius-linux compilation
-	#libtool --mode=compile --tag=CC gcc -I../include/ -O3 -funroll-loops -fpic -shared -c md5.c || exit 1
-	#libtool --mode=link gcc -O3 -funroll-loops -fpic -o libmd5.la md5.lo || exit 1
-	#cp ./.libs/libmd5.a /usr/local/lib/ || exit 1
-	#cd ..
-	
 	if [ "${CONFIG_GCC_HARDENED}" = "y" ]; then
 	    make $PMAKE LDFLAGS="-pie" || exit 1
 	else
@@ -50,8 +38,6 @@
 
 	copy_docs $TMPDIR
 	rm -rf $TMPDIR/usr/share || exit 1
-	#cp -dpR $TMPDIR/etc $ETCDIR/ || exit 1
-	#rm -rf $TMPDIR/etc || exit 1
 	cp -dpR $TMPDIR/* $CDDIR/ || exit 1
 	rm -rf $TMPDIR || exit 1
 	cp $MYDIR/scripts/blankscreen $ETCDIR/etc/init.d || exit 1

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- prepare	21 Nov 2011 21:17:22 -0000	1.93
+++ prepare	31 Jan 2012 17:37:34 -0000	1.94
@@ -185,6 +185,7 @@
                 patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-standalone.patch || exit 1
                 cp -dpvR ${AUFSDIR}/aufs3-standalone/{fs,Documentation} $KERNELDIR/ || exit 1
                 cp -dpvR ${AUFSDIR}/aufs3-standalone/include/linux/aufs_type.h $KERNELDIR/include/linux/ || exit 1
+                #patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-loopback.patch || exit 1
                 bzcat $DL_DIR/src/aufs2-pax-fix.patch.bz2 | patch -d $KERNELDIR -p1 || exit 1
                 touch $KERNELDIR/.done_aufs_patch
             fi