[Devil-linux-commit] build/scripts grsecurity,1.27,1.28 perl,1.44,1.45

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

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

Modified Files:
	grsecurity perl 
Log Message:
- updated squid to 2.4-stable11
- updated gcc to 3.4.4
- updated perl to 5.8.7
- more changes to get compile working


Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- grsecurity	6 Feb 2005 04:15:49 -0000	1.27
+++ grsecurity	29 Sep 2005 16:07:21 -0000	1.28
@@ -79,6 +79,7 @@
 				echo >> $HELPFILE
 			fi
 		done
+		rm -rf $TMPDIR || exit 1
 	fi
 	;;
 

Index: perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/perl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- perl	17 Feb 2005 03:09:45 -0000	1.44
+++ perl	29 Sep 2005 16:07:22 -0000	1.45
@@ -27,19 +27,23 @@
 
 case $1 in
     build )
+		if [ "$CONFIG_PERL" = "y" ]; then
 			echo >> ./hints/linux.sh
 			echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh
-			
-			#./Configure -Dprefix=/usr -Dinstallprefix=$TMPDIR -Dusethreads -d -e || exit 1
-			./Configure -Dprefix=/usr -Dusethreads -d -e || exit 1
-			make $PMAKE || exit 1
+
+			./Configure -Dprefix=/usr -Dusedl -Dusethreads -d -e || exit 1
+			# parallel build fails - do not user $PMAKE
+			make || exit 1
+			#make test || exit 1
 
 			#strip_debug
 
-			# I don't know why, but we loose the variable...
+			# delete the old perl version
+			rm -rf /usr/lib/perl5
+
 			make install || exit 1
 
-			# now let's take care of all the perl extension
+			# now let's take care of all the perl extensions
 			rm -rf $WORKDIR/perl-ext
 			mkdir -p $WORKDIR/perl-ext || exit 1
 			cd $WORKDIR/perl-ext || exit 1
@@ -55,16 +59,17 @@
 			done
 
 			for EXT in $(cat $MYDIR/config/perl-ext)
-                        do
-                                pushd $DL_DIR/tmp/perl-*/$EXT*
+			do
+				pushd $WORKDIR/perl-ext/$EXT*
 				echo "******** compiling perl extension $EXT ********"
-				yes "" | perl Makefile.PL PREFIX=/usr && \
-				strip_debug && \
-				make install
+				yes "" | perl Makefile.PL PREFIX=/usr || exit 1
+				strip_debug
+				make install || exit 1
 				popd
 			done
-			
+
 			exit 0
+		fi
 		;;
 
     install )
@@ -73,12 +78,10 @@
 			mkdir -p $TMPDIR|| exit 1
 			make install DESTDIR=$TMPDIR || exit 1
 			copy_docs $TMPDIR
-			rm $TMPDIR/usr/bin/c2ph || exit 1
-			ln -s pstruct $TMPDIR/usr/bin/c2ph || exit 1
 			rm $TMPDIR/usr/bin/perl || exit 1
 
 			# check here if install fails, you probably upgraded to a new perl release
-			PERLBIN=perl5.8.5
+			PERLBIN=perl5.8.7
 			if [ ! -e $TMPDIR/usr/bin/$PERLBIN ]; then
 				echo "You need to edit the perl install script"
 				echo "every time you update to a new release"
@@ -86,7 +89,7 @@
 			fi
 			ln -sf $PERLBIN $TMPDIR/usr/bin/perl || exit 1
 
-			cp -dpR $TMPDIR/usr/* $CDDIR/usr/ || exit 1
+			cp -dpR $TMPDIR/* $CDDIR/ || exit 1
 			rm -rf $TMPDIR || exit 1
 
 			# now let's take care of all the perl extension
@@ -94,7 +97,9 @@
 
 			for EXT in $(ls -d *)
 			do
-				make -C $EXT install DESTDIR=$CDDIR || exit 1
+				pushd $EXT
+				make install DESTDIR=$CDDIR
+				popd
 			done
 
 		fi