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 085a20ec8bc05b58244bf05d9589e9a1ed3a5265 (commit) via 1d9c1c3079922f6f15354e7001fb2b09ea0355e4 (commit) via 057b351186c81bfaea6c28de439762ed1aacde00 (commit) via 4e3ce5438b6ad5707afa57f548519aac103ef725 (commit) from c926c6375d11cca11b24dee3b538da8ae6aaa1f2 (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 085a20ec8bc05b58244bf05d9589e9a1ed3a5265 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 5 17:09:56 2014 +0200
firewall: Fix using aliases.
Fix coding errors, actually read aliases configuration and fall back to default RED IP address if no suitable alias was found.
commit 1d9c1c3079922f6f15354e7001fb2b09ea0355e4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 5 17:08:17 2014 +0200
convert-portfw: Fix converting aliases.
ALL is not suitable as it is not a valid configuration value.
commit 057b351186c81bfaea6c28de439762ed1aacde00 Merge: 4e3ce54 c926c63 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 5 17:02:33 2014 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
commit 4e3ce5438b6ad5707afa57f548519aac103ef725 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 1 16:24:50 2014 +0200
glibc: Install all known locales.
-----------------------------------------------------------------------
Summary of changes: config/firewall/convert-portfw | 2 +- config/firewall/firewall-lib.pl | 22 ++++++++++++++-------- config/firewall/rules.pl | 2 -- lfs/glibc | 3 +-- 4 files changed, 16 insertions(+), 13 deletions(-)
Difference in files: diff --git a/config/firewall/convert-portfw b/config/firewall/convert-portfw index fedddee..8660e7c 100755 --- a/config/firewall/convert-portfw +++ b/config/firewall/convert-portfw @@ -105,7 +105,7 @@ sub build_rules } #get ipfire ip if($alias eq '0.0.0.0'){ - $alias='ALL'; + $alias='Default IP'; }else{ foreach my $ali (@alias){ my ($alias_ip,$alias_active,$alias_name) = split (",",$ali); diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl index ae2a462..9f546a9 100755 --- a/config/firewall/firewall-lib.pl +++ b/config/firewall/firewall-lib.pl @@ -64,6 +64,7 @@ my $netsettings = "${General::swroot}/ethernet/settings"; &General::readhasharray("$configipsec", %ipsecconf); &General::readhasharray("$configsrv", %customservice); &General::readhasharray("$configsrvgrp", %customservicegrp); +&General::get_aliases(%aliases);
sub get_srv_prot { @@ -388,9 +389,9 @@ sub get_address
# Aliases } else { - my %alias = &get_alias($value); - if (%alias) { - push(@ret, $alias{"IPT"}); + my $alias = &get_alias($value); + if ($alias) { + push(@ret, $alias); } }
@@ -423,12 +424,12 @@ sub get_alias
foreach my $alias (sort keys %aliases) { if ($id eq $alias) { - return $aliases{$alias}; + return $aliases{$alias}{"IPT"}; } } } -sub get_nat_address -{ + +sub get_nat_address { my $zone = shift; my $source = shift;
@@ -451,15 +452,20 @@ sub get_nat_address } elsif ($zone eq "RED" || $zone eq "GREEN" || $zone eq "ORANGE" || $zone eq "BLUE") { return $netsettings{$zone . "_ADDRESS"};
- } elsif ($zone eq "Default IP") { + } elsif ($zone ~~ ["Default IP", "ALL"]) { return &get_external_address();
} else { - return &get_alias($zone); + my $alias = &get_alias($zone); + unless ($alias) { + $alias = &get_external_address(); + } + return $alias; }
print_error("Could not find NAT address"); } + sub get_internal_firewall_ip_addresses { my $use_orange = shift; diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index a0bc32c..dae2d52 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -53,7 +53,6 @@ my %customgrp=(); my %configinputfw=(); my %configoutgoingfw=(); my %confignatfw=(); -my %aliases=(); my @p2ps=();
my $configfwdfw = "${General::swroot}/firewall/config"; @@ -69,7 +68,6 @@ my $netsettings = "${General::swroot}/ethernet/settings"; &General::readhasharray($configinput, %configinputfw); &General::readhasharray($configoutgoing, %configoutgoingfw); &General::readhasharray($configgrp, %customgrp); -&General::get_aliases(%aliases);
my @log_limit_options = &make_log_limit_options();
diff --git a/lfs/glibc b/lfs/glibc index dcbffc2..f0d8aba 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -298,8 +298,7 @@ endif ifeq "$(ROOT)" "" # Creating the locales mkdir -p /usr/lib/locale - cd $(DIR_SRC)/glibc-build && localedef -i en_US -f ISO-8859-1 en_US - cd $(DIR_SRC)/glibc-build && localedef -i en_US -f UTF-8 en_US.utf8 + cd $(DIR_SRC)/glibc-build && make localedata/install-locales
# Timezone data will be shipped by tzdata. rm -rfv /usr/share/zoneinfo
hooks/post-receive -- IPFire 2.x development tree