devil-linux-commit Mailing List for Devil-Linux (Page 49)

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

Modified Files:
	vmware 
Log Message:
don't force loading the vmxnet module


Index: vmware
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/vmware,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- vmware	16 Apr 2009 13:57:58 -0000	1.7
+++ vmware	22 Jun 2009 01:23:09 -0000	1.8
@@ -47,7 +47,6 @@
 		# we already did load the vmmware modules in the boot script
 		# but let's make sure they're here in case somebody 
 		# restarted this script
-		modprobe vmxnet
 		modprobe vmmemctl
 		sleep 2
 		
@@ -66,7 +65,6 @@
 
     		echo "Unloading VMWare modules"
 	    	rmmod vmmemctl
-		rmmod vmxnet
 		;;
 	restart)
 		$0 stop

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

Modified Files:
	CHANGES 
Log Message:
don't force loading the vmxnet module


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1272
retrieving revision 1.1273
diff -u -d -r1.1272 -r1.1273
--- CHANGES	10 Jun 2009 15:24:09 -0000	1.1272
+++ CHANGES	22 Jun 2009 01:23:09 -0000	1.1273
@@ -22,6 +22,7 @@
 #
 
 1.4RC2
+- don't force loading the vmxnet module
 - don't skip my.cnf on upgrade
 - updated dovecot to 1.1.16 (sl)
 - updated e1000 driver to 8.0.13 (sl)

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

Modified Files:
	aiccu 
Log Message:

- added init script for aiccu (Oliver Niesner/sl)


Index: aiccu
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/aiccu,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aiccu	20 Mar 2009 22:55:28 -0000	1.1
+++ aiccu	12 Jun 2009 06:34:29 -0000	1.2
@@ -45,6 +45,11 @@
 		    cp -a unix-console/aiccu $CDDIR/usr/sbin || exit 1
 		    install -m 644 ./doc/aiccu.1 $CDDIR/usr/share/man/man1 || exit 1
 		    cp -a doc/aiccu.conf $ETCDIR/etc/ || exit 1
+		    cp $MYDIR/scripts/aiccu $ETCDIR/etc/init.d || exit 1
+		    echo "# Start aiccu?" >> $CONFIGFILE
+		    echo "START_$MYNAME=no" >> $CONFIGFILE
+		    echo >> $CONFIGFILE
+		    echo "HELP_$MYNAME=\"$MYNAME is a config tool for the Sixxs 6to4 tunnelbroker.\"" >> $SOFTWAREHELP
 		    rm -rf $TMPDIR || exit 1
 		fi
 		;;

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

Added Files:
	aiccu 
Log Message:

- added init script for aiccu (Oliver Niesner/sl)


--- NEW FILE: aiccu ---
#!/bin/bash
#
# $Source: /cvsroot/devil-linux/build/scripts/scripts/aiccu,v $
# $Revision: 1.1 $
# $Date: 2009/06/12 06:34:29 $
#
# http://www.devil-linux.org
#

### BEGIN INIT INFO
# Provides:       aiccu
# Required-Start: $network $syslog $named
# Required-Stop:  $network $syslog $named
# Default-Start:  3 5
# Default-Stop:   0 1 6
# Description:    starts sixxs 6to4 tunnel
### END INIT INFO

# settings
source /etc/sysconfig/config

# parameters
NAME="aiccu"
CONFIGNAME="AICCU"
DAEMON="/usr/sbin/aiccu"
CONFIGFILE="/etc/aiccu.conf"
PARAMETER="start"
 
# source function library
source /etc/init.d/functions

eval START=\$START_$CONFIGNAME

# Determine the base and follow a runlevel link name.
base=${0##*/}
link=${base#*[SK][0-9][0-9]}

# Force execution if not called by a runlevel directory.
test $link = $base && START=yes
test "$START" = "yes" || exit 0

if [ ! -e $DAEMON ]; then
		echo
	echo "$DAEMON not found. Did you install the package?"
	exit 1
fi

case "$1" in
	start)
		echo -n "Starting $NAME: "
		loadproc $DAEMON $PARAMETER 
		;;
	stop)
		echo -n "Shutting down $NAME: "
		killproc $DAEMON
		;;
	restart)
		$0 stop
		sleep 1
		$0 start
		;;
	*)
		echo "Usage: $0 {start|stop|restart}"
		exit 1
		;;
