devil-linux-commit — Mailing list for CVS commit messages.

[Devil-linux-commit] build CHANGES, 1.1409, 1.1410 md5sum.lst, 1.597, 1.598

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31721

Modified Files:
	CHANGES md5sum.lst 
Log Message:
updated dovecot to 2.0.5


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1409
retrieving revision 1.1410
diff -u -d -r1.1409 -r1.1410
--- CHANGES	30 Sep 2010 20:26:24 -0000	1.1409
+++ CHANGES	2 Oct 2010 18:33:36 -0000	1.1410
@@ -22,6 +22,7 @@
 #
 
 1.4RC6
+- updated dovecot to 2.0.5
 - updated xtables-addons to 1.29
 - added missing mod_perl perl modules
 - added MailScanner-4.81.4-1 (Alberto Benati + Heiko)

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -d -r1.597 -r1.598
--- md5sum.lst	30 Sep 2010 20:26:24 -0000	1.597
+++ md5sum.lst	2 Oct 2010 18:33:36 -0000	1.598
@@ -103,7 +103,7 @@
 b093d7c6bc7f97ae6fd35d048529232a  src/dnsmasq-2.55.tar.gz
 b9b76a6af198c4f44574cfd17a322f01  src/docbook2X-0.8.8.tar.gz
 ae64c11d3963cd49758aba2854a60b6e  src/dosfstools-3.0.6.tar.bz2
-ff1cd0dbfca4a26cce782f7d31cb2028  src/dovecot-2.0.4.tar.gz
+7168c5bf40fdd38cceb99114547699b8  src/dovecot-2.0.5.tar.gz
 3a12dba3a010c79452c5cb26cf4dbde8  src/dovecot_deleted_to_trash-0.3.tar.bz2
 10d092b57d628d8c91655fee5dc0d0cd  src/dspam-3.9.0.tar.gz
 3983baeb199e010920a46d8541de784b  src/dst-11.tar.bz2

[Devil-linux-commit] build/scripts dovecot,1.25,1.26

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4434

Modified Files:
	dovecot 
Log Message:
adjustments for dovecot 2


Index: dovecot
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dovecot,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dovecot	30 Sep 2010 19:24:46 -0000	1.25
+++ dovecot	2 Oct 2010 16:42:46 -0000	1.26
@@ -33,7 +33,7 @@
 			fi
 
 			./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-ssl=openssl \
-			    --with-db --with-zlib --with-bzlib --with-libcap --enable-shared --enable-header-install $CONF_OPTIONS || exit 1
+			    --with-sql --with-zlib --with-bzlib --with-libcap --enable-shared  $CONF_OPTIONS || exit 1
 			make $PMAKE all || exit 1
 			strip_debug
 			

[Devil-linux-commit] build CHANGES, 1.1408, 1.1409 md5sum.lst, 1.596, 1.597

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15846

Modified Files:
	CHANGES md5sum.lst 
Log Message:
updated xtables-addons to 1.29


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1408
retrieving revision 1.1409
diff -u -d -r1.1408 -r1.1409
--- CHANGES	29 Sep 2010 17:52:07 -0000	1.1408
+++ CHANGES	30 Sep 2010 20:26:24 -0000	1.1409
@@ -22,6 +22,7 @@
 #
 
 1.4RC6
+- updated xtables-addons to 1.29
 - added missing mod_perl perl modules
 - added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
 - updated DenyHosts to debian patch 2.6-7 (Alberto Benati / Heiko)

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -d -r1.596 -r1.597
--- md5sum.lst	28 Sep 2010 18:14:41 -0000	1.596
+++ md5sum.lst	30 Sep 2010 20:26:24 -0000	1.597
@@ -716,7 +716,7 @@
 41bac47fb49a98857f346bbc1c164872  src/xfsprogs-3.0.3.tar.gz
 567382d7972613090215c6c54f9b82d9  src/xinetd-2.3.14.tar.gz
 ab6614c785f5b653fcc69fb9c02058f0  src/xmbmon205.tar.gz
-6091032318ee7fb46d82dec9ae5ae422  src/xtables-addons-1.26.tar.bz2
+acfc41b5065706143e4a0570de458781  src/xtables-addons-1.29.tar.bz2
 cc4044fcc073b8bcf3164d1d0df82161  src/xz-4.999.9beta.tar.bz2
 8a852581c831eb6e699a16d741a7ec52  src/yp-tools-2.9.tar.gz
 390470ce9f41bd6929102972b9b8a1b7  src/yp_auth.patch.bz2

[Devil-linux-commit] build/scripts dovecot,1.24,1.25

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1244

Modified Files:
	dovecot 
Log Message:
adopt path to new dovecot configure behavior


Index: dovecot
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dovecot,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dovecot	30 Sep 2010 18:30:54 -0000	1.24
+++ dovecot	30 Sep 2010 19:24:46 -0000	1.25
@@ -32,7 +32,7 @@
 				CONF_OPTIONS="$CONF_OPTIONS --with-sqlite"
 			fi
 
-			./configure --prefix=/usr --sysconfdir=/etc/dovecot --localstatedir=/var --with-ssl=openssl \
+			./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-ssl=openssl \
 			    --with-db --with-zlib --with-bzlib --with-libcap --enable-shared --enable-header-install $CONF_OPTIONS || exit 1
 			make $PMAKE all || exit 1
 			strip_debug

[Devil-linux-commit] build/scripts/scripts vmware,1.9,1.10

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

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32443/scripts/scripts

Modified Files:
	vmware 
Log Message:
vmemctl does no longer exist


Index: vmware
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/vmware,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- vmware	22 Jun 2009 13:54:10 -0000	1.9
+++ vmware	30 Sep 2010 19:20:54 -0000	1.10
@@ -44,12 +44,6 @@
 		echo "Unloading PCNET32"
 		rmmod pcnet32 &> /dev/null
 
-		# 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 vmmemctl
-		sleep 2
-		
 		echo -n "Starting $NAME: "
 		loadproc $DAEMON $PARAMETER
 		

[Devil-linux-commit] build/config/etc/init.d boot,1.36,1.37

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

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32443/config/etc/init.d

Modified Files:
	boot 
Log Message:
vmemctl does no longer exist


Index: boot
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/boot,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- boot	29 Apr 2009 18:33:24 -0000	1.36
+++ boot	30 Sep 2010 19:20:53 -0000	1.37
@@ -41,7 +41,6 @@
 
 if [ "$START_VMWARE" = "yes" ]; then
     echo "Loading VMWare modules"
-    modprobe vmmemctl
     modprobe vmxnet
     sleep 5
 fi

[Devil-linux-commit] build/scripts dovecot,1.23,1.24

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18551/scripts

Modified Files:
	dovecot 
Log Message:
add missing dovenull user for dovecot v2


Index: dovecot
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dovecot,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dovecot	30 Aug 2010 20:31:10 -0000	1.23
+++ dovecot	30 Sep 2010 18:30:54 -0000	1.24
@@ -61,6 +61,7 @@
 			chmod -R 750  $CDDIR/var/run/dovecot || exit 1
 
 			useradd -u 102 -g nogroup -s /bin/false -c "Dovecot secure IMAP server" dovecot
+			useradd -u 103 -g nogroup -s /bin/false -c "Dovecot secure IMAP server - untrusted" dovenull
 			cp $MYDIR/scripts/dovecot $ETCDIR/etc/init.d || exit 1
 
 			cp $MYDIR/scripts/dovecot.pam $ETCDIR/etc/pam.d/dovecot || exit 1

[Devil-linux-commit] build/config/etc/sysconfig/nic ifcfg-eth0.sample, 1.14, 1.15

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

Update of /cvsroot/devil-linux/build/config/etc/sysconfig/nic
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15026

Modified Files:
	ifcfg-eth0.sample 
Log Message:

- oops #3  (grammatical errors)


Index: ifcfg-eth0.sample
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/nic/ifcfg-eth0.sample,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ifcfg-eth0.sample	29 Sep 2010 19:21:35 -0000	1.14
+++ ifcfg-eth0.sample	29 Sep 2010 19:46:19 -0000	1.15
@@ -33,11 +33,12 @@
 #
 
 # MTU redefines MTU settings for the link layer.
