From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 796aa6b303a20e1e8973e2d52c2544bce4ea6c47
Date: Mon, 12 Oct 2020 10:20:50 +0000
Message-ID: <4C8vpB64L4z2xdC@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8233068555551723038=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============8233068555551723038==
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  796aa6b303a20e1e8973e2d52c2544bce4ea6c47 (commit)
       via  5fe798b52f25a2895dced9e69dafe99491e61b39 (commit)
       via  add03100a51eb6d9b898b7bde1b760b77e872635 (commit)
       via  63d55ec0c9b8bfda704e85ee2dcb4cecb81fb972 (commit)
       via  dd4093dcf32b03b00e4b90e463eec9253a269c82 (commit)
       via  b98d3a7e109640acc2b51db0943b2f958e33f2e1 (commit)
       via  14f02911df1c4315df69c523712c7c086f06aa14 (commit)
      from  e0aad107b540d9b716218b6035de24a776ef6322 (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 796aa6b303a20e1e8973e2d52c2544bce4ea6c47
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 12 10:15:59 2020 +0000

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

commit 5fe798b52f25a2895dced9e69dafe99491e61b39
Author: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
Date:   Fri Oct 9 19:20:32 2020 +0000

    tor.cgi: fix calling Perl location module functions
   =20
    The second version of this patch avoids re-defining $db_handle.
   =20
    Fixes: #12492
   =20
    Cc: Stefan Schantl <stefan.schantl(a)ipfire.org
    Signed-off-by: Peter M=C3=BCller <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 add03100a51eb6d9b898b7bde1b760b77e872635
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sun Oct 11 18:54:19 2020 +0200

    nano: Update to 5.3
   =20
    For details see:
    https://www.nano-editor.org/news.php
   =20
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 63d55ec0c9b8bfda704e85ee2dcb4cecb81fb972
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 12 10:07:27 2020 +0000

    core152: Ship knot
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit dd4093dcf32b03b00e4b90e463eec9253a269c82
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sun Oct 11 18:50:24 2020 +0200

    knot: Update to 3.0.1
   =20
    For details see:
    https://www.knot-dns.cz/2020-10-10-version-301.html
   =20
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b98d3a7e109640acc2b51db0943b2f958e33f2e1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 12 10:06:22 2020 +0000

    core152: Ship unbound
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 14f02911df1c4315df69c523712c7c086f06aa14
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sun Oct 11 18:44:46 2020 +0200

    unbound: Update to 1.12.0
   =20
    For details see:
    https://lists.nlnetlabs.nl/pipermail/unbound-users/2020-October/006979.ht=
ml
   =20
    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/common/unbound                              | 2 +-
 config/rootfiles/{oldcore/128 =3D> core/152}/filelists/knot    | 0
 config/rootfiles/{oldcore/106 =3D> core/152}/filelists/unbound | 0
 config/rootfiles/core/152/update.sh                          | 1 +
 config/rootfiles/packages/nano                               | 8 --------
 html/cgi-bin/tor.cgi                                         | 5 ++---
 lfs/knot                                                     | 4 ++--
 lfs/nano                                                     | 6 +++---
 lfs/tor                                                      | 2 +-
 lfs/unbound                                                  | 4 ++--
 10 files changed, 12 insertions(+), 20 deletions(-)
 copy config/rootfiles/{oldcore/128 =3D> core/152}/filelists/knot (100%)
 copy config/rootfiles/{oldcore/106 =3D> core/152}/filelists/unbound (100%)

Difference in files:
diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index bed1eef6a..f24c4f136 100644
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
 #usr/lib/libunbound.la
 #usr/lib/libunbound.so
 usr/lib/libunbound.so.8
-usr/lib/libunbound.so.8.1.9
+usr/lib/libunbound.so.8.1.10
 #usr/lib/pkgconfig/libunbound.pc
 usr/sbin/unbound
 usr/sbin/unbound-anchor
diff --git a/config/rootfiles/core/152/filelists/knot b/config/rootfiles/core=
/152/filelists/knot
new file mode 120000
index 000000000..28e96f878
--- /dev/null
+++ b/config/rootfiles/core/152/filelists/knot
@@ -0,0 +1 @@
+../../../common/knot
\ No newline at end of file
diff --git a/config/rootfiles/core/152/filelists/unbound b/config/rootfiles/c=
ore/152/filelists/unbound
new file mode 120000
index 000000000..66adf0924
--- /dev/null
+++ b/config/rootfiles/core/152/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/152/update.sh b/config/rootfiles/core/152/=
update.sh
index 5a667aa36..5a1fa5c6d 100644
--- a/config/rootfiles/core/152/update.sh
+++ b/config/rootfiles/core/152/update.sh
@@ -48,6 +48,7 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
=20
 # Start services
+/etc/init.d/unbound restart
=20
 # This update needs a reboot...
 #touch /var/run/need_reboot
diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano
index 17ff80d02..2c63c44a3 100644
--- a/config/rootfiles/packages/nano
+++ b/config/rootfiles/packages/nano
@@ -21,12 +21,9 @@ usr/share/nano/c.nanorc
 #usr/share/nano/changelog.nanorc
 usr/share/nano/cmake.nanorc
 usr/share/nano/css.nanorc
-usr/share/nano/debian.nanorc
 usr/share/nano/default.nanorc
 usr/share/nano/elisp.nanorc
 #usr/share/nano/email.nanorc
-usr/share/nano/fortran.nanorc
-usr/share/nano/gentoo.nanorc
 #usr/share/nano/go.nanorc
 usr/share/nano/groff.nanorc
 usr/share/nano/guile.nanorc
@@ -38,8 +35,6 @@ usr/share/nano/java.nanorc
 usr/share/nano/makefile.nanorc
 usr/share/nano/man.nanorc
 #usr/share/nano/markdown.nanorc
-usr/share/nano/mgp.nanorc
-usr/share/nano/mutt.nanorc
 usr/share/nano/nanohelp.nanorc
 usr/share/nano/nanorc.nanorc
 usr/share/nano/nftables.nanorc
@@ -49,13 +44,10 @@ usr/share/nano/patch.nanorc
 usr/share/nano/perl.nanorc
 usr/share/nano/php.nanorc
 usr/share/nano/po.nanorc
-usr/share/nano/postgresql.nanorc
-usr/share/nano/pov.nanorc
 usr/share/nano/python.nanorc
 usr/share/nano/ruby.nanorc
 usr/share/nano/rust.nanorc
 usr/share/nano/sh.nanorc
-usr/share/nano/spec.nanorc
 #usr/share/nano/sql.nanorc
 usr/share/nano/tcl.nanorc
 usr/share/nano/tex.nanorc
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=3D'TOR_EXIT_COUNTRY'>
 						<option value=3D''>- $Lang::tr{'tor exit country any'} -</option>
 END
-
-		my @country_codes =3D &Location::database_countries();
+		my @country_codes =3D &Location::database_countries($db_handle);
 		foreach my $country_code (@country_codes) {
 			# Convert country code into upper case format.
 			$country_code =3D uc($country_code);
=20
 			# Get country name.
-			my $country_name =3D &Location::Functions::get_country_name($country_code=
);
+			my $country_name =3D &Location::Functions::get_full_country_name($country=
_code);
=20
 			print "<option value=3D'$country_code'";
=20
diff --git a/lfs/knot b/lfs/knot
index 153a9841b..e1fb0fac7 100644
--- a/lfs/knot
+++ b/lfs/knot
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 3.0.0
+VER        =3D 3.0.1
=20
 THISAPP    =3D knot-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D a49754adf3b76db78df678f2cb87fc54
+$(DL_FILE)_MD5 =3D 7dc32e034bab142c7a0fcf6d531ee881
=20
 install : $(TARGET)
=20
diff --git a/lfs/nano b/lfs/nano
index c65a4e408..36a1e25d9 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 5.2
+VER        =3D 5.3
=20
 THISAPP    =3D nano-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D nano
-PAK_VER    =3D 32
+PAK_VER    =3D 33
=20
 DEPS       =3D ""
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 7bde1cb929be2a7596ff207afc68d218
+$(DL_FILE)_MD5 =3D 0ff50c2d3068c6ce9e77b1f6a485eb19
=20
 install : $(TARGET)
=20
diff --git a/lfs/tor b/lfs/tor
index 322d706ce..7525445f5 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D tor
-PAK_VER    =3D 51
+PAK_VER    =3D 52
=20
 DEPS       =3D libseccomp
=20
diff --git a/lfs/unbound b/lfs/unbound
index 5ad3b4e60..5ffadff9b 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 1.11.0
+VER        =3D 1.12.0
=20
 THISAPP    =3D unbound-$(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 528dcf9bb9aa693a14f9ad5bab417b85
+$(DL_FILE)_MD5 =3D eb03869cea5dd2b65e21ca068e78d6b0
=20
 install : $(TARGET)
=20


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

--===============8233068555551723038==--