[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2158e11ba983abbc747907d35d9fe36ca4295276

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2158e11ba983abbc747907d35d9fe36ca4295276

[git]

[-- Attachment #1: Type: text/plain, Size: 6874 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  2158e11ba983abbc747907d35d9fe36ca4295276 (commit)
       via  cffa84a64e96766a849ef660cb4493069ad90f63 (commit)
       via  a9a28430b5bce4f43fafd13f60b2e068eca1ea9a (commit)
       via  a18b5b4f4d383aaf132ff9e10fd3c9345d74d933 (commit)
       via  4504c412af12293e1500217a87e530a1eaa6f224 (commit)
      from  01714866956b71bea0944cece60d2030861263f3 (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 2158e11ba983abbc747907d35d9fe36ca4295276
Author: Larsen <larsen007(a)web.de>
Date:   Sat Oct 10 23:24:16 2015 +0200

    IPSec VPN: Add "required" marker for "organization name"
    
    IPSec VPN: Add "required" marker for "organization name"
    
    Fixes https://bugzilla.ipfire.org/show_bug.cgi?id=10846
    
    Signed-off-by: Lars Schuhmacher <larsen007(a)web.de>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit cffa84a64e96766a849ef660cb4493069ad90f63
Author: Larsen <larsen007(a)web.de>
Date:   Sat Oct 10 23:07:19 2015 +0200

    Translation improvements
    
    Translation improvements
    
    Signed-off-by: Lars Schuhmacher <larsen007(a)web.de>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a9a28430b5bce4f43fafd13f60b2e068eca1ea9a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sat Oct 10 18:07:38 2015 +0200

    tor.cgi: Fix missing country flag icons.
    
    The CGI now is using the GeoIP::get_flag_icon function provided by the
    geoip-functions.pl, which takes care of the changed flag icons shipped
    by core update 90.
    
    Fixes #10919.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Tested-by: Jan Paul Tuecking <jan.paul.tuecking(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a18b5b4f4d383aaf132ff9e10fd3c9345d74d933
Merge: 4504c41 0171486
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Oct 15 11:59:44 2015 +0100

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 4504c412af12293e1500217a87e530a1eaa6f224
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Oct 3 19:53:57 2015 +0100

    procps: Ship pgrep
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/procps |  2 +-
 html/cgi-bin/tor.cgi           | 11 ++++++++---
 html/cgi-bin/vpnmain.cgi       |  2 +-
 langs/de/cgi-bin/de.pl         |  4 ++--
 lfs/tor                        |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps
index d5e5ad3..2863167 100644
--- a/config/rootfiles/common/procps
+++ b/config/rootfiles/common/procps
@@ -3,7 +3,7 @@ bin/ps
 lib/libproc-3.2.6.so
 sbin/sysctl
 usr/bin/free
-#usr/bin/pgrep
+usr/bin/pgrep
 #usr/bin/pkill
 #usr/bin/pmap
 #usr/bin/pwdx
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 91f4b45..193e405 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -27,6 +27,7 @@ use warnings;
 use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/geoip-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -619,10 +620,14 @@ END
 END
 
 				if (exists($node->{'country_code'})) {
-					if (!$node->{'country_code'} or $node->{'country_code'} eq '??') {
-						print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
+					# Get the flag icon of the country.
+					my $flag_icon = &GeoIP::get_flag_icon($node->{'country_code'});
+
+					# Check if a flag for the given country is available.
+					if ($flag_icon) {
+						print "<a href='country.cgi#$node->{'country_code'}'><img src='$flag_icon' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
 					} else {
-						print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
+						print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
 					}
 				}
 
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index b697b0a..f1cffb8 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -2077,7 +2077,7 @@ END
 			<td class='base'>$Lang::tr{'users department'}:</td>
 			<td class='base' nowrap='nowrap'><input type='text' name='CERT_OU' value='$cgiparams{'CERT_OU'}' size='32' $cakeydisabled /></td></tr>
 		<tr><td>&nbsp;</td>
-			<td class='base'>$Lang::tr{'organization name'}:</td>
+			<td class='base'>$Lang::tr{'organization name'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
 			<td class='base' nowrap='nowrap'><input type='text' name='CERT_ORGANIZATION' value='$cgiparams{'CERT_ORGANIZATION'}' size='32' $cakeydisabled /></td></tr>
 		<tr><td>&nbsp;</td>
 			<td class='base'>$Lang::tr{'city'}:</td>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a3c8228..e952de2 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2569,11 +2569,11 @@
 'urlfilter whitelist always allowed' => 'Erlaube angepasste Whitelist für gesperrte Clients',
 'urlfilter wrong filetype' => 'Die Datei hat nicht die Erweiterung .tar.gz',
 'use' => 'Einsatz',
-'use a pre-shared key' => 'Verwenden Sie einen Pre-Shared Schlüssel:',
+'use a pre-shared key' => 'Pre-Shared-Key verwenden:',
 'use dov' => 'DOV (Data Over Voice) benutzen:',
 'use ibod' => 'Bandwidth on Demand (iBOD) benutzen:',
 'use ipfire red ip' => 'Die klassische ROTE IP, welche von IPFire während der Verbindung verwendet wird',
-'use only proposed settings' => 'Verwenden Sie nur die vorgeschlagenen Einstellungen.',
+'use only proposed settings' => 'Nur die vorgeschlagenen Einstellungen verwenden',
 'used' => 'Benutzt',
 'used memory' => 'Genutzter Speicher',
 'used swap' => 'Genutzter Swap',
diff --git a/lfs/tor b/lfs/tor
index c21e4b4..91eab09 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = ""
 


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