Thread: [Devil-linux-commit] build/scripts DenyHosts, NONE, 1.1.2.1 debianutils, NONE, 1.1.2.1 liblockfile,

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
      Tag: rel-1-2-patches
	aide awstats gd libpng logwatch mrtg nrpe nsca openssh 
Added Files:
      Tag: rel-1-2-patches
	DenyHosts debianutils liblockfile 
Log Message:
- updated Python to 2.3.6 (Dr. Alberto Benati / Heiko)
- updated postfix to 2.3.4 (Dr. Alberto Benati / Heiko)
- updated dovecot to 1.0.rc15 (Dr. Alberto Benati / Heiko)
- updated logwatch to 7.3.1-3 (Dr. Alberto Benati / Heiko)
- updated gd to 2.0.33 (Dr. Alberto Benati / Heiko)
- updated libpng to 1.2.13 (Dr. Alberto Benati / Heiko)
- updated aide to 0.12 (Dr. Alberto Benati / Heiko)
- updated awstats to 6.6 (Dr. Alberto Benati / Heiko)
- updated pcre to 6.7 (Dr. Alberto Benati / Heiko)
- added DenyHosts-2.5-3 (Dr. Alberto Benati / Heiko)
- added debianutils 2.8.4 (Dr. Alberto Benati / Heiko)
- added liblockfile_1.06.1 (Dr. Alberto Benati / Heiko)

--- NEW FILE: liblockfile ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/Attic/liblockfile,v $
# $Revision: 1.1.2.1 $
# $Date: 2006/12/18 17:05:13 $
#
# http://www.devil-linux.org
# LIBLOCKFILE 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:       liblockfile
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    DEBIAN LIBLOCKFILE (http://www.debian.org)
### END INIT INFO

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

# source functions and config
source $MYDIR/settings

MYNAME=LIBLOCKFILE

case $1 in
	build )
		if [ "$CONFIG_LIBLOCKFILE" = "y" ]; then
			./configure --enable-shared --with-mailgroup \
				--prefix=/usr --mandir=/usr/share/man || exit 1
			make $PMAKE || exit 1
			strip_debug
		fi
		;;

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

			mkdir -p $TMPDIR/usr/bin $TMPDIR/usr/lib $TMPDIR/usr/include \
			mkdir -p $TMPDIR/usr/share/man/man1 $TMPDIR/usr/share/man/man3 || exit 1

			make install ROOT=$TMPDIR || exit 1

			rm -rf $TMPDIR/usr/include || 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: mrtg
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mrtg,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- mrtg	27 Apr 2005 23:37:38 -0000	1.1.2.1
+++ mrtg	18 Dec 2006 17:05:13 -0000	1.1.2.2
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       mrtg
-# Required-Start: $basebuildtools $libs perl
+# Required-Start: $basebuildtools $libs gd libpng perl zlib
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -27,7 +27,7 @@
 case $1 in
     build )
 	if [ "$CONFIG_MRTG" = "y" ]; then
-	    ./configure --prefix=/usr || exit 1
+	    ./configure --prefix=/usr --with-gd --with-z --with-png || exit 1
 	    make $PMAKE all || exit 1
 	    strip_debug
 	fi

Index: openssh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openssh,v
retrieving revision 1.28.2.3
retrieving revision 1.28.2.4
diff -u -d -r1.28.2.3 -r1.28.2.4
--- openssh	22 Apr 2006 01:07:45 -0000	1.28.2.3
+++ openssh	18 Dec 2006 17:05:13 -0000	1.28.2.4
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       openssh
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs tcp_wrappers
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -28,14 +28,20 @@
 case $1 in
     build )
 	if [ "$CONFIG_OPENSSH" = "y" ]; then
-	    ./configure --prefix=/usr --sysconfdir=/etc/ssh --localstatedir=/var --with-md5-passwords --with-pam || exit 1
+	    ./configure --prefix=/usr --sysconfdir=/etc/ssh --localstatedir=/var \
+		--with-tcp-wrappers --with-md5-passwords --with-pam || exit 1
 	    # disable those annoying excess permissions warnings....
 	    echo " #undef USE_BTMP" >> config.h
 	    make $PMAKE all || exit 1
 	    strip_debug