-# Use it only if you know what are you doing. Example below is for 9k jumbo frames
+# Use it only if you know what are you doing.
+# Example below is for 9k jumbo frames
 #MTU=9000
 
-# MODULE - NIC module. It's optional parameter because hardware 
-# autodetection should load all necessary modules.
+# MODULE - NIC module. It's an optional parameter because 
+# hardware autodetection should load all necessary modules.
 MODULE=pcnet32
 #MODULE_OPTS=
 #

[Devil-linux-commit] build/config/etc/sysconfig/nic ifcfg-eth0.sample, 1.13, 1.14

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

Update of /cvsroot/devil-linux/build/config/etc/sysconfig/nic
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10579

Modified Files:
	ifcfg-eth0.sample 
Log Message:

oops #2


Index: ifcfg-eth0.sample
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/nic/ifcfg-eth0.sample,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ifcfg-eth0.sample	29 Sep 2010 19:17:19 -0000	1.13
+++ ifcfg-eth0.sample	29 Sep 2010 19:21:35 -0000	1.14
@@ -33,7 +33,7 @@
 #
 
 # MTU redefines MTU settings for the link layer.
-# Use it only if know what are you doing. Example below is for 9k jumbo frames
+# Use it only if you know what are you doing. Example below is for 9k jumbo frames
 #MTU=9000
 
 # MODULE - NIC module. It's optional parameter because hardware 

[Devil-linux-commit] build/config/etc/sysconfig/nic ifcfg-eth0.sample, 1.12, 1.13

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

Update of /cvsroot/devil-linux/build/config/etc/sysconfig/nic
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9718

Modified Files:
	ifcfg-eth0.sample 
Log Message:

oops


Index: ifcfg-eth0.sample
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/nic/ifcfg-eth0.sample,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ifcfg-eth0.sample	29 Sep 2010 19:15:56 -0000	1.12
+++ ifcfg-eth0.sample	29 Sep 2010 19:17:19 -0000	1.13
@@ -3,7 +3,7 @@
 # example for a "normal" INTERFACE with no VLANs and no BRIDGING
 #
 
-# DEVICE is mandatory parameter
+# DEVICE is a mandatory parameter
 DEVICE=eth0
 
 ONBOOT=yes

[Devil-linux-commit] build/config/etc/sysconfig/nic ifcfg-eth0.sample, 1.11, 1.12 ifcfg-eth1.sample, 1.5, 1.6 ifcfg-eth2.sample, 1.3, 1.4 ifcfg-eth3.sample, 1.3, 1.4 ifcfg-eth4.sample, 1.6, 1.7 ifcfg-vlan100.sample, 1.6, 1.7

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

Update of /cvsroot/devil-linux/build/config/etc/sysconfig/nic
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9214

Modified Files:
	ifcfg-eth0.sample ifcfg-eth1.sample ifcfg-eth2.sample 
	ifcfg-eth3.sample ifcfg-eth4.sample ifcfg-vlan100.sample 
Log Message:

- added some explanation for the available parameters


Index: ifcfg-eth1.sample
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/nic/ifcfg-eth1.sample,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ifcfg-eth1.sample	9 Sep 2010 03:18:47 -0000	1.5
+++ ifcfg-eth1.sample	29 Sep 2010 19:15:56 -0000	1.6
@@ -4,12 +4,13 @@
 # see also 
 #   ifcfg-vlan100.sample
 #
-DHCP=no
-ONBOOT=yes
 DEVICE=eth1
-# it is essential that you leave the IP unconfigured or undefined if
-# you want to do vlans on this interface
-#IP=""
+ONBOOT=yes
+DHCP=no
+
+# MTU redefines MTU settings for the link layer.
+# Use it only if know what are you doing. Example below is for 9k jumbo frames
+#MTU=9000
 # currently only the e100, e1000 and tg3 modules are known to support vlan tagging
 MODULE=e100
 #MODULE_OPTS=

Index: ifcfg-eth0.sample
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/nic/ifcfg-eth0.sample,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ifcfg-eth0.sample	7 Sep 2010 19:57:47 -0000	1.11
+++ ifcfg-eth0.sample	29 Sep 2010 19:15:56 -0000	1.12
@@ -2,17 +2,42 @@
 #
 # example for a "normal" INTERFACE with no VLANs and no BRIDGING
 #
+
+# DEVICE is mandatory parameter
+DEVICE=eth0
+
+ONBOOT=yes
+
 DHCP=no
 #DHCP=yes
 #DHCP=server
 # options passed directly to dhcpcd on startup
 #DHCP_OPTIONS=""
-ONBOOT=yes
-DEVICE=eth0
+
+# IP address can be defined in CIDR notation, i.e.
+# IP="10.90.1.200/24"
+# In such case NETMASK maybe commented out
 IP=10.90.1.200
+
+# NETMASK also can be in CIDR notation, i.e.
+# NETMASK="/24"
 NETMASK=255.255.255.0
+
+# BROADCAST is an auto-calculated value
+# you can safely omit it.
 #BROADCAST=10.90.1.255
+
+# MAC is not for NIC identification, but for 
+# mac address spoofing/redefining. You can safely omit it
 #MAC=
+#
+
+# MTU redefines MTU settings for the link layer.
+# Use it only if know what are you doing. Example below is for 9k jumbo frames
+#MTU=9000
+
+# MODULE - NIC module. It's optional parameter because hardware 
+# autodetection should load all necessary modules.
 MODULE=pcnet32
 #MODULE_OPTS=
 #
@@ -21,7 +46,7 @@
 # where ROUTE is a keyword and the line with ROUTE
 # should not have spaces between the beginning of
 # the line and the keyword
-# Route statement is a any valid "ip route"# command, 
+# Route statement is any valid "ip route" command, 
 # without "ip route add" prefix - it will be added 
 # automatically
 #
@@ -32,7 +57,7 @@
 # where RULE is a keyword and the line with RULE
 # should not have spaces between the beginning of
 # the line and the keyword
-# Rule statement is a any valid "ip rule" command,
+# Rule statement is any valid "ip rule" command,
 # without "ip rule add" prefix - it will be added 
 # automatically
 #

Index: ifcfg-vlan100.sample
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/nic/ifcfg-vlan100.sample,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ifcfg-vlan100.sample	7 Sep 2010 19:57:47 -0000	1.6
+++ ifcfg-vlan100.sample	29 Sep 2010 19:15:56 -0000	1.7
@@ -4,12 +4,13 @@
 # see also 
 #   ifcfg-eth1.sample
 #
+
+# the base interface (see ifcfg-eth1.sample for configuration)
+DEVICE=eth1
+ONBOOT=yes
 DHCP=no
 #DHCP=yes
 #DHCP=server
-ONBOOT=yes
-# the base interface (see ifcfg-eth1.sample for configuration)
-DEVICE=eth1
 ### note: 0 < vlanid < 4095
 VLANID=100
 IP=10.90.5.254

Index: ifcfg-eth4.sample
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/nic/ifcfg-eth4.sample,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ifcfg-eth4.sample	7 Sep 2010 19:57:47 -0000	1.6
+++ ifcfg-eth4.sample	29 Sep 2010 19:15:56 -0000	1.7
@@ -2,14 +2,26 @@
 #
 # example for a "normal" INTERFACE with no VLANs and no BRIDGING
 #
+DEVICE=eth4
+ONBOOT=yes
+
 DHCP=no
 #DHCP=yes
 #DHCP=server
-ONBOOT=yes
-DEVICE=eth4
+
+# IP address can be defined in CIDR notation, i.e.
+# IP="10.90.1.200/24"
+# In such case NETMASK maybe commented out
 IP=10.90.1.200
+
+# NETMASK also can be in CIDR notation, i.e.
+# NETMASK="/24"
 NETMASK=255.255.255.0
+
+# BROADCAST is an auto-calculated value
+# you can safely omit it.
 #BROADCAST=10.90.1.255
+
 #MAC=
 MODULE=prism54
 #MODULE_OPTS=

Index: ifcfg-eth2.sample
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/nic/ifcfg-eth2.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ifcfg-eth2.sample	7 Sep 2010 19:57:47 -0000	1.3
+++ ifcfg-eth2.sample	29 Sep 2010 19:15:56 -0000	1.4
@@ -5,11 +5,9 @@
 #   ifcfg-eth3.sample and
 #   ifcfg-br0.sample
 #
