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

[Devil-linux-commit] Fwd: build/config/etc/init.d network, 1.48, 1.49

[Serge L. <ser...@gm...>]

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

Modified Files:
	network
Log Message:

- added configuration for all types of routes (closed  bug #87)
- added configuration for ip rules
- added tunnel interface configuration example
- fixed improper bradcast address assignment



Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- network	28 Aug 2010 14:39:13 -0000	1.48
+++ network	30 Aug 2010 19:59:02 -0000	1.49
@@ -129,6 +129,7 @@
 	MODULE=
 	MAC=
 	ROUTE=
+	RULE=
 	BR_IF=
 	BONDING_MASTER=
 	BONDING_SLAVES=
@@ -139,6 +140,7 @@
 	IPV6ADDR=
 	IPV6ROUTE=

+	# Wireless
 	WIRELESS=
 	ESSID=
 	NWID=
@@ -148,6 +150,12 @@
 	RATE=
 	KEY=

+	# Tunnel
+	TUNNEL=
+	LOCAL=
+	REMOTE=
+	TUN_OPTS=
+
 	#
 	# Load the variables from interface config file
 	#
@@ -164,7 +172,6 @@
 		    fi
 		fi

-
 		if [ "$WIRELESS" = "yes" ]; then
 			setup_wireless $DEVICE
 		fi
@@ -208,10 +215,22 @@

 			dhcp_client_start $DEVICE "$DHCP_OPTIONS"
 		else
-			BCAST=""; test -n "$BROADCAST" && BCAST="broadcast $BROADCAST"
+			BCAST=""; test -n "$BROADCAST" && BCAST="broadcast $BROADCAST" ||
BCAST="broadcast +"
 			NMASK=""; test -n "$NETMASK" && NMASK="/$NETMASK"

+			# Not elegant, but for code below $DEVICE sould be a tunnel name
+			if [ "$TUNNEL" = "yes" ]; then
+				if [ -n "$DEVICE" ] ; then
+					local TUN_DEVICE="dev $DEVICE"
+				fi
+				DEVICE=$IF
+			fi
+	
 			echo -n "Starting interface $DEVICE "; ret=0
+			if [ "$TUNNEL" = "yes" ]; then
+				ip tunnel add $DEVICE mode $MODE  local $LOCAL remote $REMOTE $TUN_DEVICE
$TUN_OPTS; let ret=$ret+$?
+			fi
+
 			ip link set $DEVICE up; let ret=$ret+$?
 			if [ -n "$IP" ]; then
 				# configure IPv4 address
@@ -239,56 +258,37 @@
 			evaluate_retval
 		fi

+		#
+		# Routes
+		# Add ipv4 routes
 		if [ -n "$ROUTE" ]; then
-			for route_info in ${ROUTE} ; do
-				destination=$(echo $route_info | cut -f1 -d:)
-				gateway=$(echo $route_info | cut -f2 -d:)
-				target=$(echo $destination | cut -f1 -d/)
-				netmask=$(echo $destination | cut -f2 -d/)
-
-				# filter bogus records
-				test -z "$destination" && continue
-
-				# local route?
-				if [ -z "$gateway" -o "$gateway" = "$destination" ] ; then
-					# local route (gateway is empty or equal to destination)
-					gateway=""
-					# otherewise it's a route via a gateway
-				fi
-
-				# host or network route?
-				if [ -z "$netmask" -o "$netmask" = "$target" ]; then
-					# a host route
-					CMD=host
-					netmask=""
-				else
-					# network route
-					CMD=net
-				fi
-
-				# add the route
-				if [ -z "${netmask##*.*}" ]; then
-					echo "   adding route to $CMD ${target}${netmask:+/$netmask}${gateway:+
via gateway $gateway} on $DEVICE"
-					route add -$CMD ${target} ${netmask:+netmask $netmask} ${gateway:+gw
$gateway} dev $DEVICE
-				else
-					echo "   adding route to -$CMD $destination ${gateway:+ via gateway
$gateway} on $DEVICE"
-					route add -$CMD ${destination} ${gateway:+gw $gateway} dev $DEVICE
-				fi
+			grep "^ROUTE=" ${CONFIG_DIR}/${CONFIG_FILE}$IF | while read line;
+			do
+				eval $line
+				echo "   adding route to \"$ROUTE\" on $DEVICE"
+				ip route add $ROUTE
 			done
 		fi

-		# IPv6 routing can be done with link-local addresses even without explicit
address configuration
+		# Add ipv6 routes
 		if [ -n "$IPV6ROUTE" ]; then
-			for route_info in ${IPV6ROUTE} ; do
-				destination=$(echo $route_info | cut -f1 -d\|)
-				gateway=$(echo $route_info | cut -f2 -d\|)
-
-				# filter bogus records
-				test -z "$destination" && continue
-
+			grep "^IPV6ROUTE=" ${CONFIG_DIR}/${CONFIG_FILE}$IF | while read line;
+			do
+				eval $line
 				# add the route
-				echo "   adding route to $destination ${gateway:+ via gateway $gateway} on
$DEVICE"
-				ip -f inet6 route add $destination ${gateway:+via $gateway} dev $DEVICE
+				echo "   adding route to \"$IPV6ROUTE\" on $DEVICE"
+				ip -f inet6 route add $IPV6ROUTE
+			done
+		fi
+
+		#
+		# Rules (advanced routing)
+		if [ -n "$RULE" ]; then
+			grep "^RULE=" ${CONFIG_DIR}/${CONFIG_FILE}$IF | while read line;
+			do
+				eval $line
+				echo "   adding rule \"$RULE\" on $DEVICE"
+				ip rule add $RULE
 			done
 		fi

@@ -305,6 +305,8 @@
 	DEVICE=
 	VLANID=
 	BR_IF=
+	ROUTE=
+	RULE=

 	#
 	# Load the variables from interface config file
@@ -321,6 +323,38 @@
 			DEVICE=$(get_vlan_name "$PHYDEV" "$VLANID")
 		fi

+		# Rules (advanced routing)
+		if [ -n "$RULE" ]; then
+			echo "Removing rules from interface $DEVICE"
+			grep "^RULE=" ${CONFIG_DIR}/${CONFIG_FILE}$IF | while read line;
+			do
+				eval $line
+				echo "   removing rule \"$RULE\" on $DEVICE"
+				ip rule del $RULE
+			done
+		fi
+
+		# Routes
+		if [ -n "$ROUTE" ]; then
+			echo "Removing routes from interface $DEVICE"
+			grep "^ROUTE=" ${CONFIG_DIR}/${CONFIG_FILE}$IF | while read line;
+			do
+				eval $line
+				echo "   removing route to \"$ROUTE\" on $DEVICE"
+				ip route del $ROUTE
+			done
+		fi
+
+		if [ -n "$IPV6ROUTE" ]; then
+			grep "^IPV6ROUTE=" ${CONFIG_DIR}/${CONFIG_FILE}$IF | while read line;
+			do
+				eval $line
+				# add the route
+				echo "   removing route to \"$IPV6ROUTE\" on $DEVICE"
+				ip -f inet6 route del $IPV6ROUTE
+			done
+		fi
+
 		# Bonding
 		if [ "$BONDING_MASTER" = "yes" ]; then
 		        ifenslave -d $DEVICE $BONDING_SLAVES