-	    
-	    # install it, other programs need it later
-	    make install || exit 1
+
+		if [ "$CONFIG_SCPONLY" = "y" ]; then
+			# Mandatory for build scponly
+			groupadd -g 110 sshd || exit 1
+			useradd -g 110 -u 110 -c "sshd privsep" -d /var/empty -s /bin/false sshd || exit 1
+			make install || exit 1
+		fi
+
 	fi
         ;;
 

Index: awstats
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/awstats,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- awstats	15 Apr 2006 01:23:09 -0000	1.1.2.1
+++ awstats	18 Dec 2006 17:05:13 -0000	1.1.2.2
@@ -2,7 +2,9 @@
 # $Source$
 # $Revision$
 # $Date$
+#
 # http://www.devil-linux.org
+# AWSTATS added by Alberto Benati <alb...@un...>
 
 # you need the next line, otherwise script won't be executed !!!
 # DL-build-system v3
@@ -22,6 +24,8 @@
 # source functions and config
 source $MYDIR/settings
 
+MYNAME=AWSTATS
+
 case $1 in
 	install )
 		if [ "$CONFIG_AWSTATS" = "y" ]; then
@@ -34,7 +38,8 @@
 			cp -dpR wwwroot/cgi-bin/awstats.model.conf $ETCDIR/etc/awstats/ || exit 1
 
 			mkdir -p $ETCDIR/etc/cron.daily || exit 1
-			echo "#/usr/local/awstats/wwwroot/cgi-bin/awstats.pl" >> $ETCDIR/etc/cron.daily/awstats.cron  || exit 1
+			echo "#/usr/local/awstats/wwwroot/cgi-bin/awstats.pl" >> $ETCDIR/etc/cron.daily/awstats || exit 1
+			chmod 0755 $ETCDIR/etc/cron.daily/awstats || exit 1
 
 			rm -rf $TMPDIR || exit 1
 		fi

Index: logwatch
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/logwatch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- logwatch	7 May 2006 13:55:27 -0000	1.1.2.2
+++ logwatch	18 Dec 2006 17:05:13 -0000	1.1.2.3
@@ -4,6 +4,7 @@
 # $Date$
 #
 # http://www.devil-linux.org
+# LOGWATCH added by Alberto Benati <alb...@un...>
 
 # you need the next line, otherwise script won't be executed !!!
 # DL-build-system v3
@@ -30,6 +31,13 @@
 		if [ "$CONFIG_LOGWATCH" = "y" ]; then
 			rm -rf $TMPDIR
 
+			if [ ! -f .patch.done ] && [ -e $DL_DIR/src/logwatch_7.*.diff.gz ]; then
+				#From Debian
+				zcat $DL_DIR/src/logwatch_7.*.diff.gz | patch -p1 || exit 1
+				touch .patch.done
+			fi
+
+
 			#From install.sh
 			LOGWATCHEXE="/usr/share/logwatch/scripts/logwatch.pl"
 			BASEDIR="$CDDIR/usr/share/logwatch"

Index: aide
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/aide,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- aide	15 Apr 2006 01:23:09 -0000	1.1.2.1
+++ aide	18 Dec 2006 17:05:13 -0000	1.1.2.2
@@ -4,13 +4,14 @@
 # $Date$
 #
 # http://www.devil-linux.org
+# AIDE 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:       aide
-# Required-Start: $basebuildtools $libs mhash
+# Required-Start: $basebuildtools $libs gnupg libgcrypt mhash
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -28,12 +29,9 @@
 case $1 in
 	build )
 		if [ "$CONFIG_AIDE" = "y" ]; then
-			if [ ! -f .patch.done ]; then
-				zcat $DL_DIR/src/aide_0.*.diff.gz | patch -p1 || exit 1
-				touch .patch.done
-			fi
-			./configure --prefix=/usr --sysconfdir=/etc/aide \
-				--with-config_file=/etc/aide/aide.conf || exit 1
+			./configure --prefix=/usr --sysconfdir=/etc \
+				--with-config_file=/etc/aide/aide.conf \
+				--with-zlib --with-mhash --with-gcrypt || exit 1
 			make $PMAKE || exit 1
 			strip_debug
 		fi
