[Devil-linux-commit] build/scripts freeradius, 1.5, 1.6 sysstat, 1.12, 1.13

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

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

Modified Files:
	freeradius sysstat 
Log Message:
more fixes


Index: freeradius
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/freeradius,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freeradius	21 Mar 2007 13:48:48 -0000	1.5
+++ freeradius	11 May 2007 15:29:27 -0000	1.6
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       freeradius
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs perl Python Linux-PAM
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -28,10 +28,18 @@
 case $1 in
 	build )
 		if [ "$CONFIG_FREERADIUS" = "y" ]; then
-			./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1
+			./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --enable-shared --with-system-libtool || exit 1
 			#--with-rlm-krb5-include-dir=/usr/include/heimdal || exit 1
 			make all || exit 1
 			strip_debug
+			
+			# make sure this variable uses the correct perl version
+			PERLVER=$(ls -d /usr/lib/perl5/5.*)
+			PERLVER=${PERLVER##/*/}
+			PERLDIR=$(ls -d /usr/lib/perl5/5.*/i*linux*)
+			PERLDIR=${PERLDIR##/*/}
+			replace_str src/modules/rlm_perl/rlm_perl.la 5.8.0 $PERLVER
+			replace_str src/modules/rlm_perl/rlm_perl.la i486-linux $PERLDIR
 		fi
 		;;
 
@@ -43,9 +51,9 @@
 			copy_files $TMPDIR/usr $CDDIR/ || exit 1
 			copy_files $TMPDIR/var $CDDIR/ || exit 1
 			copy_files $TMPDIR/etc/raddb $ETCDIR/etc/ || exit 1
-			rm -rf $TMPDIR || exit 1
 	
 			cp scripts/rc.radiusd $ETCDIR/etc/init.d/freeradius || exit 1
+			rm -rf $TMPDIR || exit 1
 
 			echo "# start freeradius?" >> $CONFIGFILE
                         echo "START_$MYNAME=no" >> $CONFIGFILE

Index: sysstat
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sysstat,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sysstat	20 Dec 2006 01:39:13 -0000	1.12
+++ sysstat	11 May 2007 15:29:27 -0000	1.13
@@ -28,6 +28,7 @@
 	build )
 	    if [ "$CONFIG_SYSSTAT" = "y" ]; then
 		cp $DL_DIR/scripts/config/config_sysstat ./build/CONFIG || exit 1
+		./configure --prefix=/usr --disable-nls || exit 1
 		make $PMAKE all || exit 1
 		strip_debug
 	    fi