@@ -343,6 +377,12 @@
 				ip addr del $IP$NMASK $BCAST dev $DEVICE
 			fi
 		fi
+
+		# Not elegant, but for code below $DEVICE sould be a tunnel name
+		if [ "$TUNNEL" = "yes" ]; then
+			DEVICE=$IF
+		fi
+
 		echo -n "Stopping interface $DEVICE"
 		ip link set $DEVICE down 2>/dev/null
 		evaluate_retval
@@ -363,6 +403,13 @@
 			brctl delbr $DEVICE
 		fi

+		# tunnel
+		if [ "$TUNNEL" = "yes" ]; then
+			echo -n "Removing tunnel $DEVICE"
+			ip tunnel del $DEVICE
+			evaluate_retval
+		fi
+
 	fi
 }

@@ -431,9 +478,10 @@
 			# bring up the interface
 			setup_interface $interface
 		done
-#
-#	Bonding Master
-#
+
+		#
+		#	Bonding Master
+		#
 		for interface in $(cd ${CONFIG_DIR}; ls -1 ${CONFIG_FILE}* 2>/dev/null | sed \
 			-e '/.sample/d' -e '/~/d' -e "s|${CONFIG_FILE}||" -e '/^lo$/d' -e '/^vlan/d'
-e '/^eth/d' -ne '/^bond/p')
 		do
@@ -475,6 +523,20 @@
 			setup_interface $interface
 		done

+		#
+		# tunnel interfaces
+		#
+		for interface in $(cd ${CONFIG_DIR}; ls -1 ${CONFIG_FILE}* 2>/dev/null | sed \
+			-e '/.sample/d' -e '/~/d' -e "s|${CONFIG_FILE}||" -e '/^lo$/d' -e '/^vlan/d'
-ne '/^tun/p')
+		do
+			# did user choose to only handle just one interface
+			# this time?
+			test -n "$ONLY_INTERFACE" -a "$ONLY_INTERFACE" != "$interface" \
+				&& continue
+			# bring up the interface
+			setup_interface $interface
+		done
+
 		# in single interface mode stop now
 		test -n "$ONLY_INTERFACE" && exit

[Devil-linux-commit] build CHANGES,1.1390,1.1391

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

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

Modified Files:
	CHANGES 
Log Message:

- added configuration for all types of routes (closed  bug #87 Cannot add blackhole route ) 
- added configuration for ip rules 
- added tunnel interface configuration example 
- fixed improper broadcast address assignment



Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1390
retrieving revision 1.1391
diff -u -d -r1.1390 -r1.1391
--- CHANGES	28 Aug 2010 14:36:43 -0000	1.1390
+++ CHANGES	30 Aug 2010 20:17:39 -0000	1.1391
@@ -22,6 +22,10 @@
 #
 
 1.4RC5
+- added configuration for all types of routes (closed  bug #87 Cannot add blackhole route ) (sl)
+- added configuration for ip rules (sl)
+- added tunnel interface configuration example (sl)
+- fixed improper broadcast address assignment (sl)
 - removed the mactab feature as requested by author, since udev already provides this feature via 70-persistent-net.rules
 - closed bug #84: failing 'copy default configuration' upon clean installation (sl)
 - closed feature request #78: Imposible make same VLAN ID on many interfaces (sl)

[Devil-linux-commit] build/config/etc/init.d network,1.47,1.48

[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-serv22722/init.d

Modified Files:
	network 
Log Message:
removed the mactab feature as requested by author, since udev already
provides this feature via 70-persistent-net.rules


Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- network	22 Aug 2010 05:16:23 -0000	1.47
+++ network	28 Aug 2010 14:39:13 -0000	1.48
@@ -15,8 +15,6 @@
 #   Friedrich Lobenstock <fl...@fl...>
 #   Thomas Eder <tho...@bu...>
 #   Arnaud Gomes-do-Vale <Arn...@ir...>
-#   Roy Barnard/Steve Ralph
-#   Stefan Engel
 #
 
 ### BEGIN INIT INFO
@@ -46,9 +44,6 @@
 CONFIG_DIR=/etc/sysconfig/nic
 CONFIG_FILE=ifcfg-
 
-MACTABLE_CONF=/etc/mactable.conf
-MACTAB=/etc/mactab
-
 DHCP_CLIENT=dhcpcd
 
 dhcp_client_start () {
@@ -169,6 +164,7 @@
 		    fi
 		fi
 
+
 		if [ "$WIRELESS" = "yes" ]; then
 			setup_wireless $DEVICE
 		fi
@@ -370,40 +366,6 @@
 	fi
 }
 
-create_mactab() {
-	if [ -r $MACTABLE_CONF ]; then
-		echo "Generating MAC list for interface setup - starting"
-		maclist=`/sbin/ip link show | /bin/grep "ether" | /bin/sed "s/.*ether \([0-9a-fA-F:]*\) .*/\1/i"`
-
-		# filter mactable.conf, omit emtpy lines and comments
-		# print some warnings if necessary and prevent creating/overwriting /etc/mactab
-		# if something is missing
-		macmissing=0
-		MACTAB_TMP="$MACTAB.tmp"
-		rm -f $MACTAB_TMP
-		for maclist_mac in $maclist; do
-			entry=`/bin/egrep -v "^ *$|^#.*" $MACTABLE_CONF | grep $maclist_mac`
-			if [ -z "$entry" ]; then
-				echo -n "   Warning: MAC $maclist_mac not found in $MACTABLE_CONF"
-				print_status warning
-				let "macmissing = $macmissing + 1"
-			else
-				echo "   found MAC entry: $entry"
-				echo $entry | /bin/sed "s/\(.*\) *| *\([0-9a-fA-F:]*\) *|.*/\1 \2/" >> $MACTAB_TMP
-			fi
-		done
-		if [ $macmissing -gt 0 ]; then
-			echo "Setup of $MACTAB failed, no entries generated from $MACTABLE_CONF"
-			echo -n "Generating MAC list - finished: "
-			print_status failure
-		else
-			mv $MACTAB_TMP $MACTAB
-			echo -n "Generating MAC list - finished: "
-			print_status success
-		fi
-	fi
-}
-
 get_vlan_name () {
 local PHYDEV=$1
 local VLANID=$2
@@ -450,38 +412,10 @@
 		# if vlan tools are installed set vlan naming schema
 		#
 		if [ -z "$vlan_name_type" ]; then
-			# set default
-			vlan_name_type=VLAN_PLUS_VID_NO_PAD
-		fi
-			test -x $VLAN && $VLAN set_name_type $vlan_name_type &> /dev/null
-		#
-		# create /etc/mactab from /etc/mactable.conf (if exists)
-		#
-		create_mactab
-
-		# nameif will not work, if an interface name should be assigned to an already
-		# existing interface. E.g. if the kernel already assigned eth0 to MAC address A
-		# and eth1 to MAC B, then nameif is not able to switch eth0 to MAC B and eth1 to
-		# MAC B. To make this work, first reassign all interfaces found in /etc/mactab
-		# to something which should not interfer with the real interface names (i.e.
-		# just append 00 to the interface names found in /etc/mactab (eth0 --> eth000,
-		# eth1 -> eth100, ...)
-		if [ -r /etc/mactab ]; then
-			# move interface names out of the way to make sure nameif does not
-			# fail due to active interfaces which already exist
-			while read line
-			do
-				oldIF=`echo $line | sed -e "s/ [0-9A-F:]*//"`
-				mac=`echo $line | sed -e "s/^.* \([0-9A-F:]*$\)/\1/"`
-				newIF="${oldIF}00"
-				/sbin/nameif $newIF $mac
-			done < /etc/mactab
-
-			# after the problematic interface names are gone, just call nameif. Without any
-			# arguments, nameif reads /etc/mactab and reassigns the interface names according
-			# to the MAC addresses. (omit -s to see errors)
-			/sbin/nameif
+		    # set default
+		    vlan_name_type=VLAN_PLUS_VID_NO_PAD
 		fi
+		test -x $VLAN && $VLAN set_name_type $vlan_name_type &> /dev/null
 
 		#
 		# physical interfaces are brought up first
@@ -654,5 +588,3 @@
 	/etc/init.d/wlan $1
 fi
 
-
- 	  	 

[Devil-linux-commit] build/config/etc mactab.sample, 1.1, NONE mactable.conf.sample, 1.1, NONE

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

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

Removed Files:
	mactab.sample mactable.conf.sample 
Log Message:
removed the mactab feature as requested by author, since udev already
provides this feature via 70-persistent-net.rules


--- mactable.conf.sample DELETED ---

--- mactab.sample DELETED ---

[Devil-linux-commit] build CHANGES,1.1389,1.1390

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

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

Modified Files:
	CHANGES 
Log Message:
removed the mactab feature as requested by author, since udev already
provides this feature via 70-persistent-net.rules


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1389
retrieving revision 1.1390
diff -u -d -r1.1389 -r1.1390
--- CHANGES	22 Aug 2010 09:21:38 -0000	1.1389
+++ CHANGES	28 Aug 2010 14:36:43 -0000	1.1390
@@ -22,6 +22,7 @@
 #
 
 1.4RC5
+- removed the mactab feature as requested by author, since udev already provides this feature via 70-persistent-net.rules
 - closed bug #84: failing 'copy default configuration' upon clean installation (sl)
 - closed feature request #78: Imposible make same VLAN ID on many interfaces (sl)
 - closed feature request #85 - missing squid_ldap_group binary (sl)

[Devil-linux-commit] build/scripts/scripts save-config,1.43,1.44

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

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

Modified Files:
	save-config 
Log Message:

- term "empty media" has been replaced by "suitable media" because configuration media
may be not empty.


Index: save-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/save-config,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- save-config	22 Aug 2010 08:00:31 -0000	1.43
+++ save-config	22 Aug 2010 09:27:59 -0000	1.44
@@ -137,7 +137,7 @@
     	    			beep;
     	    			umount $CONFIG_MOUNT
     	    			$SUCCESS
-    	    			echo -e "\n*** Found empty media $CFG_SRC . ***\n"
+    	    			echo -e "\n*** Found suitable media $CFG_SRC . ***\n"
     	    			$NORMAL
     	    			echo -n "Do you want to save your configuration to this device?"
     	    			if ask_yes_no ; then
@@ -166,7 +166,7 @@
     	    			beep;
     	    			umount $CONFIG_MOUNT
     	    			$SUCCESS
-    	    			echo -e "\n*** Found empty media $CFG_SRC . ***\n"
+    	    			echo -e "\n*** Found suitable media $CFG_SRC . ***\n"
     	    			$NORMAL
     	    			echo -n "Do you want to save your configuration to this device?"
     	    			if ask_yes_no ; then

[Devil-linux-commit] build CHANGES,1.1388,1.1389

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

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

Modified Files:
	CHANGES 
Log Message:

 - closed bug #84: failing 'copy default configuration' upon clean installation


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1388
retrieving revision 1.1389
diff -u -d -r1.1388 -r1.1389
--- CHANGES	22 Aug 2010 08:00:31 -0000	1.1388
+++ CHANGES	22 Aug 2010 09:21:38 -0000	1.1389
@@ -22,7 +22,7 @@
 #
 
 1.4RC5
-- partially ("save-config -s") fixed bug #84: failing 'copy default configuration' upon clean installation (sl)
+- closed bug #84: failing 'copy default configuration' upon clean installation (sl)
 - closed feature request #78: Imposible make same VLAN ID on many interfaces (sl)
 - closed feature request #85 - missing squid_ldap_group binary (sl)
 - updated bacula to 5.0.3

[Devil-linux-commit] build/config/etc/initrd linuxrc,1.109,1.110

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

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

Modified Files:
	linuxrc 
Log Message:

 - closed bug #84: failing 'copy default configuration' upon clean installation


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- linuxrc	26 Apr 2010 20:22:22 -0000	1.109
+++ linuxrc	22 Aug 2010 09:21:39 -0000	1.110
@@ -300,7 +300,7 @@
 	# no configuration has been found yet
 	for CFG_SRC in $CONFIG_SRC_LIST
 	do
-		echo -e "Looking for empty configuation media on $CFG_SRC"
+		echo -e "Examination of $CFG_SRC"
 		if mount -n -t auto $CFG_SRC /floppy >/dev/null 2>&1 ; then
 			umount /floppy # in case user swaps floppy when we are accepting input
 			# offer to copy the configuration file if device is not a CD
@@ -308,7 +308,7 @@
 			if [ -z "$IS_CDROM" ];then
 				beep
 				$YELLOW
-				echo -e "\n*** Found empty configuration media - $CFG_SRC.  ***"
+				echo -e "\n*** Found suitable media. Configuration can be stored on $CFG_SRC ***"
 				$NORMAL
 				echo -n "Should I copy default configuration to it?"
 				if ask_yes_no ; then
@@ -323,8 +323,8 @@
 						continue
 					fi
 					reboot_if_updated
-					mount -n -t auto $CFG_SRC /floppy >/dev/null 2>&1 || continue
-					cp -i /cdrom/config/etc-mods.tar.bz2 /floppy/ || continue
+					mount -n -t auto $CFG_SRC /floppy >/dev/null 2>&1 && echo -e "$CFG_SRC has been mounted" || { echo -e "Cannot mount $CFG_SRC" ; continue ;}
+					cp -i /cdrom/config/etc-mods.tar.bz2 /floppy/ && echo -e "Default configuration has been copied to $CFG_SRC" || { echo -e "Cannot copy default configuration to $CFG_SRC" ; continue ;}
 					umount /cdrom
 					sync
 					DL_CONFIG_SOURCE=$CFG_SRC

[Devil-linux-commit] build CHANGES,1.1387,1.1388

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

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

Modified Files:
	CHANGES 
Log Message:

 partially fixed bug #84: failing 'copy default configuration' upon clean installation
 For now only "save-config -s" is fixed.


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1387
retrieving revision 1.1388
diff -u -d -r1.1387 -r1.1388
--- CHANGES	22 Aug 2010 05:16:23 -0000	1.1387
+++ CHANGES	22 Aug 2010 08:00:31 -0000	1.1388
@@ -22,6 +22,7 @@
 #
 
 1.4RC5
+- partially ("save-config -s") fixed bug #84: failing 'copy default configuration' upon clean installation (sl)
 - closed feature request #78: Imposible make same VLAN ID on many interfaces (sl)
 - closed feature request #85 - missing squid_ldap_group binary (sl)
 - updated bacula to 5.0.3

[Devil-linux-commit] build/scripts/scripts save-config,1.42,1.43

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

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

Modified Files:
	save-config 
Log Message:

 partially fixed bug #84: failing 'copy default configuration' upon clean installation
 For now only "save-config -s" is fixed.


Index: save-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/save-config,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- save-config	2 Jun 2010 07:05:30 -0000	1.42
+++ save-config	22 Aug 2010 08:00:31 -0000	1.43
@@ -86,7 +86,7 @@
 
 if [ -z "$WRITE2STDOUT" ]; then
 
-    if [ -n $DL_CONFIG_SOURCE ]; then
+    if [ -n "$DL_CONFIG_SOURCE" ]; then
     	if [ -b $DL_CONFIG_SOURCE ]; then
     		if [ -z "$QUIET" ]; then
     		    $GREEN
@@ -103,80 +103,79 @@
     else
 
         # generate the device list we need to search for the configuration information
-        PARTITIONS_IDE=`find /dev/ide/ -name "part*" 2> /dev/null`
-        PARTITIONS_SCSI=`find /dev/scsi/ -name "part*" 2> /dev/null`
+        PARTITIONS=`for i in /dev/disk/by-path/*-part* ; do echo "/dev/"$(basename $(readlink $i)) ; done`
         FLOPPIES=`find /dev/floppy/ -name "?" 2> /dev/null`
-        CONFIG_SRC_LIST="$PARTITIONS_SCSI $PARTITIONS_IDE $FLOPPIES"
+        CONFIG_SRC_LIST="$PARTITIONS $FLOPPIES"
 
        $GREEN
        echo -e "searching for configuration media"
        $NORMAL
 
-        until [ -e "$CONFIG_MOUNT/$DL_CONFIG_FILE" ] ;
+        until [ -n "$DL_CONFIG_SOURCE" ] ;
         do
-    	for CFG_SRC in $CONFIG_SRC_LIST
-    	do
-    		echo -e "Checking $CFG_SRC"
-    		if mount -n -o ro,noatime -t auto $CFG_SRC $CONFIG_MOUNT > /dev/null 2>&1  ; then
+    	    for CFG_SRC in $CONFIG_SRC_LIST
+    	    do
+    	    	echo -e "Checking $CFG_SRC"
+    	    	if mount -n -o ro,noatime -t auto $CFG_SRC $CONFIG_MOUNT > /dev/null 2>&1  ; then
 
-    			if [ -e "$CONFIG_MOUNT/$DL_CONFIG_FILE" ] ; then
-    				umount $CONFIG_MOUNT
-    				$SUCCESS
-    				echo -e "Found configuration on $CFG_SRC"
-    				$NORMAL
-    				if [ -z "$QUIET" ]; then
-    					echo -n "Do you want to use this device?"
-    					if ask_yes_no ; then
-    						DL_CONFIG_SOURCE=$CFG_SRC
-    						continue 2
-    					fi
-    				else
-    					DL_CONFIG_SOURCE=$CFG_SRC
-    					continue 2
-    				fi
-    			else
-    				beep;
-    				umount $CONFIG_MOUNT
-    				$SUCCESS
-    				echo -e "\n*** Found empty media $CFG_SRC . ***\n"
-    				$NORMAL
-    				echo -n "Do you want to save your configuration to this device?"
-    				if ask_yes_no ; then
-    					DL_CONFIG_SOURCE=$CFG_SRC
-    					continue 2
-    				fi
-    			fi
-    		elif  mount -n -o ro,noatime -t $FS_TYPE $CFG_SRC $CONFIG_MOUNT > /dev/null 2>&1 ; then
+    	    		if [ -e "$CONFIG_MOUNT/$DL_CONFIG_FILE" ] ; then
+    	    			umount $CONFIG_MOUNT
+    	    			$SUCCESS
+    	    			echo -e "Found configuration on $CFG_SRC"
+    	    			$NORMAL
+    	    			if [ -z "$QUIET" ]; then
+    	    				echo -n "Do you want to use this device?"
+    	    				if ask_yes_no ; then
+    	    					DL_CONFIG_SOURCE=$CFG_SRC
+    	    					continue 2
+    	    				fi
+    	    			else
+    	    				DL_CONFIG_SOURCE=$CFG_SRC
+    	    				continue 2
+    	    			fi
+    	    		else
+    	    			beep;
+    	    			umount $CONFIG_MOUNT
+    	    			$SUCCESS
+    	    			echo -e "\n*** Found empty media $CFG_SRC . ***\n"
+    	    			$NORMAL
+    	    			echo -n "Do you want to save your configuration to this device?"
+    	    			if ask_yes_no ; then
+    	    				DL_CONFIG_SOURCE=$CFG_SRC
+    	    				continue 2
+    	    			fi
+    	    		fi
+    	    	elif  mount -n -o ro,noatime -t $FS_TYPE $CFG_SRC $CONFIG_MOUNT > /dev/null 2>&1 ; then
 
-    			if [ -e "$CONFIG_MOUNT/$DL_CONFIG_FILE" ] ; then
-    				umount $CONFIG_MOUNT
-    				$SUCCESS
-    				echo -e "Found configuration on $CFG_SRC"
-    				$NORMAL
-    				if [ -z "$QUIET" ]; then
-    					echo -n "Do you want to use this device?"
-    					if ask_yes_no ; then
-    						DL_CONFIG_SOURCE=$CFG_SRC
-    						continue 2
-    					fi
-    				else
-    					DL_CONFIG_SOURCE=$CFG_SRC
-    					continue 2
-    				fi
-    			else
-    				beep;
-    				umount $CONFIG_MOUNT
-    				$SUCCESS
-    				echo -e "\n*** Found empty media $CFG_SRC . ***\n"
-    				$NORMAL
-    				echo -n "Do you want to save your configuration to this device?"
-    				if ask_yes_no ; then
-    					DL_CONFIG_SOURCE=$CFG_SRC
-    					continue 2
-    				fi
-    			fi
-    		fi
-    	done
+    	    		if [ -e "$CONFIG_MOUNT/$DL_CONFIG_FILE" ] ; then
+    	    			umount $CONFIG_MOUNT
+    	    			$SUCCESS
+    	    			echo -e "Found configuration on $CFG_SRC"
+    	    			$NORMAL
+    	    			if [ -z "$QUIET" ]; then
+    	    				echo -n "Do you want to use this device?"
+    	    				if ask_yes_no ; then
+    	    					DL_CONFIG_SOURCE=$CFG_SRC
+    	    					continue 2
+    	    				fi
+    	    			else
+    	    				DL_CONFIG_SOURCE=$CFG_SRC
+    	    				continue 2
+    	    			fi
+    	    		else
+    	    			beep;
+    	    			umount $CONFIG_MOUNT
+    	    			$SUCCESS
+    	    			echo -e "\n*** Found empty media $CFG_SRC . ***\n"
+    	    			$NORMAL
+    	    			echo -n "Do you want to save your configuration to this device?"
+    	    			if ask_yes_no ; then
+    	    				DL_CONFIG_SOURCE=$CFG_SRC
+    	    				continue 2
+    	    			fi
+    	    		fi
+    	    	fi
+    	    done
     	beep; sleep 1; beep; sleep 1; beep;
     	$ERROR
     	echo -e "Please insert Configuration Media and press 'ENTER'"
@@ -202,7 +201,7 @@
     		else
     			# why should we require it exist? If the user
     			# wants it elsewhere let them say so.
-    			# maybe the wanted to make a copy of a tesy config
+    			# maybe the wanted to make a copy of a test config
     			# on a new diskette?
     			$YELLOW
     			echo "Creating new file on device..."
@@ -330,20 +329,23 @@
     	$NORMAL
     else
         if [ $error -eq 0 ]; then
-    	chmod 0600 $CONFIG_MOUNT/$DL_CONFIG_FILE
-    	$SUCCESS
-    	echo "Configuration saved"
-    	$NORMAL
+    	    chmod 0600 $CONFIG_MOUNT/$DL_CONFIG_FILE
+    	    $SUCCESS
+    	    echo "Configuration saved"
+    	    $NORMAL
 
-    	# run user specfic script after successful save
-    	# useful for backing up the config elsewhere
-    	# Pass device and file name just saved
-    	[ -x /root/bin/post-save-config ] && /root/bin/post-save-config $DL_CONFIG_SOURCE $CONFIG_MOUNT $DL_CONFIG_FILE
+	    # Update /shm/DL_CONFIG_SOURCE
+	    echo "$DL_CONFIG_SOURCE" > /shm/DL_CONFIG_SOURCE
+
+    	    # run user specfic script after successful save
+    	    # useful for backing up the config elsewhere
+    	    # Pass device and file name just saved
+    	    [ -x /root/bin/post-save-config ] && /root/bin/post-save-config $DL_CONFIG_SOURCE $CONFIG_MOUNT $DL_CONFIG_FILE
         else
-    	$RED
-    	beep
-    	echo "failed to save configuration"
-    	$NORMAL
+    	    $RED
+    	    beep
+    	    echo "failed to save configuration"
+    	    $NORMAL
         fi
     fi
 

[Devil-linux-commit] build/config/etc/init.d network,1.46,1.47

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

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

Modified Files:
	network 
Log Message:

- closed feature request #78: Imposible make same VLAN ID on many interfaces 



Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- network	5 Aug 2010 12:28:47 -0000	1.46
+++ network	22 Aug 2010 05:16:23 -0000	1.47
@@ -180,7 +180,7 @@
 			$VLAN add $DEVICE $VLANID > /dev/null
 			evaluate_retval
 			PHYDEV=$DEVICE
-			DEVICE="vlan$VLANID"
+			DEVICE=$(get_vlan_name "$PHYDEV" "$VLANID")
 		fi
 
 		# bridge
@@ -215,7 +215,7 @@
 			BCAST=""; test -n "$BROADCAST" && BCAST="broadcast $BROADCAST"
 			NMASK=""; test -n "$NETMASK" && NMASK="/$NETMASK"
 
-			echo -n "Starting interface $DEVICE"; ret=0
+			echo -n "Starting interface $DEVICE "; ret=0
 			ip link set $DEVICE up; let ret=$ret+$?
 			if [ -n "$IP" ]; then
 				# configure IPv4 address
@@ -322,7 +322,7 @@
 	if [ "$ONBOOT" = "yes" -o "$ONLY_INTERFACE" = "$IF" ]; then
 		if test -n "$VLANID" -a "$VLANID" -gt 0 -a "$VLANID" -lt 4095 2>/dev/null; then
 			PHYDEV=$DEVICE
-			DEVICE="vlan$VLANID"
+			DEVICE=$(get_vlan_name "$PHYDEV" "$VLANID")
 		fi
 
 		# Bonding
@@ -354,7 +354,7 @@
 		# vlan-id's 0 and 4095 are reserved
 		if test -n "$VLANID" -a "$VLANID" -gt 0 -a "$VLANID" -lt 4095 2>/dev/null; then
 			echo -n "Removing vlan #$VLANID from physical interface $PHYDEV"
-			$VLAN rem vlan$VLANID > /dev/null
+			$VLAN rem $DEVICE > /dev/null
 			evaluate_retval
 		fi
 
@@ -404,6 +404,42 @@
 	fi
 }
 
+get_vlan_name () {
+local PHYDEV=$1
+local VLANID=$2
+
+local padding="0000"
+
+#name-type:  VLAN_PLUS_VID (vlan0005), VLAN_PLUS_VID_NO_PAD (vlan5),
+#            DEV_PLUS_VID (eth0.0005), DEV_PLUS_VID_NO_PAD (eth0.5)
+
+case "$vlan_name_type" in 
+
+	VLAN_PLUS_VID)
+		echo "vlan${padding:${#VLANID}}$VLANID"
+	;;
+
+	VLAN_PLUS_VID_NO_PAD)
+		echo "vlan$VLANID"
+	;;
+
+	DEV_PLUS_VID)
+		echo "$PHYDEV.${padding:${#VLANID}}$VLANID"
+	;;
+
+	DEV_PLUS_VID_NO_PAD)
+		echo "$PHYDEV.$VLANID"
+	;;
+
+	* )
+		echo "vlan$VLANID"
+	;;
+
+esac
+
+}
+
+
 # optional paramter which interface to touch
 ONLY_INTERFACE=$2
 