-DHCP=no
-ONBOOT=yes
 DEVICE=eth2
-# it is essential that you leave the IP at 0.0.0.0 if
-# you want to do bridging on this interface
-IP=0.0.0.0
+ONBOOT=yes
+DHCP=no
+
 MODULE=8139too
 #MODULE_OPTS=

Index: ifcfg-eth3.sample
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/nic/ifcfg-eth3.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ifcfg-eth3.sample	7 Sep 2010 19:57:47 -0000	1.3
+++ ifcfg-eth3.sample	29 Sep 2010 19:15:56 -0000	1.4
@@ -5,11 +5,9 @@
 #   ifcfg-eth2.sample and
 #   ifcfg-br0.sample
 #
-DHCP=no
-ONBOOT=yes
 DEVICE=eth3
-# it is essential that you leave the IP at 0.0.0.0 if
-# you want to do bridging on this interface
-IP=0.0.0.0
+ONBOOT=yes
+DHCP=no
+
 MODULE=8139too
 #MODULE_OPTS=

[Devil-linux-commit] build/scripts mod_perl,1.7,1.8

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25451/scripts

Modified Files:
	mod_perl 
Log Message:
added missing mod_perl perl modules


Index: mod_perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mod_perl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mod_perl	24 Apr 2010 18:33:41 -0000	1.7
+++ mod_perl	29 Sep 2010 17:52:07 -0000	1.8
@@ -25,7 +25,9 @@
 	install )
 	    if [ "$CONFIG_HTTPD" = "y" ]; then
 		if [ "$CONFIG_MOD_PERL" = "y" ]; then
-			cp src/modules/perl/mod_perl.so $CDDIR/usr/lib/apache2/modules/ || exit 1 
+			cp src/modules/perl/mod_perl.so $CDDIR/usr/lib/apache2/modules/ || exit 1
+			
+			make install DESTDIR=$CDDIR
 		fi
 	    fi
 		;;

[Devil-linux-commit] build CHANGES,1.1407,1.1408

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25451

Modified Files:
	CHANGES 
Log Message:
added missing mod_perl perl modules


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1407
retrieving revision 1.1408
diff -u -d -r1.1407 -r1.1408
--- CHANGES	28 Sep 2010 18:14:41 -0000	1.1407
+++ CHANGES	29 Sep 2010 17:52:07 -0000	1.1408
@@ -22,6 +22,7 @@
 #
 
 1.4RC6
+- added missing mod_perl perl modules
 - added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
 - updated DenyHosts to debian patch 2.6-7 (Alberto Benati / Heiko)
 - added missing perl module Sys-SigAction-0.11

[Devil-linux-commit] build/scripts MailScanner, NONE, 1.1 DenyHosts, 1.7, 1.8 Mail-SpamAssassin, 1.21, 1.22

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26409/scripts

Modified Files:
	DenyHosts Mail-SpamAssassin 
Added Files:
	MailScanner 
Log Message:
- added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
- updated DenyHosts to debian patch 2.6-7 (Alberto Benati / Heiko)
- added missing perl module Sys-SigAction-0.11
- updated gradm to 2.2.0-201009022049
- updated grsecurity to 2.2.0-2.6.32.23-201009272133
- updated kernel to 2.6.32.23


Index: Mail-SpamAssassin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Mail-SpamAssassin	31 Jan 2010 15:38:07 -0000	1.21
+++ Mail-SpamAssassin	28 Sep 2010 18:14:41 -0000	1.22
@@ -24,6 +24,10 @@
 			make $PMAKE PREFIX=/usr DESTDIR=$TMPDIR || exit 1
 			make $PMAKE spamd/libspamc.so DESTDIR=$TMPDIR || exit 1
 
+			# install, so MailScanner can find it
+			make install || exit 1
+			install -m 0755 spamd/libspamc.so /usr/lib || exit 1
+
 			strip_debug
 		fi
 		;;

Index: DenyHosts
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/DenyHosts,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DenyHosts	6 Jan 2010 14:53:27 -0000	1.7
+++ DenyHosts	28 Sep 2010 18:14:41 -0000	1.8
@@ -21,9 +21,9 @@
 	build )
 		if [ "$CONFIG_DENYHOSTS" = "y" ]; then
 		    if [ "$CONFIG_PYTHON" = "y" ]; then
-			if [ ! -f .patch.done ] && [ -e $DL_DIR/src/denyhosts.diff.gz ]; then
+			if [ ! -f .patch.done ] && [ -e $SRCDIR/denyhosts_2.6-7.diff.gz ]; then
 				#From Debian
-				zcat $DL_DIR/src/denyhosts.diff.gz | patch -p1 || exit 1
+				zcat $SRCDIR/denyhosts_2.6-7.diff.gz | patch -p1 || exit 1
 				touch .patch.done
 			fi
 			python setup.py build || exit 1
@@ -38,17 +38,18 @@
 			mkdir -p $TMPDIR || exit 1
 
 			python setup.py install --root=$TMPDIR --record=INSTALLED_FILES \
