From decb7e61f19047ea6eb2dc1402efa46e581a8a0c Mon Sep 17 00:00:00 2001
From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Mon, 12 Oct 2020 20:28:31 +0200
Subject: [PATCH 1/4] update.sh: Delete obsolete files from Net-DNS 1.25

Fixes Bug #12491

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/core/151/update.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh
index 699528274..fa7e3a3bf 100644
--- a/config/rootfiles/core/151/update.sh
+++ b/config/rootfiles/core/151/update.sh
@@ -34,6 +34,10 @@ done
 # Remove files
 rm -rfv \
 	/usr/lib/perl5/site_perl/5.30.0/Locale
+rm -rfv \
+	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS
+rm -fv \
+	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS.pm
 
 # Stop services
 /etc/init.d/ipsec stop

From a836a2787c2f6ad50c3a3058b21fc961ef497406 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Oct 2020 20:07:30 +0000
Subject: [PATCH 2/4] core151: Remove multiple calls of rm

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/core/151/update.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh
index fa7e3a3bf..5fb05488b 100644
--- a/config/rootfiles/core/151/update.sh
+++ b/config/rootfiles/core/151/update.sh
@@ -33,10 +33,8 @@ done
 
 # Remove files
 rm -rfv \
-	/usr/lib/perl5/site_perl/5.30.0/Locale
-rm -rfv \
-	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS
-rm -fv \
+	/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

From e706f87eedf75f786530815fe149b2b8dca070c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20M=C3=BCller?= <peter.mueller@ipfire.org>
Date: Fri, 9 Oct 2020 19:20:32 +0000
Subject: [PATCH 3/4] tor.cgi: fix calling Perl location module functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The second version of this patch avoids re-defining $db_handle.

Fixes: #12492

Cc: Stefan Schantl <stefan.schantl@ipfire.org
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Acked-By: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 html/cgi-bin/tor.cgi | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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'";
 

From 642557e23ba6c1bcab7e654569a35a5f4e6e8acc Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Oct 2020 10:15:59 +0000
Subject: [PATCH 4/4] tor: Bump release

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/tor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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