esac


 	  	 

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

Modified Files:
	httpd 
Log Message:

- added directive 'PidFile'  to httpd.conf


Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- httpd	1 Aug 2007 08:07:55 -0000	1.11
+++ httpd	10 Jun 2009 17:21:14 -0000	1.12
@@ -101,6 +101,7 @@
 
 			cp -dpR $ETCDIR/etc/apache2/httpd.conf $ETCDIR/etc/apache2/httpd.conf.default
 			replace_str $ETCDIR/etc/apache2/httpd.conf '^ServerRoot ""' '#ServerRoot ""'
+			replace_str $ETCDIR/etc/apache2/httpd.conf '^#ServerRoot ""' '#ServerRoot ""\n\n# PidFile: The file in which the server should record its process\n# identification number when it starts.\nPidFile /var/run/httpd.pid'
 			replace_str $ETCDIR/etc/apache2/httpd.conf "^LoadModule dbd_module /usr/lib/apache2/modules/mod_dbd.so" "#LoadModule dbd_module /usr/lib/apache2/modules/mod_dbd.so"
 			replace_str $ETCDIR/etc/apache2/httpd.conf "^LoadModule auth_digest_module /usr/lib/apache2/modules/mod_auth_digest.so" "#LoadModule auth_digest_module /usr/lib/apache2/modules/mod_auth_digest.so"
 			replace_str $ETCDIR/etc/apache2/httpd.conf "^User daemon" "User nobody"

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

Modified Files:
	upgrade-config 
Log Message:
- don't skip my.cnf on upgrade


Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- upgrade-config	18 Apr 2008 14:11:09 -0000	1.34
+++ upgrade-config	10 Jun 2009 15:24:09 -0000	1.35
@@ -130,7 +130,6 @@
 	comparesubstr "$f" "$FINDDIR/pam.d/" && onoff="off"
 	comparesubstr "$f" "$FINDDIR/init.d/firewall.rules" && onoff="on"
 	comparesubstr "$f" "$FINDDIR/init.d/boot.local" && onoff="on"
-	comparesubstr "$f" "$FINDDIR/my.cnf" && onoff="off"
 	comparesubstr "$f" "$FINDDIR/udev/" && onoff="off"
 	comparesubstr "$f" "$FINDDIR/." && onoff="off"
 	[ -f "$f" -a "$f" -ot /shm/oldfile ] && onoff="off"

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

Modified Files:
	CHANGES 
Log Message:
- don't skip my.cnf on upgrade


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1271
retrieving revision 1.1272
diff -u -d -r1.1271 -r1.1272
--- CHANGES	6 Jun 2009 06:04:00 -0000	1.1271
+++ CHANGES	10 Jun 2009 15:24:09 -0000	1.1272
@@ -22,6 +22,7 @@
 #
 
 1.4RC2
+- don't skip my.cnf on upgrade
 - updated dovecot to 1.1.16 (sl)
 - updated e1000 driver to 8.0.13 (sl)
 - added igb driver 1.3.19.3 (Stefan Engel/sl)

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

Modified Files:
	php 
Log Message:

- enabled mysqli php extension 


Index: php
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- php	23 Oct 2008 03:03:16 -0000	1.24
+++ php	10 Jun 2009 06:02:36 -0000	1.25
@@ -37,7 +37,7 @@
 				--with-imap=$IMAPDIR --with-imap-ssl --with-openssl --with-iconv --with-curl \
 				--enable-http --with-http-shared-deps --with-http-curl-requests --with-http-curl-libevent --with-http-zlib-compression \
 				--sysconfdir=/etc --with-config-file-path=/etc --prefix=/usr --with-gettext \
-				--enable-mbstring  --enable-inline-optimization  || exit 1
+				--enable-mbstring  --enable-inline-optimization --with-mysqli=/usr/bin/mysql_config --with-pdo-mysql || exit 1
 				
 			#
 			# not working --enable-xslt --with-kerberos

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18623

Modified Files:
	network 
Log Message:
Eliminate error message if NIC module not specifically set.


Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- network	9 Apr 2008 12:55:11 -0000	1.35
+++ network	10 Jun 2009 01:08:48 -0000	1.36
@@ -175,7 +175,8 @@
 	#
 	if [ "$ONBOOT" = "yes" -o "$ONLY_INTERFACE" = "$IF" ]; then
 		if [ -n "$MODULE" ]; then
