|
From: Heiko Z. <smi...@us...> - 2007-04-23 20:18:04
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21982/scripts Modified Files: acl binutils hotplug iproute2 xfsprogs Log Message: more fixes for the new security Index: xfsprogs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/xfsprogs,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- xfsprogs 8 Sep 2006 21:55:03 -0000 1.26 +++ xfsprogs 23 Apr 2007 20:17:58 -0000 1.27 @@ -37,13 +37,12 @@ install ) if [ "$CONFIG_XFS" = "y" ]; then - make -C build dist - SDIR=$(pwd) - cd $CDDIR || exit 1 - tar -xzf $SDIR/build/tar/xfsprogs*.tar.gz || exit 1 - cp -vdpR share/doc usr/share/ || exit 1 - cp -vdpR man usr/share/ || exit 1 - rm -fr doc man + mkdir -p $TMPDIR/usr || exit 1 + make prefix=$TMPDIR/usr install || exit 1 + copy_docs $TMPDIR + cp -dpvR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR + fi ;; Index: hotplug =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/hotplug,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- hotplug 16 Jun 2004 02:29:20 -0000 1.11 +++ hotplug 23 Apr 2007 20:17:58 -0000 1.12 @@ -29,15 +29,10 @@ if [ "$CONFIG_HOTPLUG" = "y" ]; then if [ ! -f devil-linux-hotplug_nowarning.done ]; then touch devil-linux-hotplug_nowarning.done - bzcat $DL_DIR/src/hotplug_nowarning.diff.bz2 | patch -p1 || exit 1 + #bzcat $DL_DIR/src/hotplug_nowarning.diff.bz2 | patch -p1 || exit 1 fi copy_man - # clean out the CVS stuff and set correct permissions - find -name CVS | xargs rm -rf || exit 1 - chmod 755 etc/hotplug/*.agent || exit 1 - chmod 755 etc/hotplug/*.rc || exit 1 - cp -dpR ./etc/hotplug $ETCDIR/etc/ || exit 1 cp -dpR ./etc/hotplug.d $ETCDIR/etc/ || exit 1 cp -dpR ./sbin/* $CDDIR/sbin/ || exit 1 Index: acl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/acl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- acl 8 Sep 2006 21:55:03 -0000 1.17 +++ acl 23 Apr 2007 20:17:58 -0000 1.18 @@ -36,13 +36,11 @@ ;; install ) - #./Makepkgs rpm - make -C build dist - SDIR=$(pwd) - cd $CDDIR || exit 1 - tar -xzf $SDIR/build/tar/acl*.tar.gz || exit 1 - cp -dpR usr/man/ usr/share/ || exit 1 - rm -fr usr/man + mkdir -p $TMPDIR/usr || exit 1 + make prefix=$TMPDIR/usr install install-lib || exit 1 + copy_docs $TMPDIR + cp -dpvR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR ;; * ) Index: iproute2 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iproute2,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- iproute2 30 Oct 2006 16:20:54 -0000 1.28 +++ iproute2 23 Apr 2007 20:17:58 -0000 1.29 @@ -25,6 +25,8 @@ MYNAME=IPROUTE2 +cd $(find_src_dir iproute) || exit 1 + case $1 in build ) if [ "$CONFIG_IPROUTE2" = "y" ]; then @@ -32,10 +34,9 @@ # touch devil-linux-patches.done # zcat $DL_DIR/src/iproute_*.diff.gz | patch -p1 || exit 1 #fi - replace_str Makefile /usr/src/linux $KERNELDIR - replace_str Config "TC_CONFIG_ATM=y" "TC_CONFIG_ATM=n" + #replace_str Makefile /usr/src/linux $KERNELDIR + #replace_str Config "TC_CONFIG_ATM=y" "TC_CONFIG_ATM=n" - old_kernel_includes make SBINDIR=/sbin $PMAKE all || exit 1 strip_debug fi Index: binutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/binutils,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- binutils 19 Apr 2007 15:39:21 -0000 1.15 +++ binutils 23 Apr 2007 20:17:58 -0000 1.16 @@ -47,7 +47,7 @@ #make headers -C bfd || exit 1 - $WORKDIR/binutils-2*/configure --prefix=/usr --localstatedir=/var --enable-shared || exit 1 + CC="gcc -D_FORTIFY_SOURCE=0" $WORKDIR/binutils-2*/configure --prefix=/usr --localstatedir=/var --enable-shared || exit 1 make tooldir=/usr all || exit 1 strip_debug |