-				--install-scripts=/usr/bin --install-purelib=/usr/share/denyhosts || exit 1
+				--install-scripts=/usr/sbin --install-purelib=/usr/share/denyhosts || exit 1
 
 			rm -f $TMPDIR/usr/share/denyhosts/*.txt || exit 1
 			rm -f $TMPDIR/usr/share/denyhosts/denyhosts.cfg-dist || exit 1
+			mv $TMPDIR/usr/sbin/denyhosts.py $TMPDIR/usr/sbin/denyhosts || exit 1
 
 			copy_files $TMPDIR/usr $CDDIR || exit 1
+			mv $CDDIR/usr/sbin/daemon-control-dist $CDDIR/usr/sbin/denyhosts-ctl || exit 1
 
 			mkdir -p $CDDIR/var/lib/denyhosts || exit 1
 
-			mkdir -p $ETCDIR/etc/denyhosts || exit 1
-			cp -dpR denyhosts.cfg-dist $ETCDIR/etc/denyhosts/denyhosts.cfg || exit 1
+			cp -dpR denyhosts.cfg-dist $ETCDIR/etc/denyhosts.conf || exit 1
 
 			mkdir -p $ETCDIR/etc/logrotate.d || exit 1
 			cp -dpR denyhosts.logrotate $ETCDIR/etc/logrotate.d/denyhosts || exit 1

--- NEW FILE: MailScanner ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/MailScanner,v $
# $Revision: 1.1 $
# $Date: 2010/09/28 18:14:41 $
# http://www.devil-linux.org

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

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

# source functions and config
source $MYDIR/settings

MYNAME=MAILSCANNER

case $1 in
	install )
		if [ "$CONFIG_MAILSCANNER" = "y" ]; then
			# we need to define TMPDIR to a path without  the process ID
			# otherwise multiple runs of this script will fail
			TMPDIR=$WORKDIR/tmp.$MYSCRIPT
			
			rm -rf $TMPDIR || exit 1
			mkdir -p $TMPDIR || exit 1

#Install in $TMPDIR
perl -pi - install.tar-fns.sh <<EOF
s+/opt+${TMPDIR}+;
EOF
			./install.sh --nodeps --nomodules || exit 1

			#Move in $TMPDIR/MailScanner
			cd $TMPDIR/MailScanner || exit 1

			#Cleaning...
			rm -f bin/*.tru64 || exit 1
			rm -f bin/*.solaris || exit 1
			rm -f bin/*.solaris.x86 || exit 1
			rm -f bin/*.linux || exit 1
			rm -f bin/*.tmp || exit 1
			rm -f bin/*.old || exit 1
			rm -f bin/update_bad_phishing_sites.pl || exit 1
			rm -f bin/tnef || exit 1 #Install update tnef package from Devil-Linux


#From MailScanner RPM SPEC (pay attention to(2): /usr/bin/tnef, /usr/sbin)
perl -pi -  lib/MailScanner/ConfigDefs.pl  lib/MailScanner/CustomConfig.pm  etc/MailScanner.conf  etc/virus.scanners.conf  bin/MailScanner  bin/Sophos.install  bin/clean.SA.cache  bin/update_virus_scanners  bin/update_phishing_sites  bin/update_bad_phishing_sites <<EOF
s+/opt/MailScanner/etc/mailscanner.conf+/etc/MailScanner/MailScanner.conf+;
s+/opt/MailScanner/etc/virus.scanners.conf+/etc/MailScanner/virus.scanners.conf+;
s./opt/MailScanner/var./var/run.;
s./opt/MailScanner/bin/mailscanner_create_locks./usr/sbin/mailscanner_create_locks.;
s./opt/MailScanner/bin/tnef./usr/bin/tnef.;
s#/opt/MailScanner/bin/Quick.Peek#/usr/sbin/Quick.Peek#;
s./opt/MailScanner/etc/reports./etc/MailScanner/reports.;
s./opt/MailScanner/etc/rules./etc/MailScanner/rules.;
s./opt/MailScanner/etc./etc/MailScanner.;
s./opt/MailScanner/lib./usr/lib/MailScanner.;
s./opt/MailScanner/bin./usr/sbin.;
s./usr/lib/sendmail./usr/sbin/sendmail.;
EOF

#(pay attention to(1): /usr/bin/tnef)
perl -pi -  bin/check_mailscanner  bin/mailscanner_create_locks  bin/processing_messages_alert <<EOF
s+/opt/MailScanner/etc/mailscanner.conf+/etc/MailScanner/MailScanner.conf+;
s./opt/MailScanner/var./var/run.;
s./opt/MailScanner/bin/tnef./usr/bin/tnef.;
s#/opt/MailScanner/bin/Quick.Peek#/usr/sbin/Quick.Peek#;
s./opt/MailScanner/etc/reports./etc/MailScanner/reports.;
s./opt/MailScanner/etc/rules./etc/MailScanner/rules.;
s./opt/MailScanner/etc/mcp./etc/MailScanner/mcp.;
s./opt/MailScanner/etc./etc/MailScanner.;
s./opt/MailScanner/lib./usr/lib/MailScanner.;
s./opt/MailScanner/bin./usr/sbin.;
s./usr/lib/sendmail./usr/sbin/sendmail.;
EOF

			#Bah
			ln -sf MailScanner bin/mailscanner || exit 1
			ln -sf check_mailscanner bin/check_MailScanner || exit 1

			#Again...
			for file in `dir bin/cron` ; do
				replace_str bin/cron/$file "opt/MailScanner/bin" "usr/sbin" || exit 1
			done
			rm -f bin/cron/*.old || exit 1

			#cron dir under etc folder
			mv bin/cron etc/ || exit 1

			cp -dvpR $TMPDIR/MailScanner/bin/* $CDDIR/usr/sbin/ || exit 1
			mkdir -p $CDDIR/usr/lib/MailScanner || exit 1
			cp -dvpR $TMPDIR/MailScanner/lib/* $CDDIR/usr/lib/MailScanner/ || exit 1

			cp -dvp $MYDIR/scripts/mailscanner $ETCDIR/etc/init.d/ || exit 1
			mkdir -p $ETCDIR/etc/MailScanner || exit 1
			cp -dvpR $TMPDIR/MailScanner/etc/* $ETCDIR/etc/MailScanner/ || exit 1

			mkdir -p $CDDIR/var/spool/mqueue.in || exit 1
			mkdir -p $CDDIR/var/spool/MailScanner/incoming || exit 1
			mkdir -p $CDDIR/var/spool/MailScanner/quarantine || exit 1

			rm -rf $TMPDIR || exit 1

			echo "# Start MailScanner daemon?" >> $CONFIGFILE
			echo "START_MAILSCANNER=no" >> $CONFIGFILE
			echo >> $CONFIGFILE
			echo "HELP_MAILSCANNER=\"This program is an email antivirus/antispam gateway.\"" >> $SOFTWAREHELP

		fi
		;;

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

[Devil-linux-commit] build/scripts/configuration/help MailScanner.help, NONE, 1.1

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

Update of /cvsroot/devil-linux/build/scripts/configuration/help
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26409/scripts/configuration/help

Added Files:
	MailScanner.help 
Log Message:
- added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
- updated DenyHosts to debian patch 2.6-7 (Alberto Benati / Heiko)
- added missing perl module Sys-SigAction-0.11
- updated gradm to 2.2.0-201009022049
- updated grsecurity to 2.2.0-2.6.32.23-201009272133
- updated kernel to 2.6.32.23


--- NEW FILE: MailScanner.help ---
CONFIG_MAILSCANNER
 MailScanner is an e-mail security and anti-spam package for e-mail gateway
 systems. It is designed to be run on mail servers operated by companies
 and internet service providers (ISPs) so that all their users and customers
 can be protected from one place.

 The software works with any Unix-based system and is compatible with a wide
 range of mail transports. It comes with support for any combination of 25
 different virus scanner packages, including the free ClamAV scanner, and
 its design allows the use of multiple virus scanners in parallel to increase
 the level of security.

 Protection against spam is mostly based on the widely acclaimed SpamAssassin
 package. It is supplemented with fast blacklist lookups that can be used to
 reject a large proportion of messages with minimal overhead.

 Protection against malware is provided by a very wide selection of checks
 and tests, ranging from simple filename rules to content-based file type
 detection. It also incorporates one of the most sophisticated phishing
 detectors available anywhere. Many other checks and tests can also be run
 against messages, far too many to list here.

 MailScanner is highly configurable using a very easy-to-use system of
 rulesets. Virtually every configuration option can, for example, be
 controlled on a per-user, per-domain or per-IP basis.

 MailScanner is extremely easy to integrate into your existing mail transport
 system, requiring no modification of existing sendmail configurations. Other
 MTAs require only minor modifications to configuration files, and these are
 all well documented. 

[Devil-linux-commit] build/scripts/scripts mailscanner,NONE,1.1

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

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26409/scripts/scripts

Added Files:
	mailscanner 
Log Message:
- added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
- updated DenyHosts to debian patch 2.6-7 (Alberto Benati / Heiko)
- added missing perl module Sys-SigAction-0.11
- updated gradm to 2.2.0-201009022049
- updated grsecurity to 2.2.0-2.6.32.23-201009272133
- updated kernel to 2.6.32.23


--- NEW FILE: mailscanner ---
#!/bin/bash
#
# $Source: /cvsroot/devil-linux/build/scripts/scripts/mailscanner,v $
# $Revision: 1.1 $
# $Date: 2010/09/28 18:14:41 $
#
# http://www.devil-linux.org
#

### BEGIN INIT INFO
# Provides:       mailscanner
# Required-Start: $network $syslog $named clamav spamd
# Required-Stop:  $network $syslog $named
# Default-Start:  3 5
# Default-Stop:   0 6
# Description:    starts MailScanner
### END INIT INFO

# settings
source /etc/sysconfig/config

# parameters
NAME="MailScanner"
CONFIGNAME=MAILSCANNER
DAEMON=/usr/sbin/MailScanner
CONFFILE=/etc/MailScanner/MailScanner.conf
PARAMETER=""


# 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


# sanity check for permissions
check_dir()
{
    if [ ! -d $1 ]; then
	echo >&2 "$0: directory $1: does not exist"
	exit 1
    fi
    actual="$(stat -c %U $1)"
    if [ "$actual" != "$2" ]; then
	echo >&2 "$0: directory $1: wrong owner (expected $2 but is $actual)"
	exit 1
    fi
    actual="$(stat -c %G $1)"
    if [ "$actual" != "$3" ]; then
	echo >&2 "$0: directory $1: wrong group (expected $3 but is $actual)"
	exit 1
    fi
}

pidfile=$(echo $(awk -F= '/^PID file/ {print $2; exit}' $CONFFILE))
mta=$(echo $(awk -F= '/^MTA/ {print $2; exit}' $CONFFILE))
user=$(echo $(awk -F= '/^Run As User/ {print $2; exit}' $CONFFILE))
group=$(echo $(awk -F= '/^Run As Group/ {print $2; exit}' $CONFFILE))

check_dir /var/spool/MailScanner       ${user:-mail} ${group:-mail}

case "$1" in
    start)
	echo -n "Starting $NAME: "
	if [ $mta = 'postfix' ]; then
	    :> $pidfile
	    chown $user $pidfile
	    chown postfix /var/spool/MailScanner/incoming
	    #chown postfix /var/spool/MailScanner/quarantine
	fi	
	/usr/sbin/check_MailScanner >/dev/null
	RETVAL=$?
	if [ $RETVAL -eq 0 ]; then
	    touch /var/lock/subsys/MailScanner
	    rm -f /var/lock/subsys/MailScanner.off
	fi
	success
	echo "$NAME."
	;;
    stop)
	echo -n "Stopping $NAME: "
	killproc MailScanner -15
	RETVAL=$?
	if [ $RETVAL -eq 0 ]; then
	    rm -f /var/lock/subsys/MailScanner
	    touch /var/lock/subsys/MailScanner.off
	fi
	if ps axww | grep -i $DAEMON | grep -qv grep; then
	    echo -n "(waiting"
	    for i in 1 2 3 4 5 6 7 8 9 10; do
		sleep $i
		if ! ps axww | grep -i $DAEMON | grep -qv grep; then
		    break;
		fi
		echo -n .
	    done
	    echo -n ") "
	fi
	rm -f $pidfile
	echo "$NAME."
	;;
    reload)
	echo -n "Reloading $NAME: "
	pid=`pidof MailScanner`
	if [ -z "$pid" ] ; then
	    failure
	else
	    /bin/kill -HUP -- -$pid
	    success
	fi
	echo
	if [ $mta = "postfix" ]; then
	    service postfix reload 2>/dev/null
	    success
	    echo
	fi
	;;
    restart)
	$0 stop
	$0 start
	;;
    *)
	N=/etc/init.d/$NAME
	echo "Usage: $N {start|stop|restart|reload}" >&2
	exit 1
	;;
esac

exit 0

[Devil-linux-commit] build/scripts/config perl-ext,1.24,1.25

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

Update of /cvsroot/devil-linux/build/scripts/config
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26409/scripts/config

Modified Files:
	perl-ext 
Log Message:
- added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
- updated DenyHosts to debian patch 2.6-7 (Alberto Benati / Heiko)
- added missing perl module Sys-SigAction-0.11
- updated gradm to 2.2.0-201009022049
- updated grsecurity to 2.2.0-2.6.32.23-201009272133
- updated kernel to 2.6.32.23


Index: perl-ext
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/perl-ext,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- perl-ext	5 Sep 2010 14:31:11 -0000	1.24
+++ perl-ext	28 Sep 2010 18:14:41 -0000	1.25
@@ -180,3 +180,4 @@
 B-Lint
 B-C
 Locale-Codes
+Sys-SigAction

[Devil-linux-commit] build/scripts/configuration MailScanner.config, NONE, 1.1

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

Update of /cvsroot/devil-linux/build/scripts/configuration
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26409/scripts/configuration

Added Files:
	MailScanner.config 
Log Message:
- added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
- updated DenyHosts to debian patch 2.6-7 (Alberto Benati / Heiko)
- added missing perl module Sys-SigAction-0.11
- updated gradm to 2.2.0-201009022049
- updated grsecurity to 2.2.0-2.6.32.23-201009272133
- updated kernel to 2.6.32.23


--- NEW FILE: MailScanner.config ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/configuration/MailScanner.config,v $
# $Revision: 1.1 $
# $Date: 2010/09/28 18:14:41 $
#
# http://www.devil-linux.org

menu_add "Networking|Mail" bool "MailScanner (Email Antivirus Gateway)" CONFIG_MAILSCANNER

[Devil-linux-commit] build CHANGES, 1.1406, 1.1407 Makefile.install, 1.15, 1.16 md5sum.lst, 1.595, 1.596

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26409

Modified Files:
	CHANGES Makefile.install md5sum.lst 
Log Message:
- added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
- updated DenyHosts to debian patch 2.6-7 (Alberto Benati / Heiko)
- added missing perl module Sys-SigAction-0.11
- updated gradm to 2.2.0-201009022049
- updated grsecurity to 2.2.0-2.6.32.23-201009272133
- updated kernel to 2.6.32.23


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1406
retrieving revision 1.1407
diff -u -d -r1.1406 -r1.1407
--- CHANGES	28 Sep 2010 13:11:24 -0000	1.1406
+++ CHANGES	28 Sep 2010 18:14:41 -0000	1.1407
@@ -22,6 +22,12 @@
 #
 
 1.4RC6
+- added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
+- updated DenyHosts to debian patch 2.6-7 (Alberto Benati / Heiko)
+- added missing perl module Sys-SigAction-0.11
+- updated gradm to 2.2.0-201009022049
+- updated grsecurity to 2.2.0-2.6.32.23-201009272133
+- updated kernel to 2.6.32.23
 - accidentally released a RC5 version in the 'testing' folder on the FTP server
   bumping up version number to avoid confusion and ensure upgrades will work.
 

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -d -r1.595 -r1.596
--- md5sum.lst	27 Sep 2010 17:52:43 -0000	1.595
+++ md5sum.lst	28 Sep 2010 18:14:41 -0000	1.596
@@ -8,7 +8,7 @@
 90901044f52f5213a2abc612b9745c1b  src/MOSIX-1.9.0.tgz
 6b154c442a335c2a281defe17c8008e8  src/MOSKRN-1.9.0.tgz
 bb977900c3b2627db13e9f44f9b5bfc8  src/Mail-SpamAssassin-3.3.1.tar.bz2
-8b6d5c836a18d9347bc3efd372c681a0  src/MailScanner-4.79.11-1.tar.gz
+2d51a6cf81299e1c79c3971aaf1694e8  src/MailScanner-install-4.81.4-1.tar.gz
 532268f02870bea18c1d465e88afff30  src/MySQL-python-1.2.2.tar.gz
 8a39f5902094619afcda7d12d9d8342c  src/Pound-2.5.tgz
 6bef0417e71a1a1737ccf5750420fdb3  src/Python-2.6.5.tar.bz2
@@ -90,8 +90,7 @@
 ce4327643d73c3c34e0b7b846255c98c  src/dcc-1.3.130.tar.Z
 e393cbf386831825ae8814d9341feadd  src/ddup-3.0.1.tar.bz2
 4cf4210e06a84e8d9354201ab97dc2e2  src/debianutils_3.2.1.tar.gz
-7280094f6cc7952051031334d2fdfd14  src/denyhosts.diff.gz
-29ade831880b2e0a91d4f49cb73a22dd  src/denyhosts_2.5-3.diff.gz
+e16faf22dad88638da3daf9cbfa4e022  src/denyhosts_2.6-7.diff.gz
 38a74c89d8913b9b5f33737047623c18  src/dhcp-4.1.1.tar.gz
 30a161c93bd4548a28d97041329bf335  src/dhcpcd-5.2.2.tar.bz2
 519c0a0cbac28ddb992111ec2c3f82aa  src/dialog-1.1-20100428.tar.gz
@@ -172,11 +171,11 @@
 f989fe8e24f82d19c8ce55df15784e15  src/gocr-0.43.tar.gz
 c1f1db32fb6598d6a93e6e88796a8632  src/gperf-3.0.4.tar.gz
 6b534da16dc1b28ba828dea89e520f6f  src/gpm-1.20.6.tar.bz2
-55c756febdbc853cc006f6fdfc51f43b  src/gradm-2.2.0-201008112235.tar.gz
+97d5b55e38dc5db8906dffa2b9335032  src/gradm-2.2.0-201009022049.tar.gz
 3095b57837b312f087c0680559de7f13  src/grep-2.6.3.tar.gz
 b2151714de0c8d31d864fc7b7b9fcb3a  src/groff-1.20.1-badchar.patch.bz2
 48fa768dd6fdeb7968041dd5ae8e2b02  src/groff-1.20.1.tar.gz
-7d3196cbc820cdf2e874444e8aab4bb9  src/grsecurity-2.2.0-2.6.32.21-201008292122.patch.bz2
+48be8f0440e4577c760a70134c0b1f8f  src/grsecurity-2.2.0-2.6.32.23-201009272133.patch.bz2
 cd3f3eb54446be6003156158d51f4884  src/grub-0.97.tar.gz
 c54a31b93e865f6a4410b2dc64662706  src/gzip-1.3.13.tar.gz
 b4cc528afb1db7c35e3701d2d96012b2  src/hdparm-9.30.tar.gz
@@ -370,7 +369,7 @@
 e6f90c8e57e236d45626d479feca2dc4  src/pam_otp_auth-3.2.2.tar.gz
 a5d27ccbaaad9d9fb254b01a3c12bd06  src/pam_radius-1.3.17.tar.gz
 9c262afd6673d7724a60b7c632ce80fa  src/parted-2.2.tar.gz
-29aa10a231882a6e52908642b572326f  src/patch-2.6.32.21.bz2
+6eac9aebbf9e74546b7c44c0fb9348a7  src/patch-2.6.32.23.bz2
 289248c80d96184a902ffac1db56543f  src/patch-o-matic-ng-20090819.tar.bz2
 ad241429bf352d1b55493153f2eaae2f  src/pax-linux-2.6.32.10-test27.patch.bz2
 acf0e368cb33bc2f6a335ba3f5e4fd2b  src/pax-utils-0.1.15.tar.bz2
@@ -534,6 +533,7 @@
 c166738a97c0424a0075ebe205d285db  src/perl-ext/Sub-Uplevel-0.22.tar.gz.1
 bf75dc7f171b4718a2118c3d6cbe6013  src/perl-ext/Switch-2.16.tar.gz
 a5b3c23754cbcff10e283d16c42ec3d3  src/perl-ext/Sys-Hostname-Long-1.4.tar.gz
+e37f1e69d6ac6ea4a9ffd7f845753e79  src/perl-ext/Sys-SigAction-0.11.tar.gz
 c18de7bca86846c107df290d93414830  src/perl-ext/Sys-Syslog-0.27.tar.gz
 9aea475db531d4fd4ce40cf25a0acd14  src/perl-ext/Test-Exception-0.29.tar.gz
 017311ee9a4549a0885e1b9cb5fca3f5  src/perl-ext/Test-Harness-3.22.tar.gz

Index: Makefile.install
===================================================================
RCS file: /cvsroot/devil-linux/build/Makefile.install,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.install	18 Sep 2010 22:06:50 -0000	1.15
+++ Makefile.install	28 Sep 2010 18:14:41 -0000	1.16
@@ -87,7 +87,7 @@
 GROUP_21 := Mail-SpamAssassin bluez-firmware bluez-hcidump bluez-utils ippool \
 	 lm_sensors mdadm mod_auth_kerb mod_perl module-init-tools \
 	 ntop openl2tp pam_radius poptop portslave \
-	 pptp-linux rp-pppoe sagator xmbmon modsecurity-apache
+	 pptp-linux rp-pppoe sagator xmbmon modsecurity-apache MailScanner
 
 GROUP_22 := linux net-snmp
 
@@ -718,6 +718,8 @@
 
 sagator:  | $(GROUP_20)
 
+MailScanner:  | $(GROUP_20) Mail-SpamAssassin
+
 xmbmon:  | $(GROUP_20)
 
 linux:  | $(GROUP_21)

[Devil-linux-commit] build/scripts/config VERSION,1.27,1.28

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

Update of /cvsroot/devil-linux/build/scripts/config
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28458/scripts/config

Modified Files:
	VERSION 
Log Message:
- accidentally released a RC5 version in the 'testing' folder on the FTP server 
  bumping up version number to avoid confusion and ensure upgrades will work.



Index: VERSION
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/VERSION,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- VERSION	11 Jun 2010 15:54:27 -0000	1.27
+++ VERSION	28 Sep 2010 13:11:24 -0000	1.28
@@ -1 +1 @@
-1.4RC5
+1.4RC6

[Devil-linux-commit] build CHANGES,1.1405,1.1406

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28458

Modified Files:
	CHANGES 
Log Message:
- accidentally released a RC5 version in the 'testing' folder on the FTP server 
  bumping up version number to avoid confusion and ensure upgrades will work.



Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1405
retrieving revision 1.1406
diff -u -d -r1.1405 -r1.1406
--- CHANGES	28 Sep 2010 00:23:57 -0000	1.1405
+++ CHANGES	28 Sep 2010 13:11:24 -0000	1.1406
@@ -21,6 +21,10 @@
 #
 #
 
+1.4RC6
+- accidentally released a RC5 version in the 'testing' folder on the FTP server
+  bumping up version number to avoid confusion and ensure upgrades will work.
+
 1.4RC5
 - added install-on-usb.bat for Windows machines (Dominic Raferd / HZ)
 - updated system startup "beeps" to support serial consoles (Dominic Raferd / HZ)

[Devil-linux-commit] build/scripts/scripts install-on-usb.bat, NONE, 1.1

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

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19052/scripts/scripts

Added Files:
	install-on-usb.bat 
Log Message:
added install-on-usb.bat for Windows machines (Dominic Raferd / HZ)


--- NEW FILE: install-on-usb.bat ---
@ECHO OFF
: Devil-Linux Windows USB Installer

: must be located in same folder as bootcd.iso, fart.exe, syslinux.exe

: dependencies:
:	bootcd.iso	DL CD image
: 	7z.exe		http://www.7-zip.org/
:	fart.exe	http://sourceforge.net/projects/fart-it/
:	syslinux.exe	http://www.kernel.org/pub/linux/utils/boot/syslinux/

: History:
: Rev 0.1 2010-08-13 - skip unnecessary subdirectories, check drive is big enough, optimize a little
: Rev 0.2 2010-08-18 - tested with Windows 7/2008 64-bit
:                    - improved error checking/messaging
:                    - offer options for pre-loaded default and remote login configurations
: Rev 0.3 2010-08-20 - improved disk size checking and selection
SETLOCAL ENABLEDELAYEDEXPANSION
ECHO.
ECHO %~nx0
ECHO.
ECHO This makes the first partition of a removable drive into Devil-Linux boot disk
ECHO using Devil-Linux bootcd.iso.
ECHO.
SET /P RESPONSE="Press any key to continue, or h for help or q to quit: "
ECHO.
IF /I "%RESPONSE%"=="q" GOTO :erredexit
IF /I "%RESPONSE%"=="h" GOTO :help

REM check for presence of required files
IF "%1" NEQ "" (
	SET ZIPEXE=%1\7z.exe
) ELSE (
	SET ZIPEXE=C:\PROGRA~1\7-Zip\7z.exe
	IF NOT EXIST "!ZIPEXE!" (
		SET ZIPEXE=C:\PROGRA~2\7-Zip\7z.exe
		IF NOT EXIST "!ZIPEXE!" (
			ECHO Can't locate 7z.exe, please obtain and install 7-Zip from http://www.7-zip.org>&2
			ECHO or, if already installed, provide path to 7z.exe as parameter>&2
			GOTO :erredexit
		)
	)
)
IF NOT EXIST "%~dp0fart.exe" ECHO Can't locate fart.exe, aborting...>&2 && GOTO :erredexit
IF NOT EXIST "%~dp0syslinux.exe" ECHO Can't locate syslinux.exe, aborting...>&2 && GOTO :erredexit
IF NOT EXIST "%~dp0bootcd.iso" ECHO Can't locate bootcd.iso, aborting...>&2 && GOTO :erredexit
REM set required space to bootcd.iso+8MB, at time of writing we actually need bootcd.iso+7.01MB
FOR /F "tokens=3" %%A IN ('DIR %~dp0bootcd.iso /-c^|findstr -R "bootcd.iso$"') DO SET /A REQDSIZE=%%A+8388608
SET /A REQDSIZEMB=%REQDSIZE%/1048576
REM Obtain Windows Version as number (5.0=2000, 5.1=XP, 5.2=2003, 6.0=Vista, 6.1=7/2008)
FOR /F "tokens=2* delims=[]" %%A IN ('VER') DO FOR /F "tokens=2,3 delims=. " %%B IN ("%%A") DO SET WINVER=%%B.%%C
REM Create list of logical drives and sizes
WMIC LOGICALDISK GET Name,Size>"%TEMP%\%~n0-drives.txt"
ECHO The following possible installation drives have been found:>"%TEMP%\%~n0-validdrives.txt"
SET VALID=0
REM Obtain list of removable drives
FOR %%i in (D: E: F: G: H: I: J: K: L: M: N: O: P: Q: R: S: T: U: V: W: X: Y: Z:) DO (
	fsutil fsinfo drivetype %%i>"%TEMP%\%~n0-drivetype.txt"
	REM The FSUTIL utility requires that you have administrative privileges.
	IF ERRORLEVEL 1 (
		ECHO An error occurred using FSUTIL:>&2
		TYPE "%TEMP%\%~n0-drivetype.txt">&2
		ECHO.>&2
		IF %WINVER% GEQ 6.0 (
			ECHO Note: You may need to right-click %~nx0 and>&2
			ECHO       'Run as Administrator'>&2
		) ELSE (
			ECHO Note: You need administrative privileges to run %~nx0.>&2
		)
		ECHO.>&2
		GOTO :erredexit
	)
	"%~dp0fart.exe" -q "%TEMP%\%~n0-drivetype.txt" "Removable">nul 2>&1
	IF ERRORLEVEL 1 (
		REM Block installation to the drive from which this batch file is running
		IF /I %%i NEQ %~d0 (
			SET DSIZEMB=0
			FOR /F "tokens=2" %%A IN ('TYPE "%TEMP%\%~n0-drives.txt"^|FIND /i "%%i"') DO SET /A DSIZEMB=%%A/1048576
			REM Block installation to any drive that is too small
			IF !DSIZEMB! GTR %REQDSIZEMB% (
				SET VALIDDRIVES=!VALIDDRIVES! %%i
				ECHO   %%i ^(!DSIZEMB!MB^)>>"%TEMP%\%~n0-validdrives.txt"
				SET /A VALID=!VALID!+1
			) ELSE (
				IF !DSIZE! EQU 0 (
					SET VALIDDRIVES=!VALIDDRIVES! %%i
					ECHO   %%i ^(unknown size^)>>"%TEMP%\%~n0-validdrives.txt"
					SET /A VALID=!VALID!+1
				)
			)
		) ELSE ECHO Please copy contents of %%i to a local directory and run from there>&2&&GOTO :erred
	)
)
IF "%VALIDDRIVES%"=="" (
	ECHO No Removable Drives found>&2
	ECHO Note: You may need to run %~nx0 as Administrator>&2
	ECHO Aborting>&2
	GOTO :erredexit
)
REM strip leading space
SET VALIDDRIVES=%VALIDDRIVES:~1%

REM Select installation drive
IF %VALID% EQU 1 (
	SET DRIVE=%VALIDDRIVES%
	ECHO Drive !DRIVE! autoselected as the only possible valid installation drive
	GOTO :skipselection
)
TYPE "%TEMP%\%~n0-validdrives.txt"
SET /P RESPONSE="Please enter the installation drive letter: "
IF "%RESPONSE%"=="" ECHO No drive specified, aborting&& GOTO :erredexit
REM add trailing colon if only letter entered
IF "%RESPONSE:~1,1%"=="" SET RESPONSE=%RESPONSE%:
REM fail if more than 2 chars long
IF NOT "%RESPONSE:~2%"=="" ECHO Invalid drive %RESPONSE% specified, aborting&& GOTO :erredexit
FOR %%i in (%VALIDDRIVES%) DO IF /I "%RESPONSE%"=="%%i" SET DRIVE=%%i
IF "%DRIVE%"=="" ECHO Invalid drive specified, aborting>&2 && GOTO :erredexit
ECHO   %DRIVE% selected

:skipselection
REM Get ready
REM start with a clean %TEMP%\boot directory
RMDIR /S /Q "%TEMP%\boot\" 2>nul
MKDIR "%TEMP%\boot\" 2>nul
REM extract 3 small files immediately - we need them later anyway, 
REM getting them now allows us to extract DL version
"%ZIPEXE%" e "%~dp0bootcd.iso" -o"%TEMP%\boot" DEVIL-LINUX LICENSE isolinux.cfg>nul
IF ERRORLEVEL 1 GOTO :erred
REN "%TEMP%\boot\isolinux.cfg" syslinux.cfg
IF ERRORLEVEL 1 GOTO :erred
SET /P DLVER=""<"%TEMP%\boot\DEVIL-LINUX"
ECHO.
ECHO This will make %DRIVE% into Devil-Linux %DLVER% boot disk
ECHO Please choose configuration:
ECHO   [1] Clean installation
ECHO       - best if you plan to store config on different medium or partition
ECHO   [2] Default configuration on boot partition
ECHO       - prevents warning messages upon first boot
ECHO   [3] Remote-boot configuration on boot partition.
ECHO       - allows immediate remote ssh login for user 'root' with password 'devil'
ECHO         and suitable for headless machine or remote installation
SET /P CONFIGOPT="Please enter 1,2 or 3: "
IF "%CONFIGOPT%" NEQ "1" IF "%CONFIGOPT%" NEQ "2" IF "%CONFIGOPT%" NEQ "3" (
	ECHO Invalid response, aborting...
	GOTO :erredexit
)

REM Preparatory Action
ECHO.
ECHO Extracting files
REM despite the no recurse instruction, it recurses anyway, but we won't use the subdirectories
"%ZIPEXE%" x "%~dp0bootcd.iso" -o"%TEMP%" boot -r->nul
IF ERRORLEVEL 1 GOTO :erred
REM extract default configuration
IF %CONFIGOPT% GEQ 2 "%ZIPEXE%" e "%~dp0bootcd.iso" -o"%TEMP%"\boot config\etc-mods.tar.bz2 -r->nul
IF ERRORLEVEL 1 GOTO :erred
IF %CONFIGOPT% LEQ 2 GOTO :skip_mod_config
REM create easy remote start configuration
ECHO Creating Remote-boot configuration
REM extract default configuration file
"%ZIPEXE%" e "%TEMP%\boot\etc-mods.tar.bz2" -o"%TEMP%"\boot\config * -r->nul
IF ERRORLEVEL 1 ECHO Error extracting etc-mods.tar.bz2&&GOTO :erred
REM unpack default configuration
"%ZIPEXE%" x "%TEMP%\boot\config\etc-mods.tar" -o"%TEMP%\boot\config" * -r->nul
IF ERRORLEVEL 1 ECHO Error extracting etc-mods.tar&&GOTO :erred
REM extract default shadow (password) file
"%ZIPEXE%" e "%~dp0bootcd.iso" -o"%TEMP%"\boot\config\etc-mods etc-cd\shadow -r->nul
IF ERRORLEVEL 1 ECHO Error extracting shadow&&GOTO :erred
PUSHD "%TEMP%\boot\config"
REM switch on sshd
"%~dp0fart.exe" -q -- "etc-mods\sysconfig\config" "START_SSHD=no" "START_SSHD=yes"
IF "%ERRORLEVEL%" NEQ "1" ECHO Unable to set SSHD to operate at start-up&&GOTO :erred
REM set 'devil' password
"%~dp0fart.exe" -q -- "etc-mods\shadow" "$1$JHH/CiJE$nDKJJh2hEmE8x2VePkyVP/" "$1$Jrgbm29u$TzBgorXoLccnRS23WWvq10"
IF "%ERRORLEVEL%" NEQ "1" ECHO Unable to set root password&&GOTO :erred
REM create autoselect eth0 dhcp network
MKDIR "etc-mods\sysconfig\nic\">nul
ECHO DEVICE=eth0>etc-mods\sysconfig\nic\ifcfg-eth0
ECHO ONBOOT=yes>>etc-mods\sysconfig\nic\ifcfg-eth0
ECHO MODULE="autoselect">>etc-mods\sysconfig\nic\ifcfg-eth0
ECHO DHCP=yes>>etc-mods\sysconfig\nic\ifcfg-eth0
ECHO IP=>>etc-mods\sysconfig\nic\ifcfg-eth0
ECHO NETMASK=>>etc-mods\sysconfig\nic\ifcfg-eth0
ECHO BROADCAST=>>etc-mods\sysconfig\nic\ifcfg-eth0
ECHO ROUTE=>>etc-mods\sysconfig\nic\ifcfg-eth0
REM remove CRs from files
"%~dp0fart.exe" -q -C --remove -- "etc-mods\shadow","etc-mods\sysconfig\nic\ifcfg-eth0" "\r"
IF %ERRORLEVEL% EQU 0 GOTO :erred
REM add/update files in etc-mods.tar
"%ZIPEXE%" u etc-mods.tar etc-mods\sysconfig\config etc-mods\sysconfig\nic\ifcfg-eth0 etc-mods\shadow>nul
IF ERRORLEVEL 1 GOTO :erred
REM rebuild etc-mods.tar.bz2
"%ZIPEXE%" a etc-mods.tar.bz2 etc-mods.tar>nul
IF ERRORLEVEL 1 GOTO :erred
POPD
REM move etc-mods.tar.bz2 to boot directory
MOVE /Y "%TEMP%\boot\config\etc-mods.tar.bz2" "%TEMP%\boot\"
IF ERRORLEVEL 1 GOTO :erred

:skip_mod_config
ECHO Configuring files
"%~dp0fart.exe" --remove -q -- "%TEMP%\boot\syslinux.cfg","%TEMP%\boot\message" "/boot/"
REM fart.exe uses ERRORLEVEL to report number of changes: at time of writing there are 21 file changes, but allow some latitude
IF %ERRORLEVEL% LSS 12 (SET ERRORLEVEL=1&&GOTO :erred) ELSE IF %ERRORLEVEL% GEQ 30 SET ERRORLEVEL=1&&GOTO :erred

REM Start work on the installation drive
SET /P RESPONSE="You will lose current content of %DRIVE% - are you sure? [y/n] "
IF /I "%RESPONSE%" NEQ "y" GOTO :erredexit
SET /P RESPONSE="Last chance - are you really happy to lose everything on %DRIVE%? [y/n] "
IF /I "%RESPONSE%" NEQ "y" GOTO :erredexit
ECHO Formatting %DRIVE%
ECHO y|FORMAT %DRIVE% /Q /X /FS:FAT32 /V:DEVIL-LINUX>nul
REM if formatting fails, try with FAT16
IF ERRORLEVEL 1 ECHO y|FORMAT %DRIVE% /Q /X /FS:FAT /V:DEVIL-LINUX>nul
IF ERRORLEVEL 1 ECHO Unable to format %DRIVE%&&GOTO :erred
REM check drive size
REM create dummy file so that dir reports free bytes
ECHO x>%DRIVE%\syslinux.cfg
SET DSIZE=0
FOR /F "tokens=3" %%I IN ('DIR %DRIVE%\ /-c') DO SET DSIZE=%%I
IF %DSIZE% LSS %REQDSIZE% (
	ECHO Drive %DRIVE% is not large enough, minimum size is %REQDSIZEMB%MB
	ECHO Routine aborted...
	GOTO :erredexit
)
ECHO Installing Syslinux MBR and BootSector on %DRIVE%
"%~dp0syslinux" -ma %DRIVE%
IF ERRORLEVEL 1 GOTO :erred

SET /P "dummyvar=Copying files to %DRIVE%, may take a few minutes"<nul
REM xcopy does not work to USB drive under Vista, and we don't need the subdirectories anyway
COPY "%TEMP%\boot" %DRIVE%\>nul
IF ERRORLEVEL 1 GOTO :erred
SET /P "dummyvar=."<nul
REM for ease of maintenance put usb-install files on USB too
COPY "%~dp0*usb*" %DRIVE%\>nul
IF ERRORLEVEL 1 GOTO :erred
SET /P "dummyvar=."<nul
COPY "%~dp0*.exe" %DRIVE%\>nul
IF ERRORLEVEL 1 GOTO :erred
SET /P "dummyvar=."<nul
REM put bootcd.iso file on drive, pcopy provides progress indicator
Call :Pcopy "%~dp0bootcd.iso" %DRIVE%
IF ERRORLEVEL 1 GOTO :erred
ECHO . done
RMDIR /S /Q "%TEMP%\boot"
DEL "%TEMP%\%~n0-*"
ECHO Completed successfully, %DRIVE% now contains bootable Devil-Linux %DLVER%.
PAUSE
GOTO :EOF
:Pcopy
Set Flagfile=%TEMP%.\%RANDOM%.tmp
If Exist %Flagfile% Del %Flagfile%
Start /Min Copy %* ^& Echo.^>%Flagfile% ^& Exit
REM (Set /P i=Copying %1) < NUL
:Pcopy1
If Exist %Flagfile% (Goto :EOF)
::Echo period w/o carriage return/line feed
(Set /P dummyvar=.) < NUL
::Wait c.3 secs
Ping -n 6 127.0.0.1 > NUL
Goto Pcopy1
:erred
ECHO.
ECHO Error %ERRORLEVEL% occurred, routine aborted...>&2
:erredexit
ECHO %~nx0 has ended.
PAUSE
RMDIR /S /Q "%TEMP%\boot\" 2>nul
DEL "%TEMP%\%~n0-*" 2>nul
EXIT /B 1
:help
ECHO Usage       : %~nx0 [7z.exe-location]
ECHO Dependencies: 7-Zip, syslinux.exe (32bit), fart.exe
ECHO Tested on   : Windows XP / Vista / 7 32/64-bit
ECHO.
ECHO Notes       : You are prompted before changes are committed to USB drive.
ECHO               1st or only partition of USB drive is (re)formatted, but any
ECHO                 existing 2nd partition on USB drive (e.g. holding existing DL
ECHO                 configuration) is not changed.
ECHO               7z.exe-location does not normally need to be specified.
PAUSE

[Devil-linux-commit] build/scripts build.sh,1.107,1.108

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19052/scripts

Modified Files:
	build.sh 
Log Message:
added install-on-usb.bat for Windows machines (Dominic Raferd / HZ)


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- build.sh	5 Jan 2010 19:47:39 -0000	1.107
+++ build.sh	28 Sep 2010 00:23:57 -0000	1.108
@@ -199,6 +199,7 @@
 			sort $DL_DIR/.config | uniq > $DISTDIR/DL-build-config || exit 1
 			cp $DL_DIR/scripts/scripts/custom-cd $DISTDIR || exit 1
 			cp $DL_DIR/scripts/scripts/install-on-usb $DISTDIR || exit 1
+			cp $DL_DIR/scripts/scripts/install-on-usb.bat $DISTDIR || exit 1
 			cp $WORKDIR/bootcd.iso $DISTDIR || exit 1
 			#if [ "$CONFIG_ZISOFS" = "y" ]; then
 			#	cp $CDDIR.z/config/etc.tar.bz2 $DISTDIR || exit 1

[Devil-linux-commit] build CHANGES,1.1404,1.1405

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19052

Modified Files:
	CHANGES 
Log Message:
added install-on-usb.bat for Windows machines (Dominic Raferd / HZ)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1404
retrieving revision 1.1405
diff -u -d -r1.1404 -r1.1405
--- CHANGES	27 Sep 2010 19:32:50 -0000	1.1404
+++ CHANGES	28 Sep 2010 00:23:57 -0000	1.1405
@@ -22,6 +22,7 @@
 #
 
 1.4RC5
+- added install-on-usb.bat for Windows machines (Dominic Raferd / HZ)
 - updated system startup "beeps" to support serial consoles (Dominic Raferd / HZ)
 - updated dovecot to 2.0.4
 - closed bug #86 - missing clamav support in dansguardian

[Devil-linux-commit] build/config/etc/init.d beep,1.3,1.4

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

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16672/config/etc/init.d

Modified Files:
	beep 
Log Message:
updated system startup "beeps" to support serial consoles (Dominic Raferd /
HZ)


Index: beep
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/beep,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- beep	3 Apr 2007 12:01:32 -0000	1.3
+++ beep	27 Sep 2010 19:32:50 -0000	1.4
@@ -49,13 +49,22 @@
 		echo "Starting $NAME: "
 #		loadproc $DAEMON $PARAMETER
 #		#DL =   -.. .-..
-		beep -f 880  -l 400
-		beep -f 3000 -l 200
-		beep -f 3000 -l 200 -D 600
-		beep -f 3000 -l 200
-		beep -f 880  -l 400
-		beep -f 3000 -l 200
-		beep -f 3000 -l 200
+		if [ "`tty`" = "/dev/console" ]; then
+			# for serial console, force bell sound to local machine
+			for m in {1..3}; do
+				for n in {4..1}; do
+					sleep 0.$n; echo -en "\a">/dev/tty0
+				done
+			done
+		else
+			beep -f 880  -l 400
+			beep -f 3000 -l 200
+			beep -f 3000 -l 200 -D 600
+			beep -f 3000 -l 200
+			beep -f 880  -l 400
+			beep -f 3000 -l 200
+			beep -f 3000 -l 200
+		fi
 		;;
 	stop)
 #		echo -n "Shutting down $NAME: "