@@ -411,9 +447,13 @@
 	start)
 
 		#
-		# if vlan tools are installed set vlan naming shema
+		# if vlan tools are installed set vlan naming schema
 		#
-		test -x $VLAN && $VLAN set_name_type VLAN_PLUS_VID_NO_PAD &> /dev/null
+		if [ -z "$vlan_name_type" ]; then
+			# set default
+			vlan_name_type=VLAN_PLUS_VID_NO_PAD
+		fi
+			test -x $VLAN && $VLAN set_name_type $vlan_name_type &> /dev/null
 		#
 		# create /etc/mactab from /etc/mactable.conf (if exists)
 		#

[Devil-linux-commit] build CHANGES,1.1386,1.1387

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

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

Modified Files:
	CHANGES 
Log Message:

- closed feature request #78: Imposible make same VLAN ID on many interfaces 



Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1386
retrieving revision 1.1387
diff -u -d -r1.1386 -r1.1387
--- CHANGES	18 Aug 2010 04:26:45 -0000	1.1386
+++ CHANGES	22 Aug 2010 05:16:23 -0000	1.1387
@@ -22,6 +22,7 @@
 #
 
 1.4RC5
+- closed feature request #78: Imposible make same VLAN ID on many interfaces (sl)
 - closed feature request #85 - missing squid_ldap_group binary (sl)
 - updated bacula to 5.0.3
 - disabled mprotect for all clamav binaries and libraries in order to support bytecode and prevent segfaults

