[Devil-linux-commit] build/scripts jailkit,1.4,1.5

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

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

Modified Files:
	jailkit 
Log Message:
- updated bacula-3.0.3
- updated clamav-0.95.3
- updated jailkit-2.10
- updated pci.ids
- updated samba-3.4.3
- updated strace-4.5.19
- updated tiff-3.9.2
- updated usb.ids
- updated usbutils-0.86
- updated vsftpd-2.2.1


Index: jailkit
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/jailkit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jailkit	7 Jan 2009 06:06:44 -0000	1.4
+++ jailkit	5 Nov 2009 22:18:36 -0000	1.5
@@ -26,12 +26,12 @@
 case $1 in
     build )
 	    if [ "$CONFIG_PYTHON" = "y" ]; then
-		if [ ! -f devil-linux-patches.done ]; then
-			bzcat $DL_DIR/src/jailkit-2.0-destdir.patch.bz2 | patch -p1 || exit 1
-			bzcat $DL_DIR/src/jailkit-2.0-jk_socketd-param.patch.bz2  | patch -p1 || exit 1
-			touch devil-linux-patches.done
-		fi
-		./configure --prefix=/usr || exit 1
+		#if [ ! -f devil-linux-patches.done ]; then
+		#	bzcat $DL_DIR/src/jailkit-2.0-destdir.patch.bz2 | patch -p1 || exit 1
+		#	bzcat $DL_DIR/src/jailkit-2.0-jk_socketd-param.patch.bz2  | patch -p1 || exit 1
+		#	touch devil-linux-patches.done
+		#fi
+		./configure --prefix=/usr --sysconfdir=/etc || exit 1
 		make $PMAKE || exit 1
 		strip_debug
 	    fi
@@ -41,11 +41,7 @@
 	    if [ "$CONFIG_PYTHON" = "y" ]; then
 		rm -rf $TMPDIR || exit 1
 		mkdir -p $TMPDIR/etc || exit 1
-		touch $TMPDIR/etc/shells
 		make DESTDIR=$TMPDIR install || exit 1
-
-		cat $TMPDIR/etc/shells >> $ETCDIR/etc/shells || exit 1
-		rm $TMPDIR/etc/shells || exit 1
 		cp -dvpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
 		copy_docs $TMPDIR
 		cp -dpvR $TMPDIR/usr $CDDIR/ || exit 1