-			modprobe $MODULE $MODULE_OPTS > /dev/null
+			[ "$MODULE" != "UNKNOWN" ] && \
+				modprobe $MODULE $MODULE_OPTS > /dev/null
 		fi
 
 

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18459

Modified Files:
	firewall.rules.2nic firewall.rules.3nic 
Log Message:
Fix obsolete rules


Index: firewall.rules.3nic
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/firewall.rules.3nic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- firewall.rules.3nic	10 Aug 2005 20:38:51 -0000	1.13
+++ firewall.rules.3nic	10 Jun 2009 01:07:50 -0000	1.14
@@ -103,6 +103,10 @@
 ${IPTABLES} -A INPUT  -p icmp -j ACCEPT
 ${IPTABLES} -A OUTPUT -p icmp -j ACCEPT
 
+# Accept DNS requests from the DMZ
+${IPTABLES} -A INPUT -p TCP -i ${DMZ_DEV} --dport 53 -j ACCEPT
+${IPTABLES} -A INPUT -p UDP -i ${DMZ_DEV} --dport 53 -j ACCEPT
+
 # Fast reject for Ident to eliminate email delays.
 ${IPTABLES} -A INPUT -p TCP --dport 113 -i ${OUT_DEV} -j REJECT --reject-with tcp-reset
 
@@ -184,12 +188,8 @@
 ${IPTABLES} -A FORWARD -m state --state NEW -i ${DMZ_DEV} -j ACCEPT
 
 # Prevent NetBIOS and Samba from leaking.
-${IPTABLES} -t nat -A PREROUTING -p TCP --dport 135 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p UDP --dport 135 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p TCP --dport 137:139 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p UDP --dport 137:139 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p TCP --dport 445 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p UDP --dport 445 -j DROP
+${IPTABLES} -A FORWARD -p TCP -m multiport --dports 135,137:139,445 -j DROP
+${IPTABLES} -A FORWARD -p UDP -m multiport --dports 135,137:139,445 -j DROP
 
 # Log invalid packets from DROP policy:
 if [ -n "$LOGGING" ] ; then

Index: firewall.rules.2nic
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/firewall.rules.2nic,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- firewall.rules.2nic	21 Sep 2005 12:36:30 -0000	1.16
+++ firewall.rules.2nic	10 Jun 2009 01:07:49 -0000	1.17
@@ -160,12 +160,8 @@
 ${IPTABLES} -A FORWARD -m state --state NEW -i ${INT_DEV} -j ACCEPT
 
 # Prevent NetBIOS and Samba from leaking.
-${IPTABLES} -t nat -A PREROUTING -p TCP --dport 135 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p UDP --dport 135 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p TCP --dport 137:139 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p UDP --dport 137:139 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p TCP --dport 445 -j DROP
-${IPTABLES} -t nat -A PREROUTING -p UDP --dport 445 -j DROP
+${IPTABLES} -A FORWARD -p TCP -m multiport --dports 135,137:139,445 -j DROP
+${IPTABLES} -A FORWARD -p UDP -m multiport --dports 135,137:139,445 -j DROP
 
 # Log invalid packets from DROP policy:
 if [ -n "$LOGGING" ] ; then

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

Added Files:
	igb 
Log Message:

- updated dovecot to 1.1.16 
- updated e1000 driver to 8.0.13 
- added igb driver 1.3.19.3 
- updated openvpn to 2.1_rc16 
- updated vsftpd to 2.1.2 



--- NEW FILE: igb ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/igb,v $
# $Revision: 1.1 $
# $Date: 2009/06/06 06:03:59 $
#
# http://www.devil-linux.org

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

### BEGIN INIT INFO
# Provides:       igb
# Required-Start: $basebuildtools $libs linux
# 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

MYNAME=igb

case $1 in
	build )
		if [ "$CONFIG_INTEL_IGB" = "y" ]; then
                	make $PMAKE -C src KSRC=$KERNELDIR CC=gcc || exit 1
			strip_debug
		fi
        	;;

	install )
		if [ "$CONFIG_INTEL_IGB" = "y" ]; then
			make install -C src INSTALL_MOD_PATH=$CDDIR/ KSRC=$KERNELDIR MANDIR=/usr/share/man CC=gcc || exit 1
		fi
		;;

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

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