@@ -47,18 +45,15 @@
 			make install DESTDIR=$TMPDIR || exit 1
 
 			mkdir -p $ETCDIR/etc/aide || exit 1
-			cp -dpR debian/aide.conf $ETCDIR/etc/aide/ || exit 1
-
-			mkdir -p $ETCDIR/etc/cron.daily || exit 1
-			cp -dpR debian/cron.daily/aide $ETCDIR/etc/cron.daily/ || exit 1
+			install -m 0644 $DL_DIR/scripts/scripts/aide.conf $ETCDIR/etc/aide/ || exit 1
+			cp -dpR contrib $ETCDIR/etc/aide/ || exit 1
 
-			mkdir -p $CDDIR/usr/man/man8 || exit 1
-			cp -dpR debian/aideinit.8 $CDDIR/usr/man/man8/ || exit 1
+			mkdir -p $CDDIR/var/lib/aide || exit 1
+			mkdir -p $CDDIR/var/log/aide || exit 1
 
 			# All mhash library are mandatory
 			cp -dpR /usr/lib/libmhash* $CDDIR/lib/ || exit 1
 
-			mkdir -p $CDDIR || exit 1
 			copy_files $TMPDIR/usr $CDDIR || exit 1
 
 			rm -rf $TMPDIR || exit 1

Index: gd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gd,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- gd	27 Jan 2004 20:01:49 -0000	1.4
+++ gd	18 Dec 2006 17:05:13 -0000	1.4.2.1
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       gd
-# Required-Start: $basebuildtools libpng jpeg libiconv glibc
+# Required-Start: $basebuildtools libpng jpeg libiconv glibc zlib
 # Required-Stop:
 # Default-Start:  1
 # Default-Stop:

--- NEW FILE: debianutils ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/Attic/debianutils,v $
# $Revision: 1.1.2.1 $
# $Date: 2006/12/18 17:05:13 $
#
# http://www.devil-linux.org
# DEBIANUTILS 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:       debianutils
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    DEBIAN UTILS (http://www.debian.org)
### END INIT INFO

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

# source functions and config
source $MYDIR/settings

MYNAME=DEBIANUTILS

case $1 in
	build )
		if [ "$CONFIG_DEBIANUTILS" = "y" ]; then
			./configure --prefix=/usr --mandir=/usr/share/man || exit 1
			make $PMAKE || exit 1
			strip_debug
		fi
		;;

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

			make install DESTDIR=$TMPDIR || exit 1

			rm -rf $TMPDIR/usr/bin/sensible* $TMPDIR/usr/bin/which || exit 1
			rm -rf $TMPDIR/usr/sbin || exit 1
			rm -rf $TMPDIR/usr/share/man/fr || exit 1
			rm -rf $TMPDIR/usr/share/man/man1/sensible* $TMPDIR/usr/share/man/man1/which* || exit 1
			rm -rf $TMPDIR/usr/share/man/man8/installkernel* || 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


