[Devil-linux-commit] build/scripts swig, 1.1, 1.2 DenyHosts, 1.2, 1.3 aide, 1.3, 1.4 bzip2, 1.14, 1.15 cpqarrayd, 1.12, 1.13 cyrus-sasl, 1.19, 1.20 heartbeat, 1.9, 1.10 logwatch, 1.3, 1.4 openldap, 1.22, 1.23 quagga, 1.6, 1.7 tcp_wrappers, 1.5, 1.6

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

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

Modified Files:
	DenyHosts aide bzip2 cpqarrayd cyrus-sasl heartbeat logwatch 
	openldap quagga tcp_wrappers 
Added Files:
	swig 
Log Message:
- added hosts.allow and hosts.deny for tcpwrapper (Dr. Alberto Benati /
Heiko)
- fixed build depency problems for openldap and cyrus-sasl (Dr. Alberto
Benati / Heiko)
- fixed build problems with net-snmp disabled (Dr. Alberto Benati / Heiko)
- updated DenyHosts to 2.6 (Dr. Alberto Benati / Heiko)
- updated aide to 0.13.1 (Dr. Alberto Benati / Heiko)
- updated awstats to 6.6 (Dr. Alberto Benati / Heiko)
- updated logwatch to 7.3.2 (Dr. Alberto Benati / Heiko)
- added swig 1.3.31 (Dr. Alberto Benati / Heiko)



Index: cyrus-sasl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-sasl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cyrus-sasl	17 Aug 2006 22:29:12 -0000	1.19
+++ cyrus-sasl	10 Jan 2007 02:12:00 -0000	1.20
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       cyrus-sasl
-# Required-Start: $basebuildtools glibc db-4 openssl gdbm
+# Required-Start: $basebuildtools glibc db-4 openssl gdbm openldap mysql
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -34,10 +34,26 @@
 				bzcat $DL_DIR/src/cyrus-sasl-2.1.20-configdir.patch.bz2 | patch -p1 || exit 1
 				touch cyrus-sasl-patches.done
 			fi
-	    		./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-krb4  --enable-shared \
-			    --enable-login --disable-static --with-saslauthd --with-pwcheck --with-configdir=/etc/sasl2 || exit 1
+
+			if [ "$CONFIG_MYSQL_CLIENT" = "y" ]; then
+				MYSQL="--with-mysql"
+			fi
+			if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
+				LDAP="--with-ldap"
+			fi
+			if [ "$CONFIG_OPENSSL_BIN" = "y" ]; then
+				OPENSSL="--with-openssl=/usr/bin/openssl"
+			fi
+
+			./configure --prefix=/usr --sysconfdir=/etc --with-configdir=/etc/sasl2 \
+			--localstatedir=/var --with-plugindir=/usr/lib/sasl2 \
+			--enable-sample --disable-static --enable-shared \
+			--with-saslauthd=/var/run/sasl2 \
+			--with-authdaemond --with-gdbm --with-pam ${MYSQL} ${LDAP} ${OPENSSL} \
+			--disable-krb4 --enable-login --with-pwcheck || exit 1
+
 			# parallel builds cause problems
-			make all || exit 1
+			make all sasldir=/usr/lib/sasl2 || exit 1
 			strip_debug
 
 			# we have to install this immediately, because this is a library and could be needed by other sources