Modified Files:
	md5sum.lst CHANGES 
Log Message:

- updated dovecot to 1.1.16 
- updated e1000 driver to 8.0.13 
- added igb driver 1.3.19.3 
- updated openvpn to 2.1_rc16 
- updated vsftpd to 2.1.2 



Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -d -r1.503 -r1.504
--- md5sum.lst	5 Jun 2009 19:56:22 -0000	1.503
+++ md5sum.lst	6 Jun 2009 06:04:00 -0000	1.504
@@ -244,13 +244,13 @@
 3db1f5dc6bb72c2504ae37c37947e03f  src/dosfstools-2.10-kernel-2.6-1.patch.bz2
 af4d03e85985ab222f2811744b9e06bc  src/dosfstools-2.10-llseek.patch.bz2
 59a02f311a891af8787c4c9e28c6b89b  src/dosfstools_2.10.orig.tar.gz
-ea83ea2000a5b2e1744c7c97eb5585d1  src/dovecot-1.1.7.tar.gz
+2e20c761416b16aa0fe9cac260ca0d2d  src/dovecot-1.1.16.tar.gz
 056b8c8b3ad9415a52c01b22ff1e64cf  src/dspam-3.8.0.tar.gz
 3983baeb199e010920a46d8541de784b  src/dst-11.tar.bz2
 abba1beced14fd91ad4d6181171df7a2  src/dvd+rw-tools-7.1-limits.patch.bz2
 8acb3c885c87f6838704a0025e435871  src/dvd+rw-tools-7.1.tar.gz
 519bc00c3315e127530dbe6968358634  src/e100-3.5.17.tar.gz
-6ef9c9cffb57c24c5f564438a6889558  src/e1000-8.0.6.tar.gz
+7d020cbe583996c0106c868422115e33  src/e1000-8.0.13.tar.gz
 e218df6c84fc17c1126d31de9472a76c  src/e2fsprogs-1.41.5.tar.gz
 91727db818e5170b2d78a99ee51c2d58  src/eagle-usb-2.3.2.tar.bz2
 9e28e82ddb81b910597e7fa60b666997  src/ebtables-brnf-7_vs_2.4.27.diff.gz
@@ -323,6 +323,7 @@
 7a0fef5f9fb4838955942caa87863f39  src/id3lib-cvs-20050205.tar.bz2
 68afc3827cf01501dfb22949f901f1d8  src/id3v2-0.1.11.tar.gz
 9c51c660862609a580be62a350b5efc6  src/ifenslave-1.1.0.tar.bz2
+f584aa2253c91c0b40f5aacb1f8117b8  src/igb-1.3.19.3.tar.gz
 30cf91863a31486e3b05c3f8b7100114  src/imap-2007a.DEV.SNAP-0802160141.tar.Z
 9e0f1ac040de3168ea785f44e42d585e  src/inetutils-1.5.tar.gz
 35d7178297390f18bae451e083362acf  src/inotify-tools-3.13.tar.gz
@@ -480,7 +481,7 @@
 8d7deea5f6d84fef90d1e256990ef048  src/openssl-0.9.8b-sha.diff.bz2
 bf768bc75cfb7e1774d314a2bd953f6d  src/openssl-0.9.8e-engine.diff.bz2
 e555c6d58d276aec7fdc53363e338ab3  src/openssl-0.9.8k.tar.gz
-14a35b05c5a16292d149592d1dad0302  src/openvpn-2.1_rc15.tar.gz
+e78117aa029fb076973e5207b3d73017  src/openvpn-2.1_rc16.tar.gz
 587171c4e15a40adde8aa1b3d77328e9  src/opt-3.19.tar.gz
 212df4b1bcb3e63bea3de23b04e6786e  src/p7zip_4.57-libun7zip.patch.bz2
 773f78d8b297eb858626667d4dfa93c7  src/p7zip_4.57_src_all.tar.bz2
@@ -620,7 +621,7 @@
 cfa487db369495cc2245cddc1c3801d9  src/vmxnet.tar.bz2
 f72a70891032423d97225dfbd2c354f6  src/vncrepeater-0.14.tar.bz2
 8bc06614d4e8131b13faa1339cdb0b64  src/vobcopy-1.0.2.tar.bz2
