[Devil-linux-commit] build/scripts openvpn, 1.14, 1.15 perl, 1.53, 1.54 webmin, 1.4, 1.5

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

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

Modified Files:
	openvpn perl webmin 
Log Message:
- added additional webmin modules
- updated almost all perl modules


Index: webmin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/webmin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- webmin	9 May 2009 16:16:25 -0000	1.4
+++ webmin	17 May 2009 22:06:53 -0000	1.5
@@ -37,7 +37,23 @@
         	    bzcat $DL_DIR/src/webmin-init.patch.bz2 | patch -p1 || exit 1
         	    touch devil_patch_done
 		fi
-
+		echo Unpacking Additional Webmin Modules
+                for FILE in $(ls $DL_DIR/src/webmin-modules/*gz)
+		do
+		    echo unpacking $FILE
+		    tar -xzf $FILE || exit 1
+		done
+                for FILE in $(ls $DL_DIR/src/webmin-modules/*.bz2)
+		do
+		    echo unpacking $FILE
+		    tar -xjf $FILE || exit 1
+		done
+	    
+	    # let's make sure we get all path names for perl fixed
+	    echo "Correcting path to perl"
+	    find -type f | xargs -n 10 perl -i -p -e 's%#!/usr/local/bin/perl%#!/usr/bin/perl%g'
+	    
+																																			    
 	fi
         ;;
     install )
@@ -76,7 +92,6 @@
 	    export nouninstall=1
 	    export nostart=1
 	    export crypt=x
-	    perl -i -p -e 's%#!/usr/local/bin/perl%#!/usr/bin/perl%g' *.pl
 	    ./setup.sh || exit 1
 	    echo "correcting config files"
 	    perl -i -p -e 's%/usr/local/apache%/usr%g' /etc/webmin/apache/*
@@ -84,6 +99,7 @@
 	    perl -i -p -e 's%/usr/local%%g' /etc/webmin/syslog-ng/*
 	    perl -i -p -e 's%/usr/local/mysql/%/usr/%g' /etc/webmin/mysql/*
 	    change_param /etc/webmin/apache/config httpd_conf /etc/apache2/httpd.conf
+	    change_param /etc/webmin/openvpn/config openvpn_path /sbin/openvpn
 
 	    rm /etc/webmin/*cache
 	    cp -dpvR /etc/webmin $ETCDIR/etc/ || exit 1

Index: openvpn
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openvpn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- openvpn	20 Aug 2008 14:17:18 -0000	1.14
+++ openvpn	17 May 2009 22:06:53 -0000	1.15
@@ -51,6 +51,7 @@
             copy_files $TMPDIR/usr/sbin/ $CDDIR/ || exit 1
             rm -rf $TMPDIR || exit 1
 	    cp $MYDIR/scripts/openvpn $ETCDIR/etc/init.d || exit 1
+	    mkdir -p $ETCDIR/etc/openvpn || exit 1
 
 	    echo "# Start openvpn?" >> $CONFIGFILE
 	    echo "START_OPENVPN=no" >> $CONFIGFILE

Index: perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/perl,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- perl	20 Mar 2009 13:55:56 -0000	1.53
+++ perl	17 May 2009 22:06:53 -0000	1.54
@@ -107,7 +107,7 @@
 				fi
 
 				if [ "$do_it" == "1" ]; then
-					pushd $WORKDIR/perl-ext/$EXT*
+					pushd $WORKDIR/perl-ext/$EXT* || exit 1
 					echo "******** compiling perl extension $EXT ********"
 					yes "" | perl Makefile.PL PREFIX=/usr || exit 1
 					strip_debug
@@ -118,7 +118,6 @@
 		
 			done < $MYDIR/config/perl-ext
 			
-			exit 0
 		fi
 		;;