From: Heiko Z. <smi...@us...> - 2007-05-01 00:30:36
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21408/scripts Modified Files: build.sh ebtables gawk glibc ipset iptables linux linux-wlan-ng loop-AES ncftp net-snmp netpbm pam_radius pwlib settings sg3_utils vsftpd watchdog Log Message: more updates to get everything working Index: iptables =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iptables,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- iptables 4 Mar 2007 18:13:12 -0000 1.30 +++ iptables 1 May 2007 00:30:31 -0000 1.31 @@ -27,9 +27,6 @@ case $1 in build ) FLAGS="-O2" - if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then - FLAGS="-O2 -fno-stack-protector" - fi if [ ! -f .done_imq_patch ]; then touch .done_imq_patch Index: pwlib =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/pwlib,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- pwlib 22 Feb 2007 13:43:16 -0000 1.19 +++ pwlib 1 May 2007 00:30:31 -0000 1.20 @@ -32,11 +32,7 @@ if [ "$CONFIG_PWLIB" = "y" ]; then rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so export PWLIBDIR=$PWD - if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then - CFLAGS="-Os -fno-stack-protector" - else - CFLAGS="-Os" - fi + CFLAGS="-Os" export CFLAGS # remove the --disable-openldap once a pwlib update comes out ./configure --prefix=/usr --disable-openldap || exit 1 Index: ebtables =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ebtables,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ebtables 28 Dec 2006 16:06:41 -0000 1.12 +++ ebtables 1 May 2007 00:30:31 -0000 1.13 @@ -46,7 +46,8 @@ # bzcat $DL_DIR/src/ebtables-v2.0.8-rc2.patch.bz2 | patch || exit 1 # touch devil-linux-ebtables-makefile-patch.done #fi - make MANDIR=/usr/share/man $PMAKE CC="gcc -fno-stack-protector" all || exit 1 + #make MANDIR=/usr/share/man $PMAKE CC="gcc -fno-stack-protector" all || exit 1 + make MANDIR=/usr/share/man $PMAKE all || exit 1 strip_debug fi ;; Index: net-snmp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- net-snmp 23 Mar 2007 22:20:49 -0000 1.8 +++ net-snmp 1 May 2007 00:30:31 -0000 1.9 @@ -30,11 +30,11 @@ if [ "$CONFIG_NET_SNMP" = "y" ]; then ./configure --prefix=/usr --disable-debugging --sysconfdir=/etc --localstatedir=/var --with-defaults --enable-shared --enable-ipv6 --enable-ucd-compatibility --with-zlib --with-mib-modules="smux" || exit 1 # disable parallel builds - make all || exit 1 + make -j 1 all || exit 1 strip_debug #mkdir -p $WORKDIR/LIBS/net-snmp || exit 1 #make install prefix=$WORKDIR/LIBS/net-snmp/usr exec_prefix=$WORKDIR/LIBS/net-snmp/usr sysconfdir=$WORKDIR/LIBS/net-snmp/etc persistentdir=$WORKDIR/LIBS/net-snmp/var/net-snmp || exit 1 - make install || exit 1 + make -j 1 install || exit 1 fi ;; @@ -42,7 +42,7 @@ if [ "$CONFIG_NET_SNMP" = "y" ]; then rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 - make install prefix=$TMPDIR/usr exec_prefix=$TMPDIR/usr sysconfdir=$TMPDIR/etc persistentdir=$TMPDIR/var/net-snmp || exit 1 + make -j 1 install prefix=$TMPDIR/usr exec_prefix=$TMPDIR/usr sysconfdir=$TMPDIR/etc persistentdir=$TMPDIR/var/net-snmp || exit 1 copy_docs $TMPDIR rm -rf $TMPDIR/usr/include || exit 1 cp -dpR $TMPDIR/usr/share $CDDIR/usr/ || exit 1 Index: settings =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/settings,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- settings 26 Mar 2007 12:40:17 -0000 1.53 +++ settings 1 May 2007 00:30:31 -0000 1.54 @@ -43,7 +43,7 @@ fi PMAKE="" -test -n "$CONFIG_PMAKE" && PMAKE="-j$CONFIG_PMAKE" +test -n "$CONFIG_PMAKE" && PMAKE="-j ${CONFIG_PMAKE}" test -n "$CONFIG_PARALLEL_JOBS" || CONFIG_PARALLEL_JOBS=1 CONF_HOST="i$CONFIG_CPU-pc-linux-gnu" Index: ipset =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ipset,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ipset 28 Feb 2006 06:47:33 -0000 1.4 +++ ipset 1 May 2007 00:30:31 -0000 1.5 @@ -29,9 +29,6 @@ if [ "$CONFIG_NF_PATCHES" = "y" ]; then if [ "$CONFIG_NF_BASE" = "y" ]; then FLAGS="-O2" - if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then - FLAGS="-O2 -fno-stack-protector" - fi replace_str Makefile "/usr/local" "/usr" # parallel build failes, do not use $PMAKE Index: sg3_utils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sg3_utils,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- sg3_utils 28 Dec 2004 18:55:09 -0000 1.11 +++ sg3_utils 1 May 2007 00:30:31 -0000 1.12 @@ -27,7 +27,7 @@ case $1 in build ) if [ "$CONFIG_SG3_UTILS" = "y" ]; then - replace_str Makefile "CFLAGS = " "CFLAGS = -no-pie " + #replace_str Makefile "CFLAGS = " "CFLAGS = -no-pie " make $PMAKE all || exit 1 strip_debug fi Index: loop-AES =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/loop-AES,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- loop-AES 30 Sep 2005 22:59:06 -0000 1.7 +++ loop-AES 1 May 2007 00:30:31 -0000 1.8 @@ -23,11 +23,8 @@ case $1 in build ) - if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then - make CC="gcc -no-pie -fno-stack-protector-all" LINUX_SOURCE=$KERNELDIR INSTALL_MOD_PATH=$(pwd) || exit 1 - else - make CC="gcc -no-pie" LINUX_SOURCE=$KERNELDIR INSTALL_MOD_PATH=$(pwd) || exit 1 - fi + #make CC="gcc -no-pie" LINUX_SOURCE=$KERNELDIR INSTALL_MOD_PATH=$(pwd) || exit 1 + make LINUX_SOURCE=$KERNELDIR INSTALL_MOD_PATH=$(pwd) || exit 1 ;; install ) Index: gawk =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gawk,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gawk 12 Dec 2004 21:48:08 -0000 1.9 +++ gawk 1 May 2007 00:30:31 -0000 1.10 @@ -25,9 +25,21 @@ case $1 in build ) + if [ ! -f .DL-patch.done ]; then + bzcat $DL_DIR/src/gawk-3.1.5-segfault_fix-1.patch.bz2 | patch -p1 || exit 1 + touch .DL-patch.done + fi ./configure --prefix=/usr --libexecdir=/usr/bin --disable-nls || exit 1 make $PMAKE all || exit 1 strip_debug + + # install the updated version + rm -rf /usr/bin/awk + mkdir /usr/bin/awk + make install || exit 1 + rm -rf /usr/bin/awk + rm -rf $TMPDIR/usr/bin/awk + ln -sf gawk /usr/bin/awk || exit 1 ;; install ) Index: linux-wlan-ng =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/linux-wlan-ng,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- linux-wlan-ng 27 Mar 2007 00:52:50 -0000 1.20 +++ linux-wlan-ng 1 May 2007 00:30:31 -0000 1.21 @@ -49,16 +49,8 @@ make default_config || exit 1 - if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then - make oldconfig - make CC="gcc -no-pie -fno-stack-protector-all " $PMAKE all || exit 1 - make CC="gcc -no-pie -fno-stack-protector-all " -C add-ons/keygen || exit 1 - else - #make CC="gcc -no-pie " $PMAKE all || exit 1 - #make CC="gcc -no-pie " -C add-ons/keygen || exit 1 - make $PMAKE all || exit 1 - make -C add-ons/keygen || exit 1 - fi + make $PMAKE all || exit 1 + make -C add-ons/keygen || exit 1 strip_debug replace_str etc/wlan/wlan.conf '^WLAN_DEVICES="wlan0"' '#WLAN_DEVICES="wlan0"' Index: vsftpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/vsftpd,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- vsftpd 5 Dec 2005 16:46:40 -0000 1.15 +++ vsftpd 1 May 2007 00:30:31 -0000 1.16 @@ -47,7 +47,8 @@ fi echo -e "\n#endif /* VSF_BUILDDEFS_H */" >> $BUILDDEF || exit 1 - make $PMAKE CFLAGS="-O2 -Wall -Wshadow -W -no-pie" LINK="-Wl,-s,-pie" || exit 1 + #make $PMAKE CFLAGS="-O2 -Wall -Wshadow -W -no-pie" LINK="-Wl,-s,-pie" || exit 1 + make $PMAKE || exit 1 strip_debug fi ;; Index: netpbm =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/netpbm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- netpbm 23 Oct 2006 16:54:55 -0000 1.2 +++ netpbm 1 May 2007 00:30:31 -0000 1.3 @@ -29,12 +29,14 @@ build ) if [ "$CONFIG_NETPBM" = "y" ]; then cp $MYDIR/config/netpbm Makefile.config || exit 1 - make || exit 1 + # we need the -j1 otherwise it fails when we have more then one compile job running + make -j 1 || exit 1 strip_debug rm -rf $TMPDIR - make package pkgdir=$TMPDIR || exit 1 + make -j 1 package pkgdir=$TMPDIR || exit 1 + DESTDIR=/usr mkdir -p $DESTDIR/share/netpbm || exit 1 cp -vdpR $TMPDIR/{bin,lib,include} $DESTDIR/ || exit cp -vdpR $TMPDIR/link/* $DESTDIR/lib/ || exit @@ -50,13 +52,13 @@ if [ "$CONFIG_NETPBM" = "y" ]; then rm -rf $TMPDIR - make package pkgdir=$TMPDIR || exit 1 + make -j 1 package pkgdir=$TMPDIR || exit 1 DESTDIR=$CDDIR/usr mkdir -p $DESTDIR/share/netpbm || exit 1 - cp -vdpR $TMPDIR/{bin,lib} $DESTDIR/ || exit - cp -vdpR $TMPDIR/man $DESTDIR/share/ || exit - cp -vdpR $TMPDIR/misc/* $DESTDIR/share/netpbm/ || exit + cp -vdpR $TMPDIR/{bin,lib} $DESTDIR/ || exit 1 + cp -vdpR $TMPDIR/man $DESTDIR/share/ || exit 1 + cp -vdpR $TMPDIR/misc/* $DESTDIR/share/netpbm/ || exit 1 rm -rf $TMPDIR || exit 1 fi Index: pam_radius =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/pam_radius,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- pam_radius 30 Apr 2006 03:30:12 -0000 1.4 +++ pam_radius 1 May 2007 00:30:31 -0000 1.5 @@ -26,8 +26,8 @@ case $1 in build ) if [ "$CONFIG_FREERADIUS" = "y" ]; then - - make CC="gcc -fno-stack-protector" $PMAKE || exit 1 + #make CC="gcc -fno-stack-protector" $PMAKE || exit 1 + make $PMAKE || exit 1 strip_debug # install it in local system, because other programs could need it cp -p pam_radius_auth.so /lib/security || exit 1 Index: linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/linux,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- linux 20 Mar 2007 02:41:45 -0000 1.59 +++ linux 1 May 2007 00:30:31 -0000 1.60 @@ -32,17 +32,10 @@ # append settings from other progs to config file cat .config.add >> .config || exit 1 fi - if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then - make oldconfig - make CC="gcc -no-pie -fno-stack-protector-all" $PMAKE bzImage || exit 1 - make CC="gcc -no-pie -fno-stack-protector-all" $PMAKE modules || exit 1 - else - make oldconfig - #make CC="gcc -no-pie" $PMAKE bzImage || exit 1 - #make CC="gcc -no-pie" $PMAKE modules || exit 1 - make $PMAKE bzImage || exit 1 - make $PMAKE modules || exit 1 - fi + + make oldconfig + make CC="gcc -D_FORTIFY_SOURCE=0" $PMAKE bzImage || exit 1 + make CC="gcc -D_FORTIFY_SOURCE=0" $PMAKE modules || exit 1 ;; Index: watchdog =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/watchdog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- watchdog 20 Mar 2007 02:41:45 -0000 1.20 +++ watchdog 1 May 2007 00:30:31 -0000 1.21 @@ -33,7 +33,8 @@ fi add_kernel_options $MYDIR/config/config_watchdog ./configure --prefix=/usr --localstatedir=/var --disable-nfs --with-linelength=256|| exit 1 - make LDFLAGS="" CFLAGS="-g -O2 -no-pie" $PMAKE all || exit 1 + #make LDFLAGS="" CFLAGS="-g -O2 -no-pie" $PMAKE all || exit 1 + make $PMAKE all || exit 1 strip_debug fi ;; Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- build.sh 20 Mar 2007 02:41:45 -0000 1.99 +++ build.sh 1 May 2007 00:30:31 -0000 1.100 @@ -148,7 +148,7 @@ echo ".PHONY: all " >> $WORKDIR/Makefile.inc2.$CMD echo "all : $ALLGROUPS \$($LASTNO)" >> $WORKDIR/Makefile.inc2.$CMD - make -j $CONFIG_PARALLEL_JOBS -C $WORKDIR -f Makefile.$CMD || exit 1 + make -j ${CONFIG_PARALLEL_JOBS} -C $WORKDIR -f Makefile.$CMD || exit 1 done Index: ncftp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ncftp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ncftp 12 Dec 2004 21:48:08 -0000 1.8 +++ ncftp 1 May 2007 00:30:31 -0000 1.9 @@ -30,7 +30,9 @@ case $1 in build ) if [ "$CONFIG_NCFTP" = "y" ]; then + #./configure --prefix=/usr --disable-precomp || exit 1 ./configure --prefix=/usr || exit 1 + #make CC="gcc -D_FORTIFY_SOURCE=0" $PMAKE || exit 1 make $PMAKE || exit 1 strip_debug fi Index: glibc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/glibc,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- glibc 19 Apr 2007 15:39:21 -0000 1.52 +++ glibc 1 May 2007 00:30:31 -0000 1.53 @@ -56,19 +56,6 @@ done touch devil-linux-glibc-hardened.done fi - #export CC="gcc -no-pie" - #if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then - # if [ ! -f devil-linux-glibc-ssp-patches.done ]; then - # #cp -v ../glibc-ssp/ssp.c sysdeps/unix/sysv/linux/ || exit 1 - # for PATCH in $(ls ../glibc-ssp/*patch) - # do - # echo applying patch: $PATCH - # patch -i $PATCH -p1 || exit 1 - # done - # touch devil-linux-glibc-ssp-patches.done - # fi - # export CC="gcc -no-pie -fno-stack-protector-all" - #fi if [ "$CONFIG_GCC_HARDENED" = "y" ]; then if [ ! -f .done_hardened ]; then @@ -122,8 +109,6 @@ sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED - #../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/bin \ - # -without-cvs --enable-bind-now || exit 1 ../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/lib/glibc \ --enable-kernel=2.6.0 --enable-bind-now --enable-stackguard-randomization || exit 1 |