Merge branch 'firewall' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into...

Conflicts:
	config/forwardfw/rules.pl
	config/rootfiles/common/apache2
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
	lfs/configroot
	lfs/strongswan

diff --cc config/backup/include
index 551b52df287a01041009944fa4be92288b0007a5,3f24ca70311f9bb3bf1a300bfa6a53494b43fd11..57e5e9c176fd80923358c39f40b60039c087c247
--- 1/config/backup/include
--- 2/config/backup/include
+++ b/config/backup/include
@@@ -14,9 -14,9 +14,11 @@@
  /etc/ssh/ssh_host*
  /var/ipfire/auth/users
  /var/ipfire/dhcp/*
+ /var/ipfire/forward
+ /var/ipfire/fwhosts
  /var/ipfire/dnsforward/*
 +/var/ipfire/forward
 +/var/ipfire/fwhosts
  /var/ipfire/main/*
  /var/ipfire/ovpn
  /var/ipfire/ppp

diff --cc config/forwardfw/rules.pl
index 07f3abd1eaa6d02ebc915f97c3f61b198de1cfaa,f8d6fdc4ab24f6241c2c0a357062a69402950817..64962b7af956a2bbf52d685594388eb46816838e
--- 1/config/forwardfw/rules.pl
--- 2/config/forwardfw/rules.pl
+++ b/config/forwardfw/rules.pl
@@@ -89,7 -89,7 +89,9 @@@ close(CONN1)
  ################################
  #    DEBUG/TEST                #
  ################################
- my $MODE=1;     # 0 - normal operation
++
+ my $MODE=0;     # 0 - normal operation
++
                                # 1 - print configline and rules to console     
                                # 
  ################################              

diff --cc langs/de/cgi-bin/de.pl
index fbc9c6f86058f7f5e3f8c334c14eac739786483e,82295d5a48e83beb8ec02226138d1ce6a4051747..aad6b4b2d812b5ccc1e01f3377c60a2429e82f66
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -903,9 -903,8 +903,10 @@@
  'from email user' => 'Von Email Benutzer',
  'from warn email bad' => 'Von Email Adresse ist nicht gültig',
  'fw blue' => 'Firewall-Optionen für das Blaue Interface',
+ 'fw default drop' => 'Firewall Policy',
  'fw logging' => 'Firewall-Logging',
 +'fw default drop' => 'Firewall Policy',
 +'fw logging' => 'Firewall-Logging',
  'fw settings' => 'Firewall-Einstellungen',
  'fw settings color' => 'Farben in Regeltabelle anzeigen',
  'fw settings dropdown' => 'Alle Netzwerke auf Regelerstellungsseite anzeigen',

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc lfs/strongswan
index 8ff9f57d1e41f041c3fd90e55e3ea3920612177c,797e512fe25730a4f6d4b48e659f98568c52d85f..3548ea15e58fc07bb8b78119e2a08262e94fd07a
--- 1/lfs/strongswan
--- 2/lfs/strongswan
+++ b/lfs/strongswan
@@@ -77,9 -77,8 +77,8 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
  
 -      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
 -      
 +      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
- 
 +      cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
        cd $(DIR_APP) && ./configure \
                --prefix="/usr" \
                --sysconfdir="/etc" \