Merge remote branch 'origin/next' into arm-port

Conflicts:
	config/rootfiles/common/i586/gcc
	lfs/binutils
	lfs/cleanup-toolchain
	lfs/coreutils
	lfs/gcc
	lfs/glibc
	lfs/groff
	src/pakfire/pakfire.conf
	src/patches/gcc-4.1.2-specs-1.patch

src/initscripts/init.d/network

@@ -51,6 +51,7 @@ init_networking() {
 	fi
 
 	/etc/rc.d/init.d/dnsmasq start
+	/etc/rc.d/init.d/static-routes start
 }
 
 DO="${1}"

src/initscripts/init.d/networking/red

@@ -458,7 +458,7 @@ case "${1}" in
 			PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach mtu ${MTU}"
 			PPP_STD_OPTIONS+=" mru ${MRU} noaccomp nodeflate nopcomp novj novjccomp"
 			PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
-			PPP_STD_OPTIONS+=" lcp-echo-failure 3 ${AUTH}"
+			PPP_STD_OPTIONS+=" lcp-echo-failure 5 ${AUTH}"
 				
 			### Debugging
 			#

src/initscripts/init.d/networking/red.down/10-ovpn

@@ -1,5 +1,6 @@
 #!/bin/bash
 
 /usr/local/bin/openvpnctrl -k &
+/usr/local/bin/openvpnctrl -kn2n &
 
 exit 0

src/initscripts/init.d/networking/red.up/50-ovpn

@@ -1,5 +1,6 @@
 #!/bin/bash
 
 /usr/local/bin/openvpnctrl -s > /dev/null 2>&1
+/usr/local/bin/openvpnctrl -sn2n > /dev/null 2>&1
 
 exit 0

src/initscripts/init.d/static-routes

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+
+function init_table() {
+	# Check if table does already exist. If not we add it.
+	if (ip rule | grep -q "static" >/dev/null 2>&1); then
+		return
+	fi
+
+	ip rule add table static
+}
+
+function create_all_routes() {
+	local file=${1}
+	shift
+
+	# Remote all routes.
+	ip route flush table static >/dev/null 2>&1
+
+	local status
+	local network
+	local gateway
+	local remark
+
+	# Read all routes from the configuration file and add the enabled ones
+	# immediately.
+	while IFS=, read status network gateway remark; do
+		[ "${status}" = "on" ] || continue
+
+		if [ -z "${network}" -o -z "${gateway}" ]; then
+			# Silently skipping invalid routes.
+			continue
+		fi
+
+		ip route add ${network} via ${gateway} table static proto static
+	done < ${file}
+}
+
+CONFIGFILE="/var/ipfire/main/routing"
+
+case "${1}" in
+	start)
+		boot_mesg "Adding static routes..."
+
+		# First, initialize the table
+		init_table
+
+		# Add all routes
+		create_all_routes ${CONFIGFILE}
+
+		evaluate_retval
+		;;
+
+	stop)
+		boot_mesg "Removing static routes..."
+		ip route flush table static >/dev/null 2>&1
+		evaluate_retval
+		;;
+
+	*)
+		echo "Usage: ${0} {start|stop}"
+		exit 1
+		;;
+esac