From: Michael Tremer Date: Sat, 11 Dec 2010 09:55:03 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x X-Git-Tag: v2.9-beta1~3 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3e0cef2a2673b6c434e10bc656b99a5feb550ff4;hp=b0849c98600896b22969ada84e04537e9847f411 Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x --- diff --git a/make.sh b/make.sh index c6d5f69056..37a46003f3 100755 --- 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 fea8d87e84..88889a4c26 100644 --- 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 8471df312f..fad2609d59 100644 --- 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 c1cc35b539..203748f10e 100644 --- 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