-7890b54e7ffa6106ffbdfda53f47fa41  src/vsftpd-2.1.0.tar.gz
+6a8c8579d50adf0d0fc07226c03bfb52  src/vsftpd-2.1.2.tar.gz
 d3d8bc4d58886498a1c338670eab9315  src/vtun-3.0.2.tar.gz
 ba97ddce396bfccd8d409bc3141d7ef4  src/watchdog_5.3.1.tar.gz
 26d0a3c142423678daed2d6f579525d8  src/webalizer-2.01-10-src.tar.bz2

Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1270
retrieving revision 1.1271
diff -u -d -r1.1270 -r1.1271
--- CHANGES	5 Jun 2009 19:56:22 -0000	1.1270
+++ CHANGES	6 Jun 2009 06:04:00 -0000	1.1271
@@ -22,6 +22,11 @@
 #
 
 1.4RC2
+- updated dovecot to 1.1.16 (sl)
+- updated e1000 driver to 8.0.13 (sl)
+- added igb driver 1.3.19.3 (Stefan Engel/sl)
+- updated openvpn to 2.1_rc16 (sl)
+- updated vsftpd to 2.1.2 (sl)
 - fixed netfilter layer7 module (sl)
 - added batch for bacula to allow migration jobs with spaces in the job names
 - upadded paxctl (sl)

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

Added Files:
	igb.config 
Log Message:

- updated dovecot to 1.1.16 
- updated e1000 driver to 8.0.13 
- added igb driver 1.3.19.3 
- updated openvpn to 2.1_rc16 
- updated vsftpd to 2.1.2 



--- NEW FILE: igb.config ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/configuration/igb.config,v $
# $Revision: 1.1 $
# $Date: 2009/06/06 06:04:00 $
#
# http://www.devil-linux.org

menu_add "System|Hardware Support" bool "To use Intel driver (igb) insted of the kernel one" CONFIG_INTEL_IGB

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

Modified Files:
	md5sum.lst CHANGES 
Log Message:

- compatibility fix for l7filter and iptables 1.4.3


Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -d -r1.502 -r1.503
--- md5sum.lst	5 Jun 2009 19:32:13 -0000	1.502
+++ md5sum.lst	5 Jun 2009 19:56:22 -0000	1.503
@@ -360,6 +360,7 @@
 c5dba6b80f583070fe9e6ed6e0c2162e  src/l2tpd-0.69.tar.gz
 571f031068ea7861282f0525d67a9aa0  src/l2tpd-patches.tgz
 49c8d09b7134cc9eb0112427cb48332e  src/l7-protocols-2008-12-18.tar.gz
+ca68eb7c3e6b33d11cd2a3d325a1a4b5  src/l7filter_iptables-1.4.3.patch.bz2
 dbc53fc94ae725ca5944b7a94ed52f8b  src/lcd4linux-0.10.1-RC1.tar.gz
 b5864d76c54ddf4627fd57ab333c88b4  src/less-418.tar.gz
 723d372833d6a94c15cc78cc98565517  src/lftp-3.7.14.tar.bz2
@@ -454,7 +455,7 @@
 888774accab40217dde927e21979c165  src/net-tools-1.60.tar.bz2
 e4da725325c175f1b4c114c5e305cfa8  src/net-tools_1.60-9.diff.gz
 c2bc56b61028bce36a5cc3fe7e81058e  src/netacct-mysql-0.78.tar.gz
-3377bc4b7a3538ea620f0329da0ae678  src/netfilter-layer7-v2.20.tar.bz2
+838422e7d9a06b42e682e9064e5210b5  src/netfilter-layer7-v2.21.tar.gz
 37a071debfce1dd9596267448f4b56c8  src/netpbm-10.26.46.tgz
 b0d1b8ec5c8c081a340cfc77bb8670cd  src/nfs-utils-1.1.6.tar.bz2
 278dd2e849cc3dbb947df961a1aaffd0  src/nmap-4.76.tar.bz2

Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1269
retrieving revision 1.1270
diff -u -d -r1.1269 -r1.1270
--- CHANGES	5 Jun 2009 19:32:13 -0000	1.1269
+++ CHANGES	5 Jun 2009 19:56:22 -0000	1.1270
@@ -22,6 +22,7 @@
 #
 
 1.4RC2
