[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 642557e23ba6c1bcab7e654569a35a5f4e6e8acc

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4171 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, master has been updated
       via  642557e23ba6c1bcab7e654569a35a5f4e6e8acc (commit)
       via  e706f87eedf75f786530815fe149b2b8dca070c2 (commit)
       via  a836a2787c2f6ad50c3a3058b21fc961ef497406 (commit)
       via  decb7e61f19047ea6eb2dc1402efa46e581a8a0c (commit)
      from  a9f69cbf01cd306dbc20c5761eedcdd97bc492e8 (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 642557e23ba6c1bcab7e654569a35a5f4e6e8acc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 12 10:15:59 2020 +0000

    tor: Bump release
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit e706f87eedf75f786530815fe149b2b8dca070c2
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Fri Oct 9 19:20:32 2020 +0000

    tor.cgi: fix calling Perl location module functions
    
    The second version of this patch avoids re-defining $db_handle.
    
    Fixes: #12492
    
    Cc: Stefan Schantl <stefan.schantl(a)ipfire.org
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
    Acked-By: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a836a2787c2f6ad50c3a3058b21fc961ef497406
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 12 20:07:30 2020 +0000

    core151: Remove multiple calls of rm
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit decb7e61f19047ea6eb2dc1402efa46e581a8a0c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Mon Oct 12 20:28:31 2020 +0200

    update.sh: Delete obsolete files from Net-DNS 1.25
    
    Fixes Bug #12491
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/151/update.sh | 4 +++-
 html/cgi-bin/tor.cgi                | 5 ++---
 lfs/tor                             | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh
index 699528274..5fb05488b 100644
--- a/config/rootfiles/core/151/update.sh
+++ b/config/rootfiles/core/151/update.sh
@@ -33,7 +33,9 @@ done
 
 # Remove files
 rm -rfv \
-	/usr/lib/perl5/site_perl/5.30.0/Locale
+	/usr/lib/perl5/site_perl/5.30.0/Locale \
+	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS \
+	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS.pm
 
 # Stop services
 /etc/init.d/ipsec stop
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 28dec6cf0..7447bd791 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -322,14 +322,13 @@ END
 					<select name='TOR_EXIT_COUNTRY'>
 						<option value=''>- $Lang::tr{'tor exit country any'} -</option>
 END
-
-		my @country_codes = &Location::database_countries();
+		my @country_codes = &Location::database_countries($db_handle);
 		foreach my $country_code (@country_codes) {
 			# Convert country code into upper case format.
 			$country_code = uc($country_code);
 
 			# Get country name.
-			my $country_name = &Location::Functions::get_country_name($country_code);
+			my $country_name = &Location::Functions::get_full_country_name($country_code);
 
 			print "<option value='$country_code'";
 
diff --git a/lfs/tor b/lfs/tor
index 322d706ce..7525445f5 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    = 51
+PAK_VER    = 52
 
 DEPS       = libseccomp
 


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