From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc77ac2364436f6dff5fa31bbe6fb0dd1f92c4fd Date: Tue, 18 Mar 2014 18:04:13 +0100 Message-ID: <20140318170429.3EB1020AF4@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7712016597134222240==" List-Id: --===============7712016597134222240== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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, next has been updated via cc77ac2364436f6dff5fa31bbe6fb0dd1f92c4fd (commit) via 1aa5439cf14c881043dddf685a528fabf33305af (commit) via bb0618287b9c10fac2fd1a8386128386fa667f20 (commit) via df1f687b28c28b1b6721cd3f02ce043e9d433bfc (commit) via 5561ea4a71350e0c851534bed430bc5ef60547ad (commit) via 4ebd3831fab6949542f0d2a9d6e444c5f8619ad1 (commit) via 3a60bf3483d0f40deba348c120df3e75da7b3ce0 (commit) via 326a764de66971d2c78d2e45225d8985ca4ac3be (commit) from be0d1005fdad24d7c0eb1d16411c99048caf7fcf (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 cc77ac2364436f6dff5fa31bbe6fb0dd1f92c4fd Author: Alexander Marx Date: Tue Mar 18 15:13:02 2014 +0100 Firewall: select right value in DNAT Dropdown commit 1aa5439cf14c881043dddf685a528fabf33305af Author: Alexander Marx Date: Tue Mar 18 15:02:55 2014 +0100 Firewall: extend DNAT dropdown with auto,BLUE,ORANGE,GREEN commit bb0618287b9c10fac2fd1a8386128386fa667f20 Author: Michael Tremer Date: Tue Mar 18 18:03:14 2014 +0100 openssh: Update to 6.6p1. commit df1f687b28c28b1b6721cd3f02ce043e9d433bfc Merge: 5561ea4 be0d100 Author: Michael Tremer Date: Tue Mar 18 18:00:42 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 5561ea4a71350e0c851534bed430bc5ef60547ad Merge: 4ebd383 da7a220 Author: Michael Tremer Date: Mon Mar 17 22:04:48 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 4ebd3831fab6949542f0d2a9d6e444c5f8619ad1 Merge: 2a07aa9 3a60bf3 Author: Michael Tremer Date: Mon Mar 17 22:04:44 2014 +0100 Merge remote-tracking branch 'alfh/feature_firewalllog_centergraph' into = next commit 3a60bf3483d0f40deba348c120df3e75da7b3ce0 Merge: 326a764 2b6c5f2 Author: Alf H=C3=B8gemark Date: Sat Mar 15 08:47:56 2014 +0100 Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_= firewalllog_centergraph commit 326a764de66971d2c78d2e45225d8985ca4ac3be Author: Alf H=C3=B8gemark Date: Sat Mar 1 14:32:52 2014 +0100 firewalllog*.cgi and country.cgi: Use language strings, and align graphs =20 Put the piechart for firewalllog* in the center of the page horisontally, this looks visually better. Add language string for count and details submit button. =20 Add language strings for country.cgi. Make html validate for country.cgi. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/country.cgi | 61 ++++++++++++++---------------= -- html/cgi-bin/firewall.cgi | 42 ++++++++++----------- html/cgi-bin/logs.cgi/firewalllogip.dat | 10 ++--- html/cgi-bin/logs.cgi/firewalllogport.dat | 10 ++--- langs/de/cgi-bin/de.pl | 6 +++ langs/en/cgi-bin/en.pl | 6 +++ lfs/openssh | 4 +- 7 files changed, 72 insertions(+), 67 deletions(-) Difference in files: diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index db6c074..76035fb 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -36,18 +36,18 @@ require "${General::swroot}/header.pl"; =20 &Header::showhttpheaders(); =20 -&Header::openpage('Country Codes', 1, ''); -&Header::openbigbox('100%', 'LEFT'); - -&Header::openbox('100%', 'LEFT', 'Flags & Country Codes:'); -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; +&Header::openpage($Lang::tr{'countries'}, 1, ''); +&Header::openbigbox('100%', 'left'); + +&Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'}); +print "
FlagCode$Lang::tr{'country'} FlagCode$Lang::tr{'country'}
"; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; +print ""; =20 @flaglist =3D <$flagdir/*>; =20 @@ -69,39 +69,34 @@ foreach $flag (@flaglistfiles) if($fcode eq 'tp') { $country =3D 'East Timor'; } if($fcode eq 'yu') { $country =3D 'Yugoslavia'; } if ($lines % 2) { - print ""; print ""; print "\n"; -} -else { - $lines2++; - if($lines2 % 2) { - print ""; - $col=3D"bgcolor=3D'${Header::table2colour}'"; - } else { - print ""; - $col=3D"bgcolor=3D'${Header::table1colour}'"; } - print ""; - print ""; - print ""; + else { + $lines2++; + if($lines2 % 2) { + $col=3D"style=3D'background-color:${Header::table2colour};'"; + } else { + $col=3D"style=3D'background-color:${Header::table1colour};'"; + } + print ""; + print ""; + print ""; + print ""; + print ""; } } =20 =20 -print "
$Lang::tr{'flag'}$Lang::tr{'countrycode'}$Lang::tr{'country'} $Lang::tr{'flag'}$Lang::tr{'countrycode'}$Lang::tr{'country'}
3D'$flagcode'</td"; + print "=3D'$flagcode'$flagcode$country
3D'$flagcode'</td"; - print "$flagcode$country 
=3D'$flagcode'$flagcode$country 
"; +print ""; &Header::closebox(); =20 &Header::closebigbox(); =20 print < - - - -
$Lang::tr{'back'}<= /td> -
+ END ;=20 diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 82684e0..59c4caa 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1632,25 +1632,28 @@ END END =20 - if (%aliases) { - print <$Lang::tr{'dnat address'}: "; - } else { - print < - - -END } + #DNAT Dropdown + foreach my $network (sort keys %defaultNetworks) + { + if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$netwo= rk}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){ + print ""; + } + } + print ""; print ""; =20 #SNAT @@ -1671,19 +1674,14 @@ END foreach my $alias (sort keys %aliases) { print ""; } - - # XXX this is composed in a very ugly fashion + # SNAT Dropdown foreach my $network (sort keys %defaultNetworks) { - next if($defaultNetworks{$network}{'NAME'} eq "IPFire"); - next if($defaultNetworks{$network}{'NAME'} eq "ALL"); - next if($defaultNetworks{$network}{'NAME'} =3D~ /OpenVPN/i); - next if($defaultNetworks{$network}{'NAME'} =3D~ /IPsec/i); - - print ""; + if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$netwo= rk}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){ + print ""; + } } - print < diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/= firewalllogip.dat index e4e8451..07bcc77 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -397,9 +397,9 @@ if ($showpie !=3D 2 && $pienumber <=3D 50 && $pienumber != =3D 0) { print FILE $myimage->png; close(FILE); ##################################################### - print "
"; + print "
"; print ""; - print "
"; + print ""; } =20 print < $Lang::tr{'ip addre= ss'} $Lang::tr{'country'= } -Count +$Lang::tr{'count'}<= /b> $Lang::tr{'percenta= ge'} END @@ -439,10 +439,10 @@ for($s=3D0;$s<$lines;$s++) my $fcode =3D lc($ccode); =20 $color++; - print "
"; + print "
"; print "$key[$s]"; if ( $fcode ne "" ){ - print "=3D'$ccode'";} + print "=3D'$ccode'";} else { print "";} print "$value[$s]"; diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cg= i/firewalllogport.dat index 9f7ce3a..5b0db62 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -400,17 +400,17 @@ if ($showpie !=3D 2 && $pienumber <=3D 50 && $pienumber= !=3D 0) { print FILE $myimage->png; close(FILE); ##################################################### - print "
"; + print "
"; print ""; - print "
"; + print ""; } =20 print < + - + END @@ -437,7 +437,7 @@ for($s=3D0;$s<$lines;$s++) print ""; =20 $color++; - print ""; + print ""; print ""; print ""; print ""; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 1042707..acb1bb4 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -566,7 +566,11 @@ 'could not open installed updates file' =3D> 'Datei mit Update-Liste konnte = nicht ge=C3=B6ffnet werden', 'could not open update information file' =3D> 'Datei mit den Update-Informat= ion konnte nicht ge=C3=B6ffnet werden. Die Update-Datei ist besch=C3=A4digt.', 'could not retrieve common name from certificate' =3D> 'Der Gemeinsame Name = (CN) konnte nicht aus dem Zertifikat gelesen werden.', +'count' =3D> 'Anzahl', +'countries' =3D> 'L=C3=A4nder', 'country' =3D> 'Land', +'countrycode' =3D> 'Kennung', +'country codes and flags' =3D> 'L=C3=A4nder und L=C3=A4nderkennungen', 'cpu frequency per' =3D> 'CPU-Frequenz pro', 'cpu idle usage' =3D> 'Leerlauf CPU-Nutzung', 'cpu interrupt usage' =3D> 'Interrupt CPU-Nutzung', @@ -646,6 +650,7 @@ 'destination port numbers' =3D> 'Zielport mu=C3=9F ein(e) g=C3=BCltige(r) Po= rtnummer oder Portbereich sein.', 'destination port overlaps' =3D> 'Der Zielportbereich =C3=BCberlappt einen b= ereits bestehenden Portbereich.', 'detail level' =3D> 'Detaillierungsgrad', +'details' =3D> 'Mehr', 'device' =3D> 'Ger=C3=A4t', 'devices on blue' =3D> 'Ger=C3=A4te auf Blau', 'dhcp advopt add' =3D> 'DHCP Option hinzuf=C3=BCgen', @@ -901,6 +906,7 @@ 'fixed ip lease added' =3D> 'Feste IP-Zuordnung hinzugef=C3=BCgt', 'fixed ip lease modified' =3D> 'Feste IP-Zuordnung ge=C3=A4ndert', 'fixed ip lease removed' =3D> 'Feste IP-Zuordnung gel=C3=B6scht', +'flag' =3D> 'Flagge', 'force update' =3D> 'Aktualisierung erzwingen', 'force user' =3D> 'Standardbenutzer f=C3=BCr das UNIX Dateisystem', 'forward firewall' =3D> 'Firewall', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 62facdc..bedb949 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -587,7 +587,11 @@ 'could not open installed updates file' =3D> 'Could not open installed updat= es file', 'could not open update information file' =3D> 'Could not open update informa= tion file. The update file is corrupt.', 'could not retrieve common name from certificate' =3D> 'Could not retrieve c= ommon name from certificate.', +'count' =3D> 'Count', +'countries' =3D> 'Countries', 'country' =3D> 'Country', +'countrycode' =3D> 'Code', +'country codes and flags' =3D> 'Country Codes and Flags:', 'cpu frequency per' =3D> 'CPU frequency per', 'cpu idle usage' =3D> 'Idle CPU Usage', 'cpu interrupt usage' =3D> 'Interrupt CPU Usage', @@ -668,6 +672,7 @@ 'destination port numbers' =3D> 'Destination port must be a valid port numbe= r or port range.', 'destination port overlaps' =3D> 'Destination port range overlaps an existin= g port range.', 'detail level' =3D> 'Detail level', +'details' =3D> 'Details', 'device' =3D> 'Device', 'devices on blue' =3D> 'Devices on BLUE', 'dhcp advopt add' =3D> 'Add a DHCP option', @@ -927,6 +932,7 @@ 'fixed ip lease added' =3D> 'Fixed IP lease added', 'fixed ip lease modified' =3D> 'Fixed IP lease modified', 'fixed ip lease removed' =3D> 'Fixed IP lease removed', +'flag' =3D> 'Flag', 'force update' =3D> 'Force update', 'force user' =3D> 'force all new file to user', 'forward firewall' =3D> 'Firewall', diff --git a/lfs/openssh b/lfs/openssh index d651162..bc6fa3c 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 6.5p1 +VER =3D 6.6p1 =20 THISAPP =3D openssh-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D a084e7272b8cbd25afe0f5dce4802fef +$(DL_FILE)_MD5 =3D 3e9800e6bca1fbac0eea4d41baa7f239 =20 install : $(TARGET) =20 hooks/post-receive -- IPFire 2.x development tree --===============7712016597134222240==--
$Lang::tr{'port'}count$Lang::tr{'count'}<= /b> $Lang::tr{'percenta= ge'}
$key[$s]$value[$s]$percent