+- fixed netfilter layer7 module (sl)
 - added batch for bacula to allow migration jobs with spaces in the job names
 - upadded paxctl (sl)
 - updated cyrus-sasl to 2.1.23 (sl)

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

Modified Files:
	patch-o-matic 
Log Message:

- compatibility fix for l7filter and iptables 1.4.3


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- patch-o-matic	24 Feb 2009 22:39:46 -0000	1.39
+++ patch-o-matic	5 Jun 2009 19:56:22 -0000	1.40
@@ -43,8 +43,11 @@
 						
 			echo applying iptables netfilter layer 7 patch
             		pushd  $IPTABLES_DIR > /dev/null
-#			patch -p1 < ../netfilter-layer7-*/iptables-1.4.1*2.6.20forward-layer7*.patch || exit 1
+
 			cp -a ../netfilter-layer7-*/iptables-1.4.1.*-2.6.20forward/* extensions/
+#			# L7 filter 2.21 and iptables 1.4.3 compatibility patch
+			bzcat $SRCDIR/l7filter_iptables-1.4.3.patch.bz2 | patch -p1 || exit 1
+
 #		        chmod +x extensions/.layer7-test || exit 1
 
 			# otherwise p-o-m doesn't recognize iptables sources

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

Modified Files:
	CHANGES md5sum.lst 
Log Message:
added batch for bacula to allow migration jobs with spaces in the job names


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1268
retrieving revision 1.1269
diff -u -d -r1.1268 -r1.1269
--- CHANGES	29 May 2009 05:36:12 -0000	1.1268
+++ CHANGES	5 Jun 2009 19:32:13 -0000	1.1269
@@ -22,6 +22,7 @@
 #
 
 1.4RC2
+- added batch for bacula to allow migration jobs with spaces in the job names
 - upadded paxctl (sl)
 - updated cyrus-sasl to 2.1.23 (sl)
 - updated freeradius-server to 2.1.6 (sl)

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -d -r1.501 -r1.502
--- md5sum.lst	29 May 2009 05:36:12 -0000	1.501
+++ md5sum.lst	5 Jun 2009 19:32:13 -0000	1.502
@@ -167,6 +167,7 @@
 7565809ed801bb5726da0631ceab3699  src/autoconf-2.63.tar.bz2
 1498208ab1c8393dcbd9afb7d06df6d5  src/automake-1.10.2.tar.bz2
 fc19dbb8449eccf3300efb30ca3376cb  src/awstats-6.9.tar.gz
+48bf3bba5ae80cbd4cb999e25e3a6583  src/bacula-3.0.1-migrate-sql.patch.bz2
 173ef4d07ff10dfdbcc1142d8be21f17  src/bacula-3.0.1.tar.gz
 73a0def16eb15e56c57491ac232abcf3  src/bash-3.2-arc4random-1.patch.bz2
 a1ed8366c9edb814b90d1616ac20390e  src/bash-3.2-fixes-7.patch.bz2
@@ -652,3 +653,11 @@
 72f6a0b0d9e4ddc56ed964609e26ec2c  src/pecl/pecl_http-1.6.1.tgz
 03c929a38cc012eab839e6f0631f99e7  src/pecl/rar-1.0.0.tgz
 bc591b4bae8862998bbefcb79d9db232  src/pecl/zip-1.8.10.tgz
+480d72419e238d9dd51c300632056ed8  src/webmin-modules/NagiosModule.wbm.bz2
+8d7ffdacc333e72316d34834ae7834e0  src/webmin-modules/file-1.470-2.wbm.gz
+cb44552002fe79cb900631605697f5a3  src/webmin-modules/openvpn-2.5.wbm.gz
+052aaac153a48d3b94765556bf367690  src/webmin-modules/squidguard.wbm.gz
+36c3ecbb42d054a82f9e9345d8d42b51  src/webmin-modules/ssh2.wbm.gz
+9f64f8099eca9f36619592986f5c1d5d  src/webmin-modules/sysstats-1.3.tgz
+1512ceab0dbd647f29c0d6f907a59989  src/webmin-modules/vsftpd.tar.gz
+0f7ff9b94d46e72fb72bc6aa9320fc0b  src/webmin-modules/wbmclamav-0.12.wbm.gz

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

Modified Files:
	bacula 
Log Message:
added batch for bacula to allow migration jobs with spaces in the job names


Index: bacula
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/bacula,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bacula	7 May 2009 14:56:59 -0000	1.5
+++ bacula	5 Jun 2009 19:32:13 -0000	1.6
@@ -27,6 +27,15 @@
 case $1 in
     build )
 	if [ "$CONFIG_BACULA" = "y" ]; then
+                if [ ! -f .dl-patches.done ]; then
+                        for PATCH in $(ls $DL_DIR/src/bacula*patch.bz2)
+                        do
+                                echo applying $PATCH
+                                bzcat $PATCH | patch -p0 || exit 1
+                        done
+                        touch .dl-patches.done
+                fi
+
 		./configure --prefix=/usr --disable-nls --with-mysql --sysconfdir=/etc/bacula --with-working-dir=/var/bacula/working \
 		--enable-smartalloc --enable-batch-insert --with-dir-user=bacula --with-dir-group=backup \
 		--with-sd-user=bacula --with-sd-group=backup || exit 1

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

Modified Files:
	webmin 
Log Message:
fix apache path


Index: webmin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/webmin,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- webmin	19 May 2009 15:43:46 -0000	1.7
+++ webmin	5 Jun 2009 18:01:50 -0000	1.8
@@ -99,6 +99,7 @@
 	    perl -i -p -e 's%/usr/local%%g' /etc/webmin/syslog-ng/*
 	    perl -i -p -e 's%/usr/local/mysql/%/usr/%g' /etc/webmin/mysql/*
 	    change_param /etc/webmin/apache/config httpd_conf /etc/apache2/httpd.conf
+	    change_param /etc/webmin/apache/config apachectl_path /usr/bin/apachectl
 	    change_param /etc/webmin/openvpn/config openvpn_path /sbin/openvpn
 	    change_param /etc/webmin/dovecot/config pid_file /var/run/dovecot/master.pid
 	    change_param /etc/webmin/dovecot/config dovecot /usr/sbin/dovecot

Update of /cvsroot/devil-linux/web/support
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12716/support

Modified Files:
	bugs.php 
Log Message:
forgot the feature requests...

Index: bugs.php
===================================================================
RCS file: /cvsroot/devil-linux/web/support/bugs.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bugs.php	5 Jun 2009 17:53:18 -0000	1.3
+++ bugs.php	5 Jun 2009 17:57:44 -0000	1.4
@@ -2,7 +2,7 @@
 <? include("../include/header.php") ?>
 
 
-<h1>Bugs</h1>
+<h1>Bugs / Feature Requests</h1>
 <p>In order to submit bug reports or feature requests, please use our <a href="http://apps.sourceforge.net/mantisbt/devil-linux/" target="_blank">bug tracking system</a>.</p>
 <p>You will need a Sourceforge account. If you do not have one yet, get it <a href="http://sourceforge.net/account/registration/" target="_blank">here</a>.</p>
 

Update of /cvsroot/devil-linux/web/include
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12716/include

Modified Files:
	config.inc.php 
Log Message:
forgot the feature requests...

Index: config.inc.php
===================================================================
RCS file: /cvsroot/devil-linux/web/include/config.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- config.inc.php	5 Jun 2009 17:41:22 -0000	1.10
+++ config.inc.php	5 Jun 2009 17:57:44 -0000	1.11
@@ -29,7 +29,7 @@
 	);
 	$navarray["SUPPORT"]["SUBNAV"] = array(
 		array("TITLE" => "Mailinglists", "LINK" => "index.php"),
-		array("TITLE" => "Bugs", "LINK" => "bugs.php"),
+		array("TITLE" => "Bugs / Feature Requests", "LINK" => "bugs.php"),
 		array("TITLE" => "Documentation", "LINK" => "docs.php"),
 		array("TITLE" => "How-To's", "LINK" => "howtos.php"),
 		array("TITLE" => "Developing", "LINK" => "develop.php"),

Update of /cvsroot/devil-linux/web/support
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11386

Modified Files:
	bugs.php 
Log Message:
oops

Index: bugs.php
===================================================================
RCS file: /cvsroot/devil-linux/web/support/bugs.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bugs.php	5 Jun 2009 17:42:05 -0000	1.2
+++ bugs.php	5 Jun 2009 17:53:18 -0000	1.3
@@ -1,8 +1,8 @@
-<?	$section = "BUGS"; ?>
+<?	$section = "SUPPORT"; ?>
 <? include("../include/header.php") ?>
 
 
-<h1>Bugs.</h1>
+<h1>Bugs</h1>
 <p>In order to submit bug reports or feature requests, please use our <a href="http://apps.sourceforge.net/mantisbt/devil-linux/" target="_blank">bug tracking system</a>.</p>
 <p>You will need a Sourceforge account. If you do not have one yet, get it <a href="http://sourceforge.net/account/registration/" target="_blank">here</a>.</p>
 

Update of /cvsroot/devil-linux/web/support
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8897

Modified Files:
	bugs.php 
Log Message:
open in new window

Index: bugs.php
===================================================================
RCS file: /cvsroot/devil-linux/web/support/bugs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bugs.php	5 Jun 2009 17:41:22 -0000	1.1
+++ bugs.php	5 Jun 2009 17:42:05 -0000	1.2
@@ -3,7 +3,7 @@
 
 
 <h1>Bugs.</h1>
-<p>In order to submit bug reports or feature requests, please use our <a href="http://apps.sourceforge.net/mantisbt/devil-linux/">bug tracking system</a>.</p>
-<p>You will need a Sourceforge account. If you do not have one yet, get it <a href="http://sourceforge.net/account/registration/">here</a>.</p>
+<p>In order to submit bug reports or feature requests, please use our <a href="http://apps.sourceforge.net/mantisbt/devil-linux/" target="_blank">bug tracking system</a>.</p>
+<p>You will need a Sourceforge account. If you do not have one yet, get it <a href="http://sourceforge.net/account/registration/" target="_blank">here</a>.</p>
 
 <? include("../include/footer.php") ?>

Update of /cvsroot/devil-linux/web/support
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8751/support

Added Files:
	bugs.php 
Log Message:
added link for bug tracking website

--- NEW FILE: bugs.php ---
<?	$section = "BUGS"; ?>
<? include("../include/header.php") ?>


<h1>Bugs.</h1>
<p>In order to submit bug reports or feature requests, please use our <a href="http://apps.sourceforge.net/mantisbt/devil-linux/">bug tracking system</a>.</p>
<p>You will need a Sourceforge account. If you do not have one yet, get it <a href="http://sourceforge.net/account/registration/">here</a>.</p>

<? include("../include/footer.php") ?>

Update of /cvsroot/devil-linux/web/include
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8751/include

Modified Files:
	config.inc.php 
Log Message:
added link for bug tracking website

Index: config.inc.php
===================================================================
RCS file: /cvsroot/devil-linux/web/include/config.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- config.inc.php	9 Sep 2007 14:14:53 -0000	1.9
+++ config.inc.php	5 Jun 2009 17:41:22 -0000	1.10
@@ -29,6 +29,7 @@
 	);
 	$navarray["SUPPORT"]["SUBNAV"] = array(
 		array("TITLE" => "Mailinglists", "LINK" => "index.php"),
+		array("TITLE" => "Bugs", "LINK" => "bugs.php"),
 		array("TITLE" => "Documentation", "LINK" => "docs.php"),
 		array("TITLE" => "How-To's", "LINK" => "howtos.php"),
 		array("TITLE" => "Developing", "LINK" => "develop.php"),

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

Modified Files:
	grub 
Log Message:

- added "-m"


Index: grub
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grub,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- grub	29 May 2009 05:36:12 -0000	1.16
+++ grub	29 May 2009 06:17:36 -0000	1.17
@@ -53,7 +53,7 @@
 		rm -rf $TMPDIR || exit 1
 		mkdir -p $TMPDIR || exit 1
 		make install DESTDIR=$TMPDIR || exit 1
-		paxctl -x -e -p -r -s $TMPDIR/sbin/grub || exit 1
+		paxctl -p -s -m -x -e -r $TMPDIR/sbin/grub || exit 1
 		copy_docs $TMPDIR
 		mkdir -p $CDDIR/sbin
 		cp -dpvR $TMPDIR/sbin/* $CDDIR/sbin/ || exit 1