@@ -48,7 +64,7 @@
 	install )
 		if [ "$CONFIG_CYRUS_SASL" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
-			mkdir -p $CDDIR/var/state/saslauthd || exit 1
+			mkdir -p $CDDIR/var/run/sasl2 || exit 1
 			make install DESTDIR=$TMPDIR || exit 1
 			rm -rf $TMPDIR/usr/include || exit 1
 			rm -rf $TMPDIR/usr/lib/sasl2/*a || exit 1

--- NEW FILE: swig ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/swig,v $
# $Revision: 1.2 $
# $Date: 2007/01/10 02:12:00 $
#
# http://www.devil-linux.org
# SWIG added by Alberto Benati <alb...@un...>

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

### BEGIN INIT INFO
# Provides:       swig
# Required-Start: $basebuildtools $libs perl python
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    SWIG (http://www.swig.org)
### END INIT INFO

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

# source functions and config
source $MYDIR/settings

MYNAME=SWIG

case $1 in
	build )
		if [ "$CONFIG_SWIG" = "y" ]; then
			if [ "$CONFIG_PYTHON" = "y" ]; then
				PYTHON="--with-python=/usr/bin/python"
			else
				PYTHON="--without-python"
			fi

			./configure --prefix=/usr --with-swiglibdir=/usr/share/swig \
			--with-perl5=/usr/bin/perl ${PYTHON} \
			--without-java --without-php4 --without-tcl \
			--without-allegrocl --without-chicken --without-csharp --without-clisp \
			--without-gcj --without-guile --without-lua --without-mzscheme \
			--without-ocaml --without-pike --without-r --without-ruby --without-x || exit 1

			make || exit 1
			strip_debug

			# we have to install this immediately, because this is a library and could be needed by other sources
			make install || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_SWIG" = "y" ]; then
			rm -rf $TMPDIR || exit 1
			mkdir -p $TMPDIR || exit 1

			make install DESTDIR=$TMPDIR || exit 1

			copy_files $TMPDIR/usr $CDDIR || exit 1

			rm -rf $TMPDIR || exit 1
		fi
		;;

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


Index: logwatch
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/logwatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- logwatch	18 Dec 2006 17:05:35 -0000	1.3
+++ logwatch	10 Jan 2007 02:12:00 -0000	1.4
@@ -52,6 +52,7 @@
 			install -m 0755 -d $BASEDIR/default.conf
 			install -m 0755 -d $BASEDIR/default.conf/logfiles
 			install -m 0755 -d $BASEDIR/default.conf/services
+			install -m 0755 -d $BASEDIR/default.conf/html
 			install -m 0755 -d $BASEDIR/scripts
 			install -m 0755 -d $BASEDIR/scripts/logfiles
 			install -m 0755 -d $BASEDIR/scripts/services
@@ -64,7 +65,7 @@
 			install -m 0644 conf/services/* $BASEDIR/default.conf/services
 			install -m 0755 scripts/logwatch.pl $BASEDIR/scripts/logwatch.pl
 			for i in scripts/logfiles/* ; do
-				if [ `ls $i | wc -l` -ne 0 ] ; then
+				if [ `ls $i | grep -v CVS | wc -l` -ne 0 ] ; then
 					install -m 0755 -d $BASEDIR/$i
 					install -m 0644 $i/* $BASEDIR/$i
 				fi
@@ -76,9 +77,11 @@
 			#CONFIG
 			install -m 0755 -d $CONFIGDIR
 			install -m 0755 -d $CONFIGDIR/scripts
+			install -m 0755 -d $CONFIGDIR/scripts/services
 			install -m 0755 -d $CONFIGDIR/conf
 			install -m 0755 -d $CONFIGDIR/conf/logfiles
 			install -m 0755 -d $CONFIGDIR/conf/services
+			install -m 0755 -d $CONFIGDIR/conf/html
 
 			#TEMP
 			if [ ! -d $TEMPDIR ]; then
@@ -95,6 +98,11 @@
 			ln -s $LOGWATCHEXE $ETCDIR/etc/cron.daily/0logwatch || exit 1
 			ln -s $LOGWATCHEXE $CDDIR/usr/sbin/logwatch || exit 1
 
+			#Customize file
+			install -m 0644 conf/logwatch.conf $CONFIGDIR/conf/logwatch.conf
+			install -m 0644 conf/ignore.conf $CONFIGDIR/conf/ignore.conf
+			echo "#Configuration override for specific logfile/services" > $CONFIGDIR/conf/override.conf
+
 			rm -rf $TMPDIR || exit 1
 		fi
 		;;

Index: tcp_wrappers
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/tcp_wrappers,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tcp_wrappers	5 Dec 2005 07:49:17 -0000	1.5
+++ tcp_wrappers	10 Jan 2007 02:12:00 -0000	1.6
@@ -30,7 +30,6 @@
 	if [ "$CONFIG_TCP_WRAPPERS" = "y" ]; then
 		if [ ! -f .patch.done ]; then
 			zcat $DL_DIR/src/tcp_wrappers_7.6.diff.gz | patch || exit 1
-			bzcat $DL_DIR/src/tcp_wrappers-7.6-gcc34-1.patch.bz2 | patch -p1 || exit 1
 			touch .patch.done
 		fi
 		make linux || exit 1
@@ -43,6 +42,8 @@
     install )
 	if [ "$CONFIG_TCP_WRAPPERS" = "y" ]; then
 		cp tcpdmatch tcpdchk safe_finger tcpd try-from $CDDIR/usr/sbin/ || exit 1
+		touch $ETCDIR/etc/hosts.allow || exit 1
+		touch $ETCDIR/etc/hosts.deny || exit 1
 	fi
 	;;
 

Index: aide
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/aide,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- aide	18 Dec 2006 17:05:35 -0000	1.3
+++ aide	10 Jan 2007 02:12:00 -0000	1.4
@@ -11,7 +11,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       aide
-# Required-Start: $basebuildtools $libs gnupg libgcrypt mhash
+# Required-Start: $basebuildtools $libs gnupg libgcrypt
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -31,7 +31,7 @@
 		if [ "$CONFIG_AIDE" = "y" ]; then
 			./configure --prefix=/usr --sysconfdir=/etc \
 				--with-config_file=/etc/aide/aide.conf \
-				--with-zlib --with-mhash --with-gcrypt || exit 1
+				--with-zlib --without-mhash --with-gcrypt || exit 1
 			make $PMAKE || exit 1
 			strip_debug
 		fi

Index: quagga
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/quagga,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- quagga	12 Dec 2004 21:48:09 -0000	1.6
+++ quagga	10 Jan 2007 02:12:00 -0000	1.7
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       quagga
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs net-snmp
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -28,13 +28,15 @@
 case $1 in
     build )
 	if [ "$CONFIG_QUAGGA" = "y" ]; then
-		#if [ ! -f devil-linux-quagga-patches.done ]; then
-		#	touch devil-linux-quagga-patches.done
-		#	bzcat $DL_DIR/src/ht-*-bgp-md5.patch.bz2  | patch -p0 || exit 1
-		#fi
-		./configure --prefix=/usr --sysconfdir=/etc/zebra --localstatedir=/var/state/quagga --enable-snmp \
-			--enable-netlink --enable-vtysh || exit 1
-		#  --enable-tcp-md5
+		if [ ! -f devil-linux-quagga-patches.done ]; then
+			touch devil-linux-quagga-patches.done
+			bzcat $DL_DIR/src/ht-*-bgp-md5.patch.bz2  | patch -p0 || exit 1
+		fi
+		if [ "$CONFIG_NET_SNMP" = "y" ]; then
+			SNMP="--enable-snmp"
+		fi
+		./configure --prefix=/usr --sysconfdir=/etc/zebra --localstatedir=/var/state/quagga ${SNMP} \
+			--enable-netlink --enable-vtysh --enable-tcp-md5 || exit 1
 		make $PMAKE || exit 1
 		strip_debug
 	fi

Index: openldap
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openldap,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- openldap	26 Dec 2006 15:36:56 -0000	1.22
+++ openldap	10 Jan 2007 02:12:00 -0000	1.23
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       openldap
-# Required-Start: $basebuildtools glibc cyrus-sasl libmcrypt libgcrypt gdbm db-4 openssl
+# Required-Start: $basebuildtools glibc libmcrypt libgcrypt gdbm db-4 openssl
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:

Index: DenyHosts
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/DenyHosts,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DenyHosts	18 Dec 2006 17:05:35 -0000	1.2
+++ DenyHosts	10 Jan 2007 02:12:00 -0000	1.3
@@ -29,18 +29,11 @@
 case $1 in
 	build )
 		if [ "$CONFIG_DENYHOSTS" = "y" ]; then
-			if [ ! -f .patch.done ] && [ -e $DL_DIR/src/denyhosts_2.*.diff.gz ]; then
+			if [ ! -f .patch.done ] && [ -e $DL_DIR/src/denyhosts.diff.gz ]; then
 				#From Debian
-				zcat $DL_DIR/src/denyhosts_2.*.diff.gz | patch -p1 || exit 1
+				zcat $MYDIR/scripts/denyhosts.diff.gz | patch -p1 || exit 1
 				touch .patch.done
 			fi
-			if [ ! -f .debian.patch.done ]; then
-				DPATCH=`cat debian/patches/00list`
-				for d in $DPATCH; do
-					patch -p1 < debian/patches/$d
-				done
-				touch .debian.patch.done
-			fi
 			python setup.py build || exit 1
 		fi
 		;;
@@ -50,28 +43,23 @@
 			rm -rf $TMPDIR
 			mkdir -p $TMPDIR || exit 1
 
-			python setup.py install --root=$TMPDIR --record=INSTALLED_FILES || exit 1
-			mv -f $TMPDIR/usr/share/denyhosts/daemon-control-dist $TMPDIR/usr/share/denyhosts/daemon-control || exit 1
-			replace_str $TMPDIR/usr/share/denyhosts/daemon-control \
-				"/etc/denyhosts.conf" "/etc/denyhosts/denyhosts.cfg"
+			python setup.py install --root=$TMPDIR --record=INSTALLED_FILES \
+				--install-scripts=/usr/bin --install-purelib=/usr/share/denyhosts || exit 1
 
-			mkdir -p $ETCDIR/etc/denyhosts || exit 1
-			mv -f $TMPDIR/usr/share/denyhosts/denyhosts.cfg-dist $ETCDIR/etc/denyhosts/denyhosts.cfg || exit 1
+			rm -f $TMPDIR/usr/share/denyhosts/*.txt || exit 1
+			rm -f $TMPDIR/usr/share/denyhosts/denyhosts.cfg-dist || exit 1
 
-			mkdir -p $CDDIR/var/lib/denyhosts || exit 1
+			copy_files $TMPDIR/usr $CDDIR || exit 1
 
-			mkdir -p $TMPDIR/usr/sbin || exit 1
-			mv -f $TMPDIR/usr/bin/denyhosts.py $TMPDIR/usr/sbin/denyhosts || exit 1
+			mkdir -p $CDDIR/var/lib/denyhosts || exit 1
 
-			rm -f $TMPDIR/usr/share/denyhosts/*.txt  || exit 1
-			copy_files $TMPDIR/usr $CDDIR || exit 1
+			mkdir -p $ETCDIR/etc/denyhosts || exit 1
+			cp -dpR denyhosts.cfg-dist $ETCDIR/etc/denyhosts/denyhosts.cfg || exit 1
 
 			mkdir -p $ETCDIR/etc/logrotate.d || exit 1
-			cp -dpR debian/denyhosts.logrotate $ETCDIR/etc/logrotate.d/denyhosts || exit 1
-			mkdir -p $CDDIR/usr/share/man/man8 || exit 1
-			cp -pdR debian/denyhosts.8 $CDDIR/usr/share/man/man8/ || exit 1
+			cp -dpR denyhosts.logrotate $ETCDIR/etc/logrotate.d/denyhosts || exit 1
 
-			cp $MYDIR/scripts/denyhosts.init $ETCDIR/etc/init.d/denyhosts || exit 1
+			cp -dpR denyhosts.init $ETCDIR/etc/init.d/denyhosts || exit 1
 
 			echo "# Start $MYNAME?" >> $CONFIGFILE
 			echo "START_$MYNAME=no" >> $CONFIGFILE

Index: heartbeat
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/heartbeat,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- heartbeat	10 Mar 2006 01:50:35 -0000	1.9
+++ heartbeat	10 Jan 2007 02:12:00 -0000	1.10
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       heartbeat
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs swig net-snmp
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -28,8 +28,12 @@
 case $1 in
     build )
 	if [ "$CONFIG_HEARTBEAT" = "y" ]; then
-		./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --disable-nls || exit 1
-		
+		if [ "$CONFIG_NET_SNMP" != "y" ]; then
+			SNMP="--disable-snmp"
+		fi
+
+		./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc ${SNMP} || exit 1
+
 		make $PMAKE all || exit 1
 		strip_debug
 	fi

Index: cpqarrayd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cpqarrayd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cpqarrayd	12 Dec 2004 21:48:08 -0000	1.12
+++ cpqarrayd	10 Jan 2007 02:12:00 -0000	1.13
@@ -9,7 +9,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       cpqarrayd
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs net-snmp
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -27,7 +27,10 @@
 case $1 in
 	build )
 		if [ "$CONFIG_CPQARRAYD" = "y" ]; then
-			./configure --prefix=/usr  || exit 1
+			if [ "$CONFIG_NET_SNMP" != "y" ]; then
+				SNMP="--disable-snmptrap"
+			fi
+			./configure --prefix=/usr ${SNMP} || exit 1
 			make $PMAKE all || exit 1
 			strip_debug
 		fi