devil-linux-commit

[Serge L. <sma...@us...>]

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

Modified Files:
	syslog-ng xfsprogs mdadm 
Added Files:
	libdbi libdbi-drivers 
Log Message:

- updated iptables to 1.4.4
- updated libnfnetlink to 1.0.0
- updated LVM2 to 2.02.47
- updated mdadm to 3.0
- updated openvpn to 2.1_rc18
- updated strongswan to 4.2.16
- updated syslog-ng to 3.0.3
- updated xfsprogs to 3.0.1
- updated IMQ patch 



--- NEW FILE: libdbi-drivers ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/libdbi-drivers,v $
# $Revision: 1.1 $
# $Date: 2009/07/15 21:51:24 $
#
# http://www.devil-linux.org

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

### BEGIN INIT INFO
# Provides:       libdbi-drivers
# Required-Start: postgresql mysql sqlite libdbi 
# 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 [ "$CONFIG_SQLITE" = "y" ]; then
			OPTS="--with-sqlite3"
		fi
		if [ "$CONFIG_MYSQL_CLIENT" = "y" ]; then
			OPTS="$OPTS --with-mysql"
		fi
		if [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ]; then
			OPTS="$OPTS --with-pgsql"
		fi

		./configure --prefix=/usr --disable-docs $OPTS || exit 1
		make $PMAKE all || exit 1
		strip_debug
		
		;;
		
	install )
                rm -rf $TMPDIR || exit 1
		mkdir -p $TMPDIR || exit 1
                make install DESTDIR=$TMPDIR  || exit 1
		rm -rf $TMPDIR/usr/lib/dbd/*a || exit 1
		cp -dpvR $TMPDIR/* $CDDIR/ || exit 1
		rm -rf $TMPDIR || exit 1
		;;
													    
	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac

Index: xfsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/xfsprogs,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- xfsprogs	10 Jan 2009 17:28:02 -0000	1.29
+++ xfsprogs	15 Jul 2009 21:51:24 -0000	1.30
@@ -28,7 +28,7 @@
 case $1 in
     build )
 	if [ "$CONFIG_XFS" = "y" ]; then
-		autoconf || exit 1
+		#autoconf || exit 1
 		./configure --prefix= --enable-shared=yes --enable-shared-uuid=yes --enable-gettext=no || exit 1
 		make DEBUG=-DNDEBUG $PMAKE || exit 1
 		strip_debug

Index: mdadm
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mdadm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mdadm	22 Oct 2007 13:13:07 -0000	1.12
+++ mdadm	15 Jul 2009 21:51:24 -0000	1.13
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       mdadm
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs udev
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -30,7 +30,7 @@
 		    #bzcat $DL_DIR/src/mdadm-*.patch.bz2 | patch -p1  || exit 1
 		    touch devil-linux-mdadm-patch.done
 		fi
-	
+		replace_str Makefile "CWFLAGS = -Wall -Werror" "CWFLAGS = -Wall"
 		make CC="gcc -D_FORTIFY_SOURCE=0" $PMAKE all || exit 1
 		strip_debug
 	fi
@@ -38,12 +38,13 @@
 
 	install )
 	if [ "$CONFIG_MDADM" = "y" ]; then
-		chmod 700 mdadm || exit 1
-		cp mdadm $CDDIR/sbin || exit 1
+		rm -rf $TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR || exit 1
+		cp -aur
 		cp mdadm.conf-example $ETCDIR/etc || exit 1
-		copy_man
-
+		cp -dpR $TMPDIR/* $CDDIR || exit 1
 		cp $MYDIR/scripts/mdadm_monitor $ETCDIR/etc/init.d || exit 1
+
 		echo "# Start the mdadm monitor daemon (for Software RAID)?" >> $CONFIGFILE
                 echo "START_MDADM_MONITOR=no" >> $CONFIGFILE
                 echo >> $CONFIGFILE

--- NEW FILE: libdbi ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/libdbi,v $
# $Revision: 1.1 $
# $Date: 2009/07/15 21:51:24 $
#
# http://www.devil-linux.org

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

### BEGIN INIT INFO
# Provides:       libdbi
# Required-Start: $basebuildtools glibc
# Required-Stop:
# Default-Start:  1
# 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 )
		./configure --prefix=/usr --disable-docs || exit 1
		make $PMAKE all || exit 1
		strip_debug
		# install it in local system, because other programs could need it
		make install
		;;

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

Index: syslog-ng
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/syslog-ng,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- syslog-ng	31 Aug 2007 14:11:47 -0000	1.14
+++ syslog-ng	15 Jul 2009 21:51:24 -0000	1.15
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       syslog-ng
-# Required-Start: $basebuildtools $libs eventlog
+# Required-Start: $basebuildtools $libs eventlog libdbi
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -25,8 +25,9 @@
 
 case $1 in
     build )
-	./configure --prefix=/usr --sysconfdir=/etc/syslog-ng/ --enable-ipv6 --enable-spoof-source --enable-dynamic-linking  || exit 1
-
+	./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --localstatedir=/var --with-pidfile-dir=/var/run \
+	--enable-ssl --enable-sql --enable-ipv6 --enable-spoof-source --enable-dynamic-linking  || exit 1
+	replace_str src/Makefile "syslog_ng_LDADD =" "syslog_ng_LDADD = -ldbi "
 	make $PMAKE all || exit 1
 	strip_debug
         ;;