|
From: Heiko Z. <smi...@us...> - 2007-11-25 15:14:52
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv3236/scripts Modified Files: gcc-4 syslinux util-linux Log Message: - loop-AES to v3.2b - grsecurity-2.1.11 to 2.6.23.8-200711230831 - open-vm-tools to 2007.11.21 - updated pax-linux to 2.6.23-test13 - fixed open-vm-tools compile - fixed syslinux compile - replaced util-linux with util-linux-ng-2.13.0.1 Index: syslinux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- syslinux 17 Nov 2007 17:01:16 -0000 1.24 +++ syslinux 25 Nov 2007 15:14:48 -0000 1.25 @@ -31,14 +31,15 @@ touch .done_dl_patch fi - #if [ "$CONFIG_GCC_HARDENED" = "y" ]; then - # make $PMAKE CC="gcc -U_FORTIFY_SOURCE -nopie -fno-stack-protector" install|| exit 1 - #else - # make $PMAKE install|| exit 1 - #fi - #strip_debug + if [ "$CONFIG_GCC_HARDENED" = "y" ]; then + make $PMAKE CC="gcc -fno-PIE" install|| exit 1 + else + make $PMAKE install|| exit 1 + fi + + strip_debug #instal it, we need it later - #make install || exit 1 + make install || exit 1 ;; install ) Index: util-linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- util-linux 15 Sep 2007 17:05:56 -0000 1.40 +++ util-linux 25 Nov 2007 15:14:48 -0000 1.41 @@ -27,9 +27,9 @@ build ) if [ ! -f util-linux-patch.done ]; then echo "patch loop-AES " - patch -p1 -i $(find_src_dir loop-AES)/util-linux-2.13*.diff || exit 1 + patch -p1 -i $(find_src_dir loop-AES)/util-linux-ng-2.13*.diff || exit 1 echo "other patches" - #bzcat $DL_DIR/src/util-linux*.patch.bz2 | patch -p1 || exit 1 + bzcat $DL_DIR/src/util-linux*.patch.bz2 | patch -p1 || exit 1 touch util-linux-patch.done fi @@ -40,6 +40,7 @@ cd lib || exit 1 make all || exit 1 + make install || exit 1 #for libradius-linux compilation cp ./libmd5.a /usr/local/lib/ || exit 1 cd .. Index: gcc-4 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gcc-4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gcc-4 22 Oct 2007 13:13:07 -0000 1.3 +++ gcc-4 25 Nov 2007 15:14:48 -0000 1.4 @@ -29,12 +29,15 @@ build ) CONFIG_EXTRA="" EXTRA_OPTIONS="" - - if [ ! -f gcc-patches.done ]; then - #echo "applying gcc patches" - #bzcat $DL_DIR/src/gcc-4*patch.bz2 | patch -p1 || exit 1 - touch gcc-patches.done - fi + + if [ ! -f devil-linux-gcc-patches.done ]; then + for PATCH in $(ls ../gcc4-patches/*) + do + echo applying patch: $PATCH + patch -i $PATCH -p1 || exit 1 + done + touch devil-linux-gcc-patches.done + fi if [ "$CONFIG_GCC_HARDENED" = "y" ]; then # and now make sure we use SSP and other stuff when compiling @@ -58,7 +61,7 @@ #EXTRAOPTIONS="$EXTRAOPTIONS gcc_cv_libc_provides_ssp=yes" CONFIG_EXTRA="$CONFIG_EXTRA --disable-werror" fi - + # This version of GCC has a small bug/typo with RPATH_ENVVAR value for bfd and opcode. # Use the following commands to fix this bug, so that .--enable-shared. will work: cp -v Makefile.in{,.orig} |