[Devil-linux-commit] build/scripts heartbeat, 1.13, 1.14 mtools, 1.11, 1.12 syslinux, 1.25, 1.26

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

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2148/scripts

Modified Files:
	heartbeat mtools syslinux 
Log Message:
- updated awstats-6.8
- updated bonnie++-1.03e
- updated db-4.7.25
- updated dnsmasq-2.46
- updated file-4.26
- updated glib-2.18.3
- updated httpd-2.2.11
- updated kbd-1.15
- updated l7-protocols-2008-12-18
- updated lftp-3.7.7
- updated libpng-1.2.34
- updated mtools-4.0.1
- updated ncftp-3.2.2-src
- updated netfilter-layer7-v2.21
- updated ntp-4.2.4p6
- updated open-vm-tools-2008.12.23-137496
- updated postfix-2.5.6
- updated quota-3.17
- updated shorewall-common-4.2.4
- updated shorewall-perl-4.2.4.5
- updated shorewall-shell-4.2.4
- updated snort-2.8.3.1
- updated strace-4.5.18
- updated syslinux-3.72
- updated sysstat-8.1.7
- updated tar-1.21
- updated tftp-hpa-0.49


Index: heartbeat
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/heartbeat,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- heartbeat	7 Jan 2009 06:06:08 -0000	1.13
+++ heartbeat	9 Jan 2009 20:05:49 -0000	1.14
@@ -28,6 +28,7 @@
 case $1 in
     build )
 	if [ "$CONFIG_HEARTBEAT" = "y" ]; then
+	    #cd $(find_src_dir Heartbeat) || exit 1
 	    if [ "$CONFIG_PYTHON" = "y" ]; then
 		if [ "$CONFIG_NET_SNMP" != "y" ]; then
 			SNMP="--disable-snmp"
@@ -35,6 +36,7 @@
 
 		#CFLAGS="-D_FORTIFY_SOURCE=0" 
 		#CC="gcc -nopie -fno-stack-protector"
+		#CFLAGS="-fno-stack-protector -D_FORTIFY_SOURCE=0"  ./ConfigureMe configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc ${SNMP} || exit 1
 		CFLAGS="-fno-stack-protector -D_FORTIFY_SOURCE=0"  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc ${SNMP} || exit 1
 
 		make  $PMAKE all || exit 1
@@ -45,6 +47,7 @@
 
     install )
 	if [ "$CONFIG_HEARTBEAT" = "y" ]; then
+	    #cd $(find_src_dir Heartbeat) || exit 1
 	    if [ "$CONFIG_PYTHON" = "y" ]; then
 		rm -rf $TMPDIR || exit 1
 		mkdir -p $TMPDIR || exit 1

Index: syslinux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- syslinux	25 Nov 2007 15:14:48 -0000	1.25
+++ syslinux	9 Jan 2009 20:05:49 -0000	1.26
@@ -43,15 +43,15 @@
 		;;
 
 	install )
-		cp -v isolinux.bin $CDDIR/boot || exit 1
+		cp -v core/isolinux.bin $CDDIR/boot || exit 1
 		#cp -dp ppmtolss16 /usr/bin || exit 1
 
 		# now copy the stuff we need for installing DL on a USB pendrive
 		mkdir -p $CDDIR/boot/syslinux || exit 1
-		cp -v ldlinux.bss $CDDIR/boot/syslinux || exit 1
-		cp -v ldlinux.sys $CDDIR/boot/syslinux || exit 1
+		cp -v core/ldlinux.bss $CDDIR/boot/syslinux || exit 1
+		cp -v core/ldlinux.sys $CDDIR/boot/syslinux || exit 1
 		cp -v mbr/mbr.bin $CDDIR/boot/syslinux || exit 1
-		cp -v unix/syslinux $CDDIR/boot/syslinux || exit 1
+		cp -v linux/syslinux $CDDIR/boot/syslinux || exit 1
 		;;
 
 	* )

Index: mtools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mtools,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mtools	20 Mar 2007 02:41:45 -0000	1.11
+++ mtools	9 Jan 2009 20:05:49 -0000	1.12
@@ -27,11 +27,11 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_MTOOLS" = "y" ]; then
-		if [ ! -f mtools-patches.done ]; then
-			zcat $DL_DIR/src/mtools-3.9.10-*.diff.gz | patch -p1 || exit 1
-			touch mtools-patches.done
-		fi
-		./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1
+		#if [ ! -f mtools-patches.done ]; then
+		#	zcat $DL_DIR/src/mtools-3.9.10-*.diff.gz | patch -p1 || exit 1
+		#	touch mtools-patches.done
+		#fi
+		LDFLAGS=-liconv ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1
 		make $PMAKE all || exit 1
 		strip_debug
 	    fi