--- NEW FILE: DenyHosts ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/Attic/DenyHosts,v $
# $Revision: 1.1.2.1 $
# $Date: 2006/12/18 17:05:13 $
#
# http://www.devil-linux.org
# DENYHOSTS 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:       DenyHosts
# Required-Start: $basebuildtools $libs Python openssh
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    DenyHosts (http://www.denyhosts.net)
### END INIT INFO

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

# source functions and config
source $MYDIR/settings

MYNAME=DENYHOSTS

case $1 in
	build )
		if [ "$CONFIG_DENYHOSTS" = "y" ]; then
			if [ ! -f .patch.done ] && [ -e $DL_DIR/src/denyhosts_2.*.diff.gz ]; then
				#From Debian
				zcat $DL_DIR/src/denyhosts_2.*.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
		;;

	install )
		if [ "$CONFIG_DENYHOSTS" = "y" ]; then
			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"

			mkdir -p $ETCDIR/etc/denyhosts || exit 1
			mv -f $TMPDIR/usr/share/denyhosts/denyhosts.cfg-dist $ETCDIR/etc/denyhosts/denyhosts.cfg || exit 1

			mkdir -p $CDDIR/var/lib/denyhosts || exit 1

			mkdir -p $TMPDIR/usr/sbin || exit 1
			mv -f $TMPDIR/usr/bin/denyhosts.py $TMPDIR/usr/sbin/denyhosts || exit 1

			rm -f $TMPDIR/usr/share/denyhosts/*.txt  || exit 1
			copy_files $TMPDIR/usr $CDDIR || 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 $MYDIR/scripts/denyhosts.init $ETCDIR/etc/init.d/denyhosts || exit 1

			echo "# Start $MYNAME?" >> $CONFIGFILE
			echo "START_$MYNAME=no" >> $CONFIGFILE
			echo >> $CONFIGFILE
			echo "HELP_$MYNAME=\"analyzes hosts are attempting to hack\"" >> $SOFTWAREHELP

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

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


Index: nrpe
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/nrpe,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- nrpe	20 Aug 2006 19:49:56 -0000	1.1.2.1
+++ nrpe	18 Dec 2006 17:05:13 -0000	1.1.2.2
@@ -38,7 +38,9 @@
 	    cp -v src/nrpe $CDDIR/usr/sbin/ || exit 1
 	    cp -v src/check_nrpe $CDDIR/usr/libexec/nagios/ || exit 1
 	    cp -v sample-config/nrpe.cfg $ETCDIR/etc/nagios/ || exit 1
-	    cp -v sample-config/nrpe.xinetd $ETCDIR/etc/xinet.d/ || exit 1
+		if [ "$CONFIG_XINETD" = "y" ]; then
+			cp -v sample-config/nrpe.xinetd $ETCDIR/etc/xinet.d/ || exit 1
+		fi
 	    echo "nrpe            5666/tcp        # NRPE" >> $ETCDIR/etc/services || exit 1
 
             cp $MYDIR/scripts/nrpe $ETCDIR/etc/init.d || exit 1

Index: libpng
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/libpng,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- libpng	11 Jan 2004 14:43:04 -0000	1.4
+++ libpng	18 Dec 2006 17:05:13 -0000	1.4.2.1
@@ -25,11 +25,14 @@
 
 case $1 in
 	build )
-		make -f scripts/makefile.linux prefix=/usr $PMAKE all ||  exit 1
+		ZLIBDIR=$(find_src_dir zlib)
+		make -f scripts/makefile.linux prefix=/usr \
+			ZLIBLIB=../$ZLIBDIR ZLIBINC=../$ZLIBDIR $PMAKE all ||  exit 1
 		strip_debug
 
 		# we have to install this immediately, because this is a library and could be needed by other sources
-		make -f scripts/makefile.linux prefix=/usr install || exit 1
+		make -f scripts/makefile.linux prefix=/usr \
+			ZLIBLIB=../$ZLIBDIR ZLIBINC=../$ZLIBDIR install || exit 1
 		;;
 
 	* )

Index: nsca
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/nsca,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- nsca	20 Aug 2006 19:49:56 -0000	1.1.2.1
+++ nsca	18 Dec 2006 17:05:13 -0000	1.1.2.2
@@ -38,7 +38,9 @@
 	    cp -v src/nsca $CDDIR/usr/sbin/ || exit 1
 	    cp -v src/send_nsca $CDDIR/usr/sbin/ || exit 1
 	    cp -v sample-config/*.cfg $ETCDIR/etc/nagios/ || exit 1
-	    cp -v sample-config/nsca.xinetd $ETCDIR/etc/xinet.d/ || exit 1
+		if [ "$CONFIG_XINETD" = "y" ]; then
+			cp -v sample-config/nsca.xinetd $ETCDIR/etc/xinet.d/ || exit 1
+		fi
 	    echo "nsca            5667/tcp        # NSCA" >> $ETCDIR/etc/services || exit 1
 
             cp $MYDIR/scripts/nsca $ETCDIR/etc/init.d || exit 1





Thread: [Devil-linux-commit] build/scripts DenyHosts, NONE, 1.1.2.1 debianutils, NONE, 1.1.2.1 liblockfile,

devil-linux-commit