Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

diff --git a/make.sh b/make.sh
index c6d5f690569bf9832e917e163ffebcd1ae1c39de..37a46003f3c50c15755e958b1f317574c5e630b9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.8test"                                              # Version number
-CORE="44"                                                      # Core Level (Filename)
+VERSION="2.9beta1"                                             # Version number
+CORE="43"                                                      # Core Level (Filename)
 PAKFIRE_CORE="43"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index fea8d87e8437a37bf6c7d219368facab5d58dc25..88889a4c2609186b22eee3a013eba7c762cc2a0b 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -188,10 +188,10 @@ case "$1" in
        /sbin/iptables -A FORWARD -j OUTGOINGFW
 
        # localhost and ethernet.
-       /sbin/iptables -A INPUT   -i lo          -m state --state NEW -j ACCEPT
+       /sbin/iptables -I INPUT 1 -i lo -s 127.0.0.0/8 -d 127.0.0.0/8 -m state --state NEW -j ACCEPT
        /sbin/iptables -A INPUT   -s 127.0.0.0/8 -m state --state NEW -j DROP   # Loopback not on lo
        /sbin/iptables -A INPUT   -d 127.0.0.0/8 -m state --state NEW -j DROP
-       /sbin/iptables -A FORWARD -i lo          -m state --state NEW -j ACCEPT
+       /sbin/iptables -A FORWARD -i lo -s 127.0.0.0/8 -d 127.0.0.0/8 -m state --state NEW -j ACCEPT
        /sbin/iptables -A FORWARD -s 127.0.0.0/8 -m state --state NEW -j DROP
        /sbin/iptables -A FORWARD -d 127.0.0.0/8 -m state --state NEW -j DROP
        /sbin/iptables -A INPUT   -i $GREEN_DEV  -m state --state NEW -j ACCEPT ! -p icmp

diff --git a/src/install+setup/install/downloadsource.sh b/src/install+setup/install/downloadsource.sh
index 8471df312fb9b8157b8c83c5bc6b5ab8808375a1..fad2609d59db40a6b9ce03bdcdad5b0f2b415e89 100644 (file)
--- a/src/install+setup/install/downloadsource.sh
+++ b/src/install+setup/install/downloadsource.sh
@@ -19,9 +19,7 @@
 #                                                                             #
 ###############################################################################
 
-# Path for testing. Need to be changed for release!
-IPFireISO=people.ipfire.org/~arne_f/testing/next/ipfire.iso
-#IPFireISO=download.ipfire.org/iso/ipfire.iso
+IPFireISO=download.ipfire.org/iso/ipfire.iso
 
 #Get user defined download from boot cmdline
 grep "netinstall=" /proc/cmdline > /dev/null && CMDLINE=1

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index c1cc35b53927a47dd14dff4ae417088ae7d6fa04..203748f10ef78726058da5935c5d0c7e791d7b17 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -3,7 +3,7 @@
 COREVER=`cat /opt/pakfire/db/core/mine`
 # FIXME: edit this lines before release
 URL=http://download.ipfire.org/iso/
-ISO=ipfire-2.7.i586-full-core$COREVER.iso
+ISO=ipfire-2.9beta1.i586-full-core$COREVER.iso
 
 if [ -z "$1" ]; then 
        echo usage: $0 backup-file