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 [thread overview]
Message-ID: <20140318170429.3EB1020AF4@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 18070 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, 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 <alexander.marx(a)ipfire.org>
Date: Tue Mar 18 15:13:02 2014 +0100
Firewall: select right value in DNAT Dropdown
commit 1aa5439cf14c881043dddf685a528fabf33305af
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Tue Mar 18 15:02:55 2014 +0100
Firewall: extend DNAT dropdown with auto,BLUE,ORANGE,GREEN
commit bb0618287b9c10fac2fd1a8386128386fa667f20
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 18 18:03:14 2014 +0100
openssh: Update to 6.6p1.
commit df1f687b28c28b1b6721cd3f02ce043e9d433bfc
Merge: 5561ea4 be0d100
Author: Michael Tremer <michael.tremer(a)ipfire.org>
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 <michael.tremer(a)ipfire.org>
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 <michael.tremer(a)ipfire.org>
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øgemark <alf(a)i100.no>
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øgemark <alf(a)i100.no>
Date: Sat Mar 1 14:32:52 2014 +0100
firewalllog*.cgi and country.cgi: Use language strings, and align graphs
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.
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";
&Header::showhttpheaders();
-&Header::openpage('Country Codes', 1, '');
-&Header::openbigbox('100%', 'LEFT');
-
-&Header::openbox('100%', 'LEFT', 'Flags & Country Codes:');
-print "<TABLE WIDTH='100%' border='0' class='tbl'>";
-print "<tr><th width='5%'><b>Flag</b></th>";
-print "<th width='5%'><b>Code</b></th>";
-print "<th width='40%'><b>$Lang::tr{'country'}</b></th>";
-print "<th><b> </b></th>";
-print "<th width='5%'><b>Flag</b></th>";
-print "<th width='5%'><b>Code</b></th>";
-print "<th width='40%'><b>$Lang::tr{'country'}</b></th></tr>";
+&Header::openpage($Lang::tr{'countries'}, 1, '');
+&Header::openbigbox('100%', 'left');
+
+&Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'});
+print "<table class='tbl'>";
+print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
+print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
+print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>";
+print "<th> </th>";
+print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
+print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
+print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>";
@flaglist = <$flagdir/*>;
@@ -69,39 +69,34 @@ foreach $flag (@flaglistfiles)
if($fcode eq 'tp') { $country = 'East Timor'; }
if($fcode eq 'yu') { $country = 'Yugoslavia'; }
if ($lines % 2) {
- print "<td $col><a name='$fcode'/><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$flagcode'</td>";
+ print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>";
print "<td $col>$flagcode</td>";
print "<td $col>$country</td></tr>\n";
-}
-else {
- $lines2++;
- if($lines2 % 2) {
- print "<tr>";
- $col="bgcolor='${Header::table2colour}'";
- } else {
- print "<tr>";
- $col="bgcolor='${Header::table1colour}'";
}
- print "<td $col><a name='$fcode'/><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$flagcode'</td>";
- print "<td $col>$flagcode</td>";
- print "<td $col>$country</td>";
- print "<td $col> </td>";
+ else {
+ $lines2++;
+ if($lines2 % 2) {
+ $col="style='background-color:${Header::table2colour};'";
+ } else {
+ $col="style='background-color:${Header::table1colour};'";
+ }
+ print "<tr>";
+ print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>";
+ print "<td $col>$flagcode</td>";
+ print "<td $col>$country</td>";
+ print "<td $col> </td>";
}
}
-print "</TABLE>";
+print "</table>";
&Header::closebox();
&Header::closebigbox();
print <<END
-<div align='center'>
-<table width='80%'>
-<tr>
-<td align='center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></td>
-</tr>
-</table>
+<div style='text-align:center'>
+<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a>
</div>
END
;
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
</td>
END
- if (%aliases) {
- print <<END;
+ print <<END;
<td width='25%' align='right'>$Lang::tr{'dnat address'}:</td>
<td width='30%'>
<select name='dnat' style='width: 100%;'>
- <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'} ($netsettings{'RED_ADDRESS'})</option>
+ <option value='AUTO' $selected{'dnat'}{'AUTO'}>- $Lang::tr{'automatic'} -</option>
+ <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'red1'} ($netsettings{'RED_ADDRESS'})</option>
END
+ if (%aliases) {
foreach my $alias (sort keys %aliases) {
print "<option value='$alias' $selected{'dnat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
}
-
- print "</select>";
- } else {
- print <<END;
- <td colspan="2" width='55%'>
- <input type='hidden' name='dnat' value='Default IP'>
- </td>
-END
}
+ #DNAT Dropdown
+ foreach my $network (sort keys %defaultNetworks)
+ {
+ if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){
+ print "<option value='$defaultNetworks{$network}{'NAME'}'";
+ print " selected='selected'" if ($fwdfwsettings{'dnat'} eq $defaultNetworks{$network}{'NAME'});
+ print ">$network ($defaultNetworks{$network}{'NET'})</option>";
+ }
+ }
+ print "</select>";
print "</tr>";
#SNAT
@@ -1671,19 +1674,14 @@ END
foreach my $alias (sort keys %aliases) {
print "<option value='$alias' $selected{'snat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
}
-
- # 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'} =~ /OpenVPN/i);
- next if($defaultNetworks{$network}{'NAME'} =~ /IPsec/i);
-
- print "<option value='$defaultNetworks{$network}{'NAME'}'";
- print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
- print ">$network ($defaultNetworks{$network}{'NET'})</option>";
+ if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){
+ print "<option value='$defaultNetworks{$network}{'NAME'}'";
+ print " selected='selected'" if ($fwdfwsettings{'snat'} eq $defaultNetworks{$network}{'NAME'});
+ print ">$network ($defaultNetworks{$network}{'NET'})</option>";
+ }
}
-
print <<END;
</select>
</td>
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 != 2 && $pienumber <= 50 && $pienumber != 0) {
print FILE $myimage->png;
close(FILE);
#####################################################
- print "<table align='center'><tr><td>";
+ print "<div style='text-align:center'>";
print "<img src='/graphs/fwlog-ip$imagerandom.png'>";
- print "</td></tr></table>";
+ print "</div>";
}
print <<END
@@ -408,7 +408,7 @@ print <<END
<th width='10%' align='center' class='boldbase'></th>
<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'ip address'}</b></th>
<th width='10%' align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
-<th width='10%' align='center' class='boldbase'><b>Count</b></th>
+<th width='10%' align='center' class='boldbase'><b>$Lang::tr{'count'}</b></th>
<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
</tr>
END
@@ -439,10 +439,10 @@ for($s=0;$s<$lines;$s++)
my $fcode = lc($ccode);
$color++;
- print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='details'></form></td>";
+ print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
print "<td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></td>";
if ( $fcode ne "" ){
- print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>";}
+ print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode' title='$ccode'></a></td>";}
else {
print "<td align='center' $col></td>";}
print "<td align='center' $col>$value[$s]</td>";
diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/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 != 2 && $pienumber <= 50 && $pienumber != 0) {
print FILE $myimage->png;
close(FILE);
#####################################################
- print "<table align='center'><tr><td>";
+ print "<div style='text-align:center'>";
print "<img src='/graphs/fwlog-port$imagerandom.png'>";
- print "</td></tr></table>";
+ print "</div>";
}
print <<END
-<table width='100%' CLASS='tbl'>
+<table width='100%' class='tbl'>
<tr>
<th width='10%' align='center' class='boldbase'></th>
<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'port'}</b></th>
-<th width='33%' align='center' class='boldbase'><b>count</b></th>
+<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'count'}</b></th>
<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
</tr>
END
@@ -437,7 +437,7 @@ for($s=0;$s<$lines;$s++)
print "<tr>";
$color++;
- print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='details'></form></td>";
+ print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
print "<td align='center' $col>$key[$s]</td>";
print "<td align='center' $col>$value[$s]</td>";
print "<td align='center' $col>$percent</td>";
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' => 'Datei mit Update-Liste konnte nicht geöffnet werden',
'could not open update information file' => 'Datei mit den Update-Information konnte nicht geöffnet werden. Die Update-Datei ist beschädigt.',
'could not retrieve common name from certificate' => 'Der Gemeinsame Name (CN) konnte nicht aus dem Zertifikat gelesen werden.',
+'count' => 'Anzahl',
+'countries' => 'Länder',
'country' => 'Land',
+'countrycode' => 'Kennung',
+'country codes and flags' => 'Länder und Länderkennungen',
'cpu frequency per' => 'CPU-Frequenz pro',
'cpu idle usage' => 'Leerlauf CPU-Nutzung',
'cpu interrupt usage' => 'Interrupt CPU-Nutzung',
@@ -646,6 +650,7 @@
'destination port numbers' => 'Zielport muß ein(e) gültige(r) Portnummer oder Portbereich sein.',
'destination port overlaps' => 'Der Zielportbereich überlappt einen bereits bestehenden Portbereich.',
'detail level' => 'Detaillierungsgrad',
+'details' => 'Mehr',
'device' => 'Gerät',
'devices on blue' => 'Geräte auf Blau',
'dhcp advopt add' => 'DHCP Option hinzufügen',
@@ -901,6 +906,7 @@
'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt',
'fixed ip lease modified' => 'Feste IP-Zuordnung geändert',
'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht',
+'flag' => 'Flagge',
'force update' => 'Aktualisierung erzwingen',
'force user' => 'Standardbenutzer für das UNIX Dateisystem',
'forward firewall' => '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' => 'Could not open installed updates file',
'could not open update information file' => 'Could not open update information file. The update file is corrupt.',
'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.',
+'count' => 'Count',
+'countries' => 'Countries',
'country' => 'Country',
+'countrycode' => 'Code',
+'country codes and flags' => 'Country Codes and Flags:',
'cpu frequency per' => 'CPU frequency per',
'cpu idle usage' => 'Idle CPU Usage',
'cpu interrupt usage' => 'Interrupt CPU Usage',
@@ -668,6 +672,7 @@
'destination port numbers' => 'Destination port must be a valid port number or port range.',
'destination port overlaps' => 'Destination port range overlaps an existing port range.',
'detail level' => 'Detail level',
+'details' => 'Details',
'device' => 'Device',
'devices on blue' => 'Devices on BLUE',
'dhcp advopt add' => 'Add a DHCP option',
@@ -927,6 +932,7 @@
'fixed ip lease added' => 'Fixed IP lease added',
'fixed ip lease modified' => 'Fixed IP lease modified',
'fixed ip lease removed' => 'Fixed IP lease removed',
+'flag' => 'Flag',
'force update' => 'Force update',
'force user' => 'force all new file to user',
'forward firewall' => 'Firewall',
diff --git a/lfs/openssh b/lfs/openssh
index d651162..bc6fa3c 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
include Config
-VER = 6.5p1
+VER = 6.6p1
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a084e7272b8cbd25afe0f5dce4802fef
+$(DL_FILE)_MD5 = 3e9800e6bca1fbac0eea4d41baa7f239
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-03-18 17:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140318170429.3EB1020AF4@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox