[Devil-linux-commit] build/scripts mktemp, NONE, 1.1.2.1 ntop, 1.3.2.3, 1.3.2.4 syslinux, 1.18.2.2, 1.18.2.3

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

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

Modified Files:
      Tag: rel-1-2-patches
	ntop syslinux 
Added Files:
      Tag: rel-1-2-patches
	mktemp 
Log Message:
- updated Mail-SpamAssassin to 3.2.1
- updated bind to 9.4.1
- updated clamav to 0.90.3
- updated dcc to 1.3.57
- updated expat to 2.0.1
- updated file to 4.21
- updated libpng to 1.2.18
- updated mdadm to 2.6.2
- updated mktemp to 1.5
- updated mtools to 3.9.11
- updated nasm to 0.99.01
- updated ntop to 3.3
- updated ntp to 4.2.4p0
- updated nut to 2.0.5
- updated php to 4.4.7
- updated postfix to 2.4.3
- updated razor-agents to 2.84
- updated sg3_utils to 1.24
- updated syslinux-3.51
- updated tar to 1.17
- updated vtun to 3.0.1
- updated zisofs-tools to 1.0.8


--- NEW FILE: mktemp ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/Attic/mktemp,v $
# $Revision: 1.1.2.1 $
# $Date: 2007/06/15 13:17:47 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       mktemp
# Required-Start: $basebuildtools
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings

case $1 in
	build )
	    if [ ! -f .dl_patch_done ]; then
		bzcat $DL_DIR/src/mktemp-1.5-add_tempfile-3.patch.bz2 | patch -Np1 || exit 1
		touch .dl_patch_done
	    fi
	    ./configure --prefix=/usr --bindir=/bin --with-libc --with-random=/dev/urandom|| exit 1
	    make $PMAKE || exit 1
	    strip_debug
	    
	    #some other programs need this, so let's install it
	    make install || exit 1
            ;;

	install )
	    cp mktemp $CDDIR/bin/ || exit 1
	    cp tempfile $CDDIR/usr/bin/ || exit 1
	    cp mktemp.man $CDDIR/usr/share/man/man1/mktemp.1 || exit 1
	    ;;

	* )
	    echo "ERROR ($0)"
	    echo "please add parameter so I know what to do"
	    exit 1
            ;;
esac

Index: syslinux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -d -r1.18.2.2 -r1.18.2.3
--- syslinux	11 May 2007 14:46:58 -0000	1.18.2.2
+++ syslinux	15 Jun 2007 13:17:47 -0000	1.18.2.3
@@ -32,7 +32,7 @@
 		fi
 
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
-			make $PMAKE CC="gcc -fno-stack-protector" install|| exit 1
+			make $PMAKE CC="gcc -nopie -fno-stack-protector" install|| exit 1
 		else
 			make $PMAKE install|| exit 1
 		fi

Index: ntop
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ntop,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- ntop	12 Apr 2005 15:03:47 -0000	1.3.2.3
+++ ntop	15 Jun 2007 13:17:47 -0000	1.3.2.4
@@ -27,6 +27,7 @@
 case $1 in
 	build )
 		if [ "$CONFIG_NTOP" = "y" ]; then
+			./autogen.sh || exit 1
 			./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 				--with-gdchart-include=/usr/include --with-gdchart-lib=/usr/lib \
 				--with-gd-include=/usr/include --with-gd-lib=/usr/lib \
@@ -42,7 +43,7 @@
 		if [ "$CONFIG_NTOP" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR/usr || exit 1
-			make install DESTDIR=$TMPDIR || exit 1
+			make LN_S="ln -sf" install DESTDIR=$TMPDIR || exit 1
 
 			rm -rf $TMPDIR/usr/lib/*a || exit 1