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 21674d364b670dbc133f085474b0ee92c1862975 (commit) via 883aa361b09bf9492781e4ee50dd6eab5a860570 (commit) via 0626fac1ac47b506e31cbc59c96ea8811b5d1321 (commit) via 9fa2794f086d9203b6015bdfdebf57408a029aac (commit) via 712500d0dcb95a761c528211d23c664bd1033128 (commit) from 0cd7c451dd40105275c2b2e853b9db44134b9aff (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 21674d364b670dbc133f085474b0ee92c1862975 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 11 15:17:21 2014 +0200

Update translations.

commit 883aa361b09bf9492781e4ee50dd6eab5a860570 Merge: 0cd7c45 0626fac Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 11 15:17:08 2014 +0200

Merge remote-tracking branch 'amarx/RC2-master'

commit 0626fac1ac47b506e31cbc59c96ea8811b5d1321 Author: Alexander Marx alexander.marx@ipfire.org Date: Fri Apr 11 12:06:52 2014 +0200

Firewall: When having rules with more than 3 protocols, show "many" and tooltip

commit 9fa2794f086d9203b6015bdfdebf57408a029aac Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Apr 9 18:20:46 2014 +0200

kernel: disable intel mei.

Intel Management Engine Interface is still crashing the kernel.

commit 712500d0dcb95a761c528211d23c664bd1033128 Author: Alexander Marx alexander.marx@ipfire.org Date: Wed Apr 9 16:23:55 2014 +0200

Firewall: Fix 10510 - Show all protocols from servicegroups (GRE,IPIP,IPV6,...)

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

Summary of changes: doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 4 ++++ html/cgi-bin/firewall.cgi | 36 +++++++++++------------------------- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 10 files changed, 23 insertions(+), 25 deletions(-)

Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index c6e9735..95f85cb 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -715,6 +715,7 @@ WARNING: untranslated string: fwdfw hint mac WARNING: untranslated string: fwdfw iface WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule +WARNING: untranslated string: fwdfw many WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 16db153..0b513d0 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -726,6 +726,7 @@ WARNING: untranslated string: fwdfw hint mac WARNING: untranslated string: fwdfw iface WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule +WARNING: untranslated string: fwdfw many WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 4502f3b..d19b602 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -673,6 +673,7 @@ WARNING: untranslated string: fwdfw hint mac WARNING: untranslated string: fwdfw iface WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule +WARNING: untranslated string: fwdfw many WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.pl b/doc/language_issues.pl index c6e9735..95f85cb 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -715,6 +715,7 @@ WARNING: untranslated string: fwdfw hint mac WARNING: untranslated string: fwdfw iface WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule +WARNING: untranslated string: fwdfw many WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.ru b/doc/language_issues.ru index fb99069..15caa07 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -710,6 +710,7 @@ WARNING: untranslated string: fwdfw hint mac WARNING: untranslated string: fwdfw iface WARNING: untranslated string: fwdfw log WARNING: untranslated string: fwdfw log rule +WARNING: untranslated string: fwdfw many WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 78cf291..8b3afdf 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -645,6 +645,7 @@ WARNING: untranslated string: ConnSched shutdown WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: count +WARNING: untranslated string: fwdfw many WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --git a/doc/language_missings b/doc/language_missings index 9521467..fc30890 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -162,6 +162,7 @@ < fwdfw log < fwdfw log rule < fwdfw man port +< fwdfw many < fwdfw menu < fwdfw MODE1 < fwdfw MODE2 @@ -627,6 +628,7 @@ < fwdfw log < fwdfw log rule < fwdfw man port +< fwdfw many < fwdfw menu < fwdfw MODE1 < fwdfw MODE2 @@ -1076,6 +1078,7 @@ < fwdfw log < fwdfw log rule < fwdfw man port +< fwdfw many < fwdfw menu < fwdfw MODE1 < fwdfw MODE2 @@ -1514,6 +1517,7 @@ < fwdfw log < fwdfw log rule < fwdfw man port +< fwdfw many < fwdfw menu < fwdfw MODE1 < fwdfw MODE2 diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index e995794..9af97d1 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1260,10 +1260,8 @@ sub get_serviceports my $name=shift; &General::readhasharray("$configsrv", %customservice); &General::readhasharray("$configsrvgrp", %customservicegrp); - my $tcp; - my $udp; - my $icmp; @protocols=(); + my @specprot=("IPIP","IPV6","IGMP","GRE","AH","ESP"); if($type eq 'service'){ foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){ if ($customservice{$key}[0] eq $name){ @@ -1273,33 +1271,19 @@ sub get_serviceports }elsif($type eq 'group'){ foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){ if ($customservicegrp{$key}[0] eq $name){ - foreach my $key1 (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){ - if ($customservice{$key1}[0] eq $customservicegrp{$key}[2]){ - if($customservice{$key1}[2] eq 'TCP'){ - $tcp='TCP'; - }elsif($customservice{$key1}[2] eq 'ICMP'){ - $icmp='ICMP'; - }elsif($customservice{$key1}[2] eq 'UDP'){ - $udp='UDP'; + if ($customservicegrp{$key}[2] ~~ @specprot){ + push (@protocols," ".$customservicegrp{$key}[2]); + }else{ + foreach my $key1 (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){ + if ($customservice{$key1}[0] eq $customservicegrp{$key}[2]){ + if (!grep(/$customservice{$key1}[2]/, @protocols)){ + push (@protocols,$customservice{$key1}[2]);} } } } } } } - if($tcp && $udp && $icmp){ - push (@protocols,"TCP,UDP, <br>ICMP"); - return @protocols; - } - if($tcp){ - push (@protocols,"TCP"); - } - if($udp){ - push (@protocols,"UDP"); - } - if($icmp){ - push (@protocols,"ICMP"); - } return @protocols; } sub getcolor @@ -2486,7 +2470,7 @@ END push (@protocols,$Lang::tr{'all'}); }

- my $protz=join(",",@protocols); + my $protz=join(", ",@protocols); if($protz eq 'ICMP' && $$hash{$key}[9] ne 'All ICMP-Types' && $$hash{$key}[14] ne 'cust_srvgrp'){ &General::readhasharray("${General::swroot}/fwhosts/icmp-types", %icmptypes); foreach my $keyicmp (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){ @@ -2495,6 +2479,8 @@ END last; } } + }elsif($#protocols gt '3'){ + print"<td align='center'><span title='$protz'>$Lang::tr{'fwdfw many'}</span></td>"; }else{ print"<td align='center'>$protz</td>"; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index cc56718..5e8892d 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -986,6 +986,7 @@ 'fwdfw log' => 'Log', 'fwdfw log rule' => 'Logging aktivieren', 'fwdfw man port' => 'Port(s):', +'fwdfw many' => 'Diverse', 'fwdfw menu' => 'Firewall', 'fwdfw movedown' => 'Herunter', 'fwdfw moveup' => 'Herauf', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ff5c90a..db31a89 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1012,6 +1012,7 @@ 'fwdfw log' => 'Log', 'fwdfw log rule' => 'Log rule', 'fwdfw man port' => 'Port(s):', +'fwdfw many' => 'Many', 'fwdfw menu' => 'Firewall', 'fwdfw movedown' => 'Move down', 'fwdfw moveup' => 'Move up',

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