Merge ~paelzer/ubuntu/+source/dns-root-data:fix-changed-root-hints-lp-2045297-BIONIC into ubuntu/+source/dns-root-data:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/lp-2045297-dns-root-change/+packages

This is meant to be eventually suggested to security for an ESM update.

[Miriam España Acebal (mirespace)]

Hi Christian, thanks for the MP.

Same as Jammy:

"
Thanks. LGTM, +1.

Checked package versions and that related versions of the root zone are consistent between series in the root.hints file.

Unfortunately, as you know, I couldn't test the packages due to issues with my DNS provider or router.
"

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: paelzer, mirespace
Uploaders: paelzer
MP auto-approved

review: Approve

Unmerged commits

5418033... by Christian Ehrhardt  on 2024-01-29

changelog: update root hints to 2023112702 (LP: #2045297)

Signed-off-by: Christian Ehrhardt <email address hidden>

383700f... by Christian Ehrhardt  on 2024-01-25

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

24e9357... by Imre Jonk on 2023-11-28

update root hints to 2023112702 (LP: #2045297)

This is the change as proposed to Debian right now [1].
Preferring that over the data of today allows us to auto-sync
a potential upload in Debian which would be fine as this is
just a data change following upstream, but not a delta to
be retained.

[1]: https://salsa.debian.org/dns-team/dns-root-data/-/merge_requests/2

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index d7b3640..778ca28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dns-root-data (2023112702~ubuntu0.18.04.1) bionic; urgency=medium
+
+  [ Imre Jonk ]
+  * update root hints to 2023112702
+    (LP: #2045297 Closes: #1054393)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 29 Jan 2024 08:10:05 +0100
+
 dns-root-data (2018013001) unstable; urgency=medium
 
   * new upstream version of root.hints, 2018013001
diff --git a/debian/control b/debian/control
index ed54d5f..2203fdf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: dns-root-data
 Section: misc
 Priority: optional
-Maintainer: dns-root-data packagers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: dns-root-data packagers <[e-mail]>
 Uploaders:
  Daniel Kahn Gillmor <[e-mail]>,
  Ondřej Surý <[e-mail]>,
diff --git a/root.hints b/root.hints
index 3d6b3ba..f729f68 100644
--- a/root.hints
+++ b/root.hints
@@ -8,9 +8,9 @@
 ;           file                /domain/named.cache 
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
-; 
-;       last update:     January 30, 2018 
-;       related version of root zone:     2018013001
+;
+;       last update:     November 27, 2023
+;       related version of root zone:     2023112702
 ; 
 ; FORMERLY NS.INTERNIC.NET 
 ;
@@ -21,8 +21,8 @@ A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
 ; FORMERLY NS1.ISI.EDU 
 ;
 .                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     199.9.14.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:200::b
+B.ROOT-SERVERS.NET.      3600000      A     170.247.170.2
+B.ROOT-SERVERS.NET.      3600000      AAAA  2801:1b8:10::b
 ; 
 ; FORMERLY C.PSI.NET 
 ;
diff --git a/root.hints.sig b/root.hints.sig
new file mode 100644
index 0000000..4dceb7f
Binary files /dev/null and b/root.hints.sig differ