[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 52dae2ba3f341a928613c832ebe1db042a4f8702

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 52dae2ba3f341a928613c832ebe1db042a4f8702

[git]

[-- Attachment #1: Type: text/plain, Size: 2176 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  52dae2ba3f341a928613c832ebe1db042a4f8702 (commit)
       via  e3d5a18d4abe7b1fc9172f7d0a60803734224c66 (commit)
       via  a21f2f6a76b3e0cf6af1ffb88ef6a5d7ebdb4cc2 (commit)
      from  215043936ebd50c4331ca6d9600dc7e93acd1bb4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52dae2ba3f341a928613c832ebe1db042a4f8702
Merge: 2150439 e3d5a18
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 10 18:13:13 2014 +0200

    Merge branch 'next'

-----------------------------------------------------------------------

Summary of changes:
 config/firewall/firewall-lib.pl          | 4 ++--
 config/rootfiles/core/84/filelists/files | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl
index 9b3f2bf..f3cd67f 100755
--- a/config/firewall/firewall-lib.pl
+++ b/config/firewall/firewall-lib.pl
@@ -238,8 +238,8 @@ sub get_interface
 	if($net eq "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}"){
 		return "$netsettings{'BLUE_DEV'}";
 	}
-	if($net eq "0.0.0.0/0"){
-		return "$netsettings{'RED_DEV'}";
+	if($net eq "0.0.0.0/0") {
+		return &get_external_interface();
 	}
 	return "";
 }
diff --git a/config/rootfiles/core/84/filelists/files b/config/rootfiles/core/84/filelists/files
index c26e2ea..2cbc242 100644
--- a/config/rootfiles/core/84/filelists/files
+++ b/config/rootfiles/core/84/filelists/files
@@ -7,4 +7,5 @@ srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/urlfilter.cgi
 usr/lib/firewall/firewall-lib.pl
 usr/lib/firewall/rules.pl
+usr/local/bin/update-lang-cache
 var/ipfire/langs


hooks/post-receive
--
IPFire 2.x development tree