[Devil-linux-commit] build/config/etc/sysconfig/network config, NONE, 1.1

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

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

Added Files:
	config 
Log Message:

- closed feature request #78: Imposible make same VLAN ID on many interfaces 



--- NEW FILE: config ---
# VLAN name-type:	VLAN_PLUS_VID (vlan0005), VLAN_PLUS_VID_NO_PAD (vlan5),
#			 DEV_PLUS_VID (eth0.0005), DEV_PLUS_VID_NO_PAD (eth0.5)

vlan_name_type=VLAN_PLUS_VID_NO_PAD

[Devil-linux-commit] build/scripts bonnie++,1.4,1.5

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

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

Modified Files:
	bonnie++ 
Log Message:

- cosmetic fix


Index: bonnie++
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/bonnie++,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bonnie++	6 Jan 2010 14:53:27 -0000	1.4
+++ bonnie++	18 Aug 2010 04:54:19 -0000	1.5
@@ -14,8 +14,6 @@
 # source functions and config
 source $MYDIR/settings
 
-MYNAME=AIDE
-
 case $1 in
 	build )
 		if [ "$CONFIG_BONNIEPP" = "y" ]; then

[Devil-linux-commit] build/scripts squid,1.31,1.32

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

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

Modified Files:
	squid 
Log Message:

