From 68b23cbb0074191a034f24b6b5a4c10221e22254 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 11 Dec 2010 00:07:50 +0100 Subject: [PATCH 1/4] Set version to 2.9beta. --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index c6d5f6905..39932911b 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.8test" # Version number +VERSION="2.9beta1" # Version number CORE="44" # Core Level (Filename) PAKFIRE_CORE="43" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch From b2eb5b07826d590319dd81e5d5b9506543ef3507 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 11 Dec 2010 10:01:27 +0100 Subject: [PATCH 2/4] Handle loopback on input before NEW,NOTSYN check. Many programs like squid/squidguard spam the log without this. --- src/initscripts/init.d/firewall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index fea8d87e8..88889a4c2 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 From 513d55e208e12d776601d82d343962e5d98724d0 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 11 Dec 2010 09:35:22 +0100 Subject: [PATCH 3/4] Changed ISO download path to normal server. --- src/install+setup/install/downloadsource.sh | 4 +--- src/scripts/backupiso | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/install+setup/install/downloadsource.sh b/src/install+setup/install/downloadsource.sh index 8471df312..fad2609d5 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 c1cc35b53..203748f10 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 From 712829a1b84985bd800c84298f81a116d3a39810 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 11 Dec 2010 09:36:58 +0100 Subject: [PATCH 4/4] Set iso back to core43. --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 39932911b..37a46003f 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9beta1" # Version number -CORE="44" # Core Level (Filename) +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