Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv13276/scripts Modified Files: Libnet compartment create_cd_dirs gcc grub heimdal net-tools snort syslinux wvstreams Log Message: a bunch of software updates to get gcc 3.3 running Index: Libnet =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Libnet,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Libnet 13 Oct 2003 17:36:07 -0000 1.5 +++ Libnet 3 Nov 2003 19:35:41 -0000 1.6 @@ -30,9 +30,10 @@ make $PMAKE all || exit 1 strip_debug # install it in local system, because other programs could need it - make install + make install || exit 1 + cp -dpf libnet-config /usr/bin || exit 1 ;; - + * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" Index: compartment =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/compartment,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- compartment 13 Oct 2003 17:36:08 -0000 1.12 +++ compartment 3 Nov 2003 19:35:41 -0000 1.13 @@ -29,6 +29,7 @@ bzcat $DL_DIR/src/compartment-1.2-suse-patches.diff.bz2 | patch -p1 || exit 1 bzcat $DL_DIR/src/compartment-env.diff.bz2 | patch -p1 || exit 1 bzcat $DL_DIR/src/compartment-no-close-fd.diff.bz2 | patch -p1 || exit 1 + bzcat $DL_DIR/src/compartment-gcc33.diff.bz2 | patch -p1 || exit 1 make $PMAKE clean all || exit 1 strip_debug Index: create_cd_dirs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/create_cd_dirs,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- create_cd_dirs 13 Oct 2003 17:36:08 -0000 1.22 +++ create_cd_dirs 3 Nov 2003 19:35:41 -0000 1.23 @@ -33,9 +33,6 @@ echo "creating directory structure" umask 022 - # package directory - mkdir -p $PACKAGEDIR - # the boot image tree DIRS='boot dev' mk_dir $BOOTIMAGEDIR $DIRS @@ -73,9 +70,7 @@ ln -sf /var/tmp $CDDIR/usr/tmp ln -sf /shm/jail $CDDIR/jail - # set directory permissions - chmod 0750 $CDDIR/root chmod 1777 $CDDIR/var/tmp ;; Index: gcc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gcc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gcc 13 Oct 2003 17:36:08 -0000 1.9 +++ gcc 3 Nov 2003 19:35:41 -0000 1.10 @@ -37,6 +37,10 @@ touch ./.done_patch_protector fi fi + if [ ! -f gcc-patches.done ]; then + bzcat $DL_DIR/src/gcc-3*patch.bz2 | patch -p0 || exit 1 + touch gcc-patches.done + fi rm -rf ../gcc-build mkdir ../gcc-build || exit 1 Index: grub =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/grub,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- grub 13 Oct 2003 17:36:08 -0000 1.6 +++ grub 3 Nov 2003 19:35:41 -0000 1.7 @@ -29,22 +29,6 @@ case $1 in build ) if [ ! -f grub-patches.done ]; then - patch -p1 < ../grub-patches/grub-0.93-configfile.patch || exit - patch -p1 < ../grub-patches/grub-0.90-symlinkmenulst.patch || exit - patch -p1 < ../grub-patches/grub-0.90-install.in.patch || exit - patch -p1 < ../grub-patches/grub-0.90-installcopyonly.patch || exit - patch -p1 < ../grub-patches/grub-0.90-addsyncs.patch || exit - patch -p1 < ../grub-patches/grub-0.90-staticcurses.patch || exit - patch -p1 < ../grub-patches/grub-0.92-automake16.patch || exit - patch -p0 < ../grub-patches/grub-0.93-endedit.patch || exit - patch -p0 < ../grub-patches/grub-0.93-largedisk.patch || exit - patch -p1 < ../grub-patches/grub-0.90-append.patch || exit - patch -p1 < ../grub-patches/grub-0.91-bootonce.patch || exit - patch -p1 < ../grub-patches/grub-0.93-graphics.patch || exit - patch -p1 < ../grub-patches/grub-0.91-splashimagehelp.patch || exit - patch -p1 < ../grub-patches/grub-0.93-graphics-bootterm.patch || exit - patch -p1 < ../grub-patches/grub-0.93-special-device-names.patch || exit - patch -p1 < ../grub-patches/grub-0.92-hammer.patch || exit touch grub-patches.done fi if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then @@ -53,7 +37,10 @@ CFLAGS="-Os" fi export CFLAGS - autoreconf --install --force + #autoreconf --install --force + aclocal + automake + autoconf ./configure --prefix=/usr --sbindir=/sbin --disable-auto-linux-mem-opt make $PMAKE || exit 1 Index: heimdal =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/heimdal,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- heimdal 1 Nov 2003 20:15:52 -0000 1.4 +++ heimdal 3 Nov 2003 19:35:41 -0000 1.5 @@ -28,6 +28,7 @@ case $1 in build ) if [ "$CONFIG_HEIMDAL" = "y" ]; then + bzcat $DL_DIR/src/heimdal*patch.bz2 | patch -p1 || exit 1 ./configure --prefix=/usr --includedir=/usr/include/heimdal --localstatedir=/var --enable-shared --disable-berkeley-db || exit 1 make $PMAKE all || exit 1 strip_debug Index: net-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-tools,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- net-tools 13 Oct 2003 17:36:08 -0000 1.11 +++ net-tools 3 Nov 2003 19:35:41 -0000 1.12 @@ -26,6 +26,7 @@ case $1 in build ) + zcat $DL_DIR/src/net-tools*.diff.gz | patch -p1 || exit 1 cp $MYDIR/config/config_net-tools.h ./config.h cp $MYDIR/config/config_net-tools.make ./config.make # parallel build fails - do not use $PMAKE Index: snort =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/snort,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- snort 13 Oct 2003 17:36:09 -0000 1.12 +++ snort 3 Nov 2003 19:35:41 -0000 1.13 @@ -33,7 +33,7 @@ [ "$CONFIG_MYSQL_CLIENT" = "y" ] && OPT_FLAGS="$OPT_FLAGS --with-mysql" [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ] && OPT_FLAGS="$OPT_FLAGS --with-postgresql" if [ "$CONFIG_SNORT" = "y" ]; then - ./configure --prefix=/usr --bindir=/usr/sbin --sysconfdir=/etc/snort --localstatedir=/var --enable-flexresp $OPT_FLAGS || exit 1 + ./configure --prefix=/usr --bindir=/usr/sbin --sysconfdir=/etc/snort --localstatedir=/var $OPT_FLAGS || exit 1 make $PMAKE all || exit 1 strip_debug fi Index: syslinux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- syslinux 13 Oct 2003 17:36:09 -0000 1.11 +++ syslinux 3 Nov 2003 19:35:41 -0000 1.12 @@ -26,6 +26,8 @@ case $1 in build ) + # nothing to do here, the stuff is pre-compiled and we don't get it working since 2.0.5 anyway + exit 0 if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then make $PMAKE CC="gcc -fno-stack-protector" all || exit 1 else Index: wvstreams =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/wvstreams,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- wvstreams 13 Oct 2003 17:36:09 -0000 1.11 +++ wvstreams 3 Nov 2003 19:35:41 -0000 1.12 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: wvstreams -# Required-Start: $basebuildtools glibc openssl zlib fam gdbm glib +# Required-Start: $basebuildtools glibc openssl zlib fam gdbm glib db-4 db-2 # Required-Stop: # Default-Start: 1 # Default-Stop: @@ -27,10 +27,8 @@ case $1 in build ) if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_WVDIAL" = "y" ]; then - autoheader - autoconf - ./configure --prefix=/usr --with-openssl --with-zlib --disable-efence --disable-debug || exit 1 - make $PMAKE all || exit 1 + ./configure --prefix=/usr --with-openssl --with-zlib --disable-efence --disable-debug --with-fam || exit 1 + make $PMAKE VERBOSE=1 CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" all || exit 1 strip_debug # we have to install this immediately, because this is a library and could be needed by other sources |