From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 24 Aug 2014 11:36:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into install-raid
X-Git-Tag: v2.17-core87~103^2~51^2~38
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=3a7f46d37772c78dab734238b0e4ab16e053afde;hp=d0137fe6546208f3bf45c1a35646d742cb230db7

Merge remote-tracking branch 'origin/next' into install-raid
---

diff --git a/config/rootfiles/common/iputils b/config/rootfiles/common/iputils
index 7fb0426750..3484cbb244 100644
--- a/config/rootfiles/common/iputils
+++ b/config/rootfiles/common/iputils
@@ -1,2 +1,3 @@
 bin/ping
 usr/bin/ping
+usr/bin/tracepath
diff --git a/lfs/iputils b/lfs/iputils
index 9310c1f285..7741c0ed0d 100644
--- a/lfs/iputils
+++ b/lfs/iputils
@@ -73,8 +73,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-20020927-headers.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-20020927-rh.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-glibckernheaders.patch
-	cd $(DIR_APP) && make ping
+	cd $(DIR_APP) && make ping tracepath
 	cd $(DIR_APP) && install -m 4755 ping /usr/bin
+	cd $(DIR_APP) && install -m 0755 tracepath /usr/bin
 
 	# Some scripts expect ping in /bin/ping.
 	ln -svf ../usr/bin/ping /bin/ping
diff --git a/make.sh b/make.sh
index 49cc1d8711..7b75b87c21 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.15"							# Version number
 CORE="82"							# Core Level (Filename)
-PAKFIRE_CORE="81"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="82"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 0d80e7cd6d..c7f8b679d6 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -369,8 +369,10 @@ iptables_red_down() {
 	# while the wan interface is down - this is required to
 	# circumvent udp related NAT issues
 	# http://forum.ipfire.org/index.php?topic=11127.0
-	iptables -F REDFORWARD
-	iptables -A REDFORWARD -o $IFACE -j DROP
+	if [ -n "${IFACE}" ]; then
+		iptables -F REDFORWARD
+		iptables -A REDFORWARD -o "${IFACE}" -j DROP
+	fi
 
 	# Reload all rules.
 	/usr/local/bin/firewallctrl