oops. unnecessary patch was removed


Index: squid
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squid,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- squid	18 Aug 2010 04:26:45 -0000	1.31
+++ squid	18 Aug 2010 04:30:51 -0000	1.32
@@ -26,7 +26,6 @@
 			pushd helpers/basic_auth/YP/ > /dev/null
 			bzcat $SRCDIR/yp_auth.patch.bz2 | patch || exit 1
 			popd > /dev/null
-			patch -Np1 -i $SRCDIR/squid-3.0-with_new_linux_headers_capability.patch || exit 1
 			touch .patches.done
 		fi
 		if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then

[Devil-linux-commit] build CHANGES,1.1385,1.1386

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

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

Modified Files:
	CHANGES 
Log Message:

- added "--enable-external-acl-helpers" (closed feature request #85)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1385
retrieving revision 1.1386
diff -u -d -r1.1385 -r1.1386
--- CHANGES	8 Aug 2010 23:42:32 -0000	1.1385
+++ CHANGES	18 Aug 2010 04:26:45 -0000	1.1386
@@ -22,6 +22,7 @@
 #
 
 1.4RC5
+- closed feature request #85 - missing squid_ldap_group binary (sl)
 - updated bacula to 5.0.3
 - disabled mprotect for all clamav binaries and libraries in order to support bytecode and prevent segfaults
 - disabled mprotect for python binary in order for sagator+clamav to work

[Devil-linux-commit] build/scripts squid,1.30,1.31

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

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

Modified Files:
	squid 
Log Message:

- added "--enable-external-acl-helpers" (closed feature request #85)


Index: squid
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squid,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- squid	6 Jan 2010 15:27:21 -0000	1.30
+++ squid	18 Aug 2010 04:26:45 -0000	1.31
@@ -17,18 +17,21 @@
 MYNAME=SQUID
 AUTH_HELPERS="MSNT NCSA PAM SMB YP getpwnam multi-domain-NTLM"
 AUTH_HELPERS_NTLM="SMB"
+EXTERNAL_HELPERS="ip_user session unix_group wbinfo_group"
 
 case $1 in
     build )
 	if [ "$CONFIG_SQUID" = "y" ]; then
 		if [ ! -f .patches.done ]; then
 			pushd helpers/basic_auth/YP/ > /dev/null
-			bzcat $DL_DIR/src/yp_auth.patch.bz2 | patch || exit 1
+			bzcat $SRCDIR/yp_auth.patch.bz2 | patch || exit 1
 			popd > /dev/null
+			patch -Np1 -i $SRCDIR/squid-3.0-with_new_linux_headers_capability.patch || exit 1
 			touch .patches.done
 		fi
 		if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
 			AUTH_HELPERS="${AUTH_HELPERS} LDAP"
+			EXTERNAL_HELPERS="$EXTERNAL_HELPERS ldap_group"
 		fi
 			
 		if [ "$CONFIG_NET_SNMP" = "y" ]; then
@@ -41,7 +44,7 @@
 			--datadir=/usr/share/squid --localstatedir=/var/squid --sharedstatedir=/var/squid \
 			--enable-delay-pools --enable-useragent-log --enable-referer-log --enable-arp-acl \
 			--enable-ssl --with-openssl --enable-htcp --enable-linux-netfilter \
-			--enable-basic-auth-helpers="$AUTH_HELPERS" $ENABLE_SNMP \
+			--enable-basic-auth-helpers="$AUTH_HELPERS" --enable-external-acl-helpers="$EXTERNAL_HELPERS" $ENABLE_SNMP \
 			--enable-auth="basic ntlm" --enable-ntlm-auth-helpers="$AUTH_HELPERS_NTLM"  \
 			--enable-default-err-language=English --enable-err-languages="English" || exit 1
 		make $PMAKE all || exit 1

[Devil-linux-commit] build/scripts zlib,1.14,1.15

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

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

Modified Files:
	zlib 
Log Message:
new zlib doesn't like parallel builds


Index: zlib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/zlib,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- zlib	6 Jan 2010 15:20:24 -0000	1.14
+++ zlib	9 Aug 2010 11:47:00 -0000	1.15
@@ -25,7 +25,7 @@
 	#	touch devil-linux-zlib-patches.done
 	#fi
 	./configure --prefix=/usr --shared || exit 1
-        make $PMAKE all || exit 1
+        make -j1 all || exit 1
         strip_debug
 	
     	# we have to install this immediately, because this is a library and could be needed by other sources

[Devil-linux-commit] build CHANGES, 1.1384, 1.1385 md5sum.lst, 1.585, 1.586

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

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

Modified Files:
	CHANGES md5sum.lst 
Log Message:
- updated bacula to 5.0.3
- disabled mprotect for all clamav binaries and libraries in order to support bytecode and prevent segfaults
- disabled mprotect for python binary in order for sagator+clamav to work


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1384
retrieving revision 1.1385
diff -u -d -r1.1384 -r1.1385
--- CHANGES	5 Aug 2010 17:53:46 -0000	1.1384
+++ CHANGES	8 Aug 2010 23:42:32 -0000	1.1385
@@ -22,6 +22,9 @@
 #
 
 1.4RC5
+- updated bacula to 5.0.3
+- disabled mprotect for all clamav binaries and libraries in order to support bytecode and prevent segfaults
+- disabled mprotect for python binary in order for sagator+clamav to work
 - updated LVM to 2.2.02.72
 - updated dcc to 1.3.130
 - updated dovecot to 1.2.13

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -d -r1.585 -r1.586
--- md5sum.lst	5 Aug 2010 17:53:46 -0000	1.585
+++ md5sum.lst	8 Aug 2010 23:42:32 -0000	1.586
@@ -33,7 +33,7 @@
 a6de1cc6434cd64038b0a0ae4e252b33  src/autoconf-2.65.tar.bz2
 1498208ab1c8393dcbd9afb7d06df6d5  src/automake-1.10.2.tar.bz2
 26a5b19fa9f395e9e7dafed37b795d7f  src/awstats-6.95.tar.gz
-e9204d2e772f12662de28da3327853de  src/bacula-5.0.2.tar.gz
+9de254ae39cab0587fdb2f5d8d90b03b  src/bacula-5.0.3.tar.gz
 73a0def16eb15e56c57491ac232abcf3  src/bash-3.2-arc4random-1.patch.bz2
 338dcf975a93640bb3eaa843ca42e3f8  src/bash-3.2.48.tar.gz
 d541419fd7e5642952d7b48cbb40c712  src/beep-1.2.2.tar.gz

[Devil-linux-commit] build/scripts Python, 1.27, 1.28 clamav, 1.22, 1.23

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

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

Modified Files:
	Python clamav 
Log Message:
- updated bacula to 5.0.3
- disabled mprotect for all clamav binaries and libraries in order to support bytecode and prevent segfaults
- disabled mprotect for python binary in order for sagator+clamav to work


Index: Python
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Python,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Python	31 Jan 2010 15:38:07 -0000	1.27
+++ Python	8 Aug 2010 23:42:33 -0000	1.28
@@ -45,6 +45,8 @@
 	    find $WORKDIR/Python-install/usr/ -name *.pyc | xargs rm
 	    find $WORKDIR/Python-install/usr/ -name *.pyo | xargs rm
             copy_files $WORKDIR/Python-install/usr $CDDIR || exit 1
+            # otherwise sagator won't work with the new clamav
+            paxctl -m $CDDIR/usr/bin/python
 	fi
     	;;
 

Index: clamav
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/clamav,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- clamav	6 Jan 2010 14:53:27 -0000	1.22
+++ clamav	8 Aug 2010 23:42:33 -0000	1.23
@@ -29,6 +29,7 @@
 		    CONFIG_EXTRA="$CONFIG_EXTRA --enable-milter"
 		fi
 		./configure --prefix=/usr --sysconfdir=/etc --disable-clamav --with-dbdir=/var/lib/clamav $CONFIG_EXTRA || exit 1
+		# --disable-llvm 
 		make $PMAKE all || exit 1
 		strip_debug
 
@@ -42,6 +43,13 @@
 		rm -rf $TMPDIR || exit 1
 		mkdir -p $TMPDIR/usr/sbin || exit 1
 		make install DESTDIR=$TMPDIR || exit 1
+		
+		rm -rf $TMPDIR/usr/include || exit 1
+		rm -rf $TMPDIR/usr/lib/*a || exit 1
+		
+		paxctl -m $TMPDIR/usr/lib/*
+		paxctl -m $TMPDIR/usr/bin/*
+		paxctl -m $TMPDIR/usr/sbin/*
 
 		copy_docs $TMPDIR
 
@@ -49,8 +57,6 @@
 
 		useradd -u 45 -s /bin/false -g vscan clamav || exit 1
 
-		rm -rf $TMPDIR/usr/include || exit 1
-		rm -rf $TMPDIR/usr/lib/*a || exit 1
 		copy_files $TMPDIR/usr $CDDIR/ || exit 1
 		mkdir -p $CDDIR/var/lib/clamav || exit 1
 		chmod -R 700 $CDDIR/var/lib/clamav || exit 1

[Devil-linux-commit] build CHANGES,1.1382,1.1383

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

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

Modified Files:
	CHANGES 
Log Message:
give credit


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1382
retrieving revision 1.1383
diff -u -d -r1.1382 -r1.1383
--- CHANGES	5 Aug 2010 12:28:46 -0000	1.1382
+++ CHANGES	5 Aug 2010 12:31:48 -0000	1.1383
@@ -22,7 +22,7 @@
 #
 
 1.4RC5
-- closed bug #82 - /etc/mactab not working correctly when reassigning interface names
+- closed bug #82 - /etc/mactab not working correctly when reassigning interface names (Stefan Engel / hz)
 - closed bug #81 - install-on-usb bug fix and minor improvements (2) (Dominic Raferd / hz)
 - updated gradm to 2.2.0-201007022023
 - updated grsecurity to 2.2.0-2.6.32.16-201007112149

[Devil-linux-commit] build/config/etc/init.d network,1.45,1.46

[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-serv12834/config/etc/init.d

Modified Files:
	network 
Log Message:
closed bug #82 - /etc/mactab not working correctly when reassigning
interface names


Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- network	5 Jun 2010 13:00:52 -0000	1.45
+++ network	5 Aug 2010 12:28:47 -0000	1.46
@@ -168,13 +168,6 @@
 				modprobe $MODULE $MODULE_OPTS > /dev/null
 		    fi
 		fi
-		# Use /etc/mactab
-		if [ -r /etc/mactab ]; then
-			if [ `expr index "$IF" ":-_."` == 0 ]; then
-				UseIFMac=`/bin/grep --ignore-case "^$IF" /etc/mactab`
-				/sbin/nameif -s $UseIFMac
-			fi
-		fi
 
 		if [ "$WIRELESS" = "yes" ]; then
 			setup_wireless $DEVICE
@@ -426,6 +419,30 @@
 		#
 		create_mactab
 
+		# nameif will not work, if an interface name should be assigned to an already
+		# existing interface. E.g. if the kernel already assigned eth0 to MAC address A
+		# and eth1 to MAC B, then nameif is not able to switch eth0 to MAC B and eth1 to
+		# MAC B. To make this work, first reassign all interfaces found in /etc/mactab
+		# to something which should not interfer with the real interface names (i.e.
+		# just append 00 to the interface names found in /etc/mactab (eth0 --> eth000,
+		# eth1 -> eth100, ...)
+		if [ -r /etc/mactab ]; then
+			# move interface names out of the way to make sure nameif does not
+			# fail due to active interfaces which already exist
+			while read line
+			do
+				oldIF=`echo $line | sed -e "s/ [0-9A-F:]*//"`
+				mac=`echo $line | sed -e "s/^.* \([0-9A-F:]*$\)/\1/"`
+				newIF="${oldIF}00"
+				/sbin/nameif $newIF $mac
+			done < /etc/mactab
+
+			# after the problematic interface names are gone, just call nameif. Without any
+			# arguments, nameif reads /etc/mactab and reassigns the interface names according
+			# to the MAC addresses. (omit -s to see errors)
+			/sbin/nameif
+		fi
+
 		#
 		# physical interfaces are brought up first
 		#

[Devil-linux-commit] build CHANGES,1.1381,1.1382

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

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

Modified Files:
	CHANGES 
Log Message:
closed bug #82 - /etc/mactab not working correctly when reassigning
interface names


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1381
retrieving revision 1.1382
diff -u -d -r1.1381 -r1.1382
--- CHANGES	24 Jul 2010 12:37:46 -0000	1.1381
+++ CHANGES	5 Aug 2010 12:28:46 -0000	1.1382
@@ -22,6 +22,7 @@
 #
 
 1.4RC5
+- closed bug #82 - /etc/mactab not working correctly when reassigning interface names
 - closed bug #81 - install-on-usb bug fix and minor improvements (2) (Dominic Raferd / hz)
 - updated gradm to 2.2.0-201007022023
 - updated grsecurity to 2.2.0-2.6.32.16-201007112149

[Devil-linux-commit] build CHANGES,1.1380,1.1381

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

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

Modified Files:
	CHANGES 
Log Message:
- closed bug #81 - install-on-usb bug fix and minor improvements (2) (Dominic Raferd / hz)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1380
retrieving revision 1.1381
diff -u -d -r1.1380 -r1.1381
--- CHANGES	13 Jul 2010 11:26:59 -0000	1.1380
+++ CHANGES	24 Jul 2010 12:37:46 -0000	1.1381
@@ -22,6 +22,7 @@
 #
 
 1.4RC5
+- closed bug #81 - install-on-usb bug fix and minor improvements (2) (Dominic Raferd / hz)
 - updated gradm to 2.2.0-201007022023
 - updated grsecurity to 2.2.0-2.6.32.16-201007112149
 - updated kernel to 2.6.32.16

[Devil-linux-commit] build/scripts/scripts install-on-usb, 1.34, 1.35

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

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

Modified Files:
	install-on-usb 
Log Message:
- closed bug #81 - install-on-usb bug fix and minor improvements (2) (Dominic Raferd / hz)


Index: install-on-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- install-on-usb	4 Jul 2010 13:01:49 -0000	1.34
+++ install-on-usb	24 Jul 2010 12:37:47 -0000	1.35
@@ -10,14 +10,16 @@
 #
 #
 
-
+THIS=`basename $0`;echo -e \\n$THIS\\n${THIS//?/=}\\n
+COLUMNS=$(stty size 2>/dev/null||echo 80); COLUMNS=${COLUMNS##* }
+[ "$OSTYPE" = "cygwin" ] && { echo "Sorry, $THIS can't run under $OSTYPE, aborting..."; exit 1; }
 TMPDIR="$(pwd)/tmp-install2usb"
 
 # You should set $EDITOR or make an editor soft link if you don't like these choices
-[ -z "$EDITOR" ] && EDITOR=`which editor`
-[ -z "$EDITOR" ] && EDITOR=`which nano`
-[ -z "$EDITOR" ] && EDITOR=`which vim`
-[ -z "$EDITOR" ] && EDITOR=`which vi`
+[ -z "$EDITOR" ] && EDITOR=`which editor 2>&-`
+[ -z "$EDITOR" ] && EDITOR=`which nano 2>&-`
+[ -z "$EDITOR" ] && EDITOR=`which vim 2>&-`
+[ -z "$EDITOR" ] && EDITOR=`which vi 2>&-`
 [ -z "$EDITOR" ] && { echo "Unable to find any text editor, you won't be able to customize your menus.";
 		      echo "To fix this, set EDITOR to your favorite."; }
 
@@ -253,9 +255,9 @@
 	mkdir -p $TMPDIR/etc-for-mods || return 1
 
 	DLISO_DEFAULT="bootcd.iso"
-	if [ -f bootcd.iso ]; then DLISO_DEFAULT_TEXT="[default: $DLISO_DEFAULT]"; fi
+	if [ -f bootcd.iso ]; then DLISO_DEFAULT_TEXT=" [default: $DLISO_DEFAULT]"; fi
 	echo
-	read -p "Enter DL source (DL image file $DLISO_DEFAULT_TEXT or CD device) -> " DLISO
+	read -p "Enter DL source (DL image file$DLISO_DEFAULT_TEXT or CD device) -> " DLISO
 	if [ "$DLISO" = "" ]; then DLISO=$DLISO_DEFAULT; echo " Using image file $DLISO"; fi
 
 	if [ -L "$DLISO" ]; then
@@ -271,7 +273,7 @@
 		mount -t iso9660 -o ro $DLISO $TMPDIR/iso-mnt || return 1
 		IMAGE="bootcd.iso"
 	else
-		mount -o loop,ro -t auto $DLISO $TMPDIR/iso-mnt || return 1
+		mount -o loop,ro $DLISO $TMPDIR/iso-mnt || return 1
 
 		IMAGEFS="$(cat /proc/mounts | grep 'install2usb/iso-mnt' | cut -f3 -d' ')"
 		if [ "x$IMAGEFS" = "xsquashfs" ]; then
@@ -297,13 +299,21 @@
 
 	echo "The following devices have been found:"
 	fdisk -l 2>&-|grep -Eo "^Disk /.*B"
-	DL_DEVICE=`cat /shm/DL_DEVICE`
-	DL_DEVICE=${DL_DEVICE:0:$((${#DL_DEVICE}-1))}
-	echo -e "\nCurrent DL installation device: $DL_DEVICE\n"
+	if [ -f /shm/DL_DEVICE ]; then
+		DL_DEVICE=`cat /shm/DL_DEVICE`
+		DL_DEVICE=${DL_DEVICE:0:$((${#DL_DEVICE}-1))}
+		echo -e "\nCurrent DL installation device: $DL_DEVICE\n"
+	fi
 	read -p "Enter DEVICE name of disk device for installation (e.g. /dev/sda) -> " DEVICE
 	[ "$DEVICE" = "" ] && { echo "No installation disk device specified"; return 1; }
 	[ "$DEVICE" = "$DL_DEVICE" ] && { echo "You cannot install new DL on current installation device $DL_DEVICE"; return 1; }
-	[ "$FDISK" = "cfdisk" ] && $FDISK -Ps $DEVICE
+	if [ "$FDISK" = "cfdisk" ]; then
+		$FDISK -Ps $DEVICE 2>/dev/null
+		if [ "$?" -gt 0 ]; then
+			FDISK=fdisk
+		 	echo "There was a problem using cfdisk, will use fdisk instead."
+		fi
+	fi
 	[ "$FDISK" = "fdisk" ] && $FDISK -l $DEVICE
 
 	echo
@@ -314,7 +324,7 @@
 	fi
 
 	echo
-	echo "If you wish to store the ISO and configuration on the same media, two partitions are recommended."
+	echo "To store ISO & configuration on the same media, two partitions are recommended."
 	echo -n "Do you want to partition the media first? "
 	ask_yes_no && $FDISK $DEVICE
 	
@@ -338,6 +348,10 @@
 		echo " Cannot find device:  $DEVICE"
 		return 1
 	fi
+	if [ "`grep -c ^"$PARTITION" /etc/mtab`" -gt 0 ]; then
+		echo " $PARTITION is already mounted. Please umount and try again."
+		return 1
+	fi
 
 	echo