Merge remote-tracking branch 'origin/next' into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Aug 2014 11:36:39 +0000 (13:36 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Aug 2014 11:36:39 +0000 (13:36 +0200)
config/rootfiles/common/iputils
lfs/iputils
make.sh
src/initscripts/init.d/firewall

index 7fb0426..3484cbb 100644 (file)
@@ -1,2 +1,3 @@
 bin/ping
 usr/bin/ping
+usr/bin/tracepath
index 9310c1f..7741c0e 100644 (file)
@@ -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 49cc1d8..7b75b87 100755 (executable)
--- 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
index 0d80e7c..c7f8b67 100644 (file)
@@ -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