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

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/lp-2045297-dns-root-change
SRU details added to the bug, they should outline all of the background - the change itself is trivial.

The thing to watch for is my proposed versioning.
It is intentionally not ...ubuntu1.
The reasons are outlined in the git commit and the SRU template.
I think this is the best approach, but I'd like to have a second person saying yes before uploading that way.

[Christian Ehrhardt  (paelzer)]

tested against the now built PPA - works as expected

[Robie Basak (racb)]

https://lists.ubuntu.com/archives/ubuntu-devel/2022-May/042099.html is relevant here. I need to review the thread to remind myself what the conclusion was...but can we comply with that?

[Christian Ehrhardt  (paelzer)]

Good call

The conclusion there was maysync to be superior to willsync for ordering with later ubuntu1.
Then some other suggestions like 'u1' or 'distro1', but no clear "it is better" as it just changes who recognizes it well.
+b1 was rules out for ordering.
So there was no final conclusion, but "maysync" is the one with the clearest recommendation.

That indeed is more recognizable as it is used elsewhere and this version would make it clear that this isn't a backport version.

A little twist in this cases is that, being a native version matching the data files content, I need to pick a version that starts with 2023112702. But need to stay ahead if Debian uploads just that version. So I need to use a "~".

=> 2023112702~maysync1

[Christian Ehrhardt  (paelzer)]

Changed the version as requested, and made sure the explanation is also clear in the commit message.

[Robie Basak (racb)]

I'm not sure "maysync1" (or equivalent) is appropriate here. For all you know, the next Debian upload won't include that but will tweak something else and then we'd end up with Ubuntu's package regressing.

It feels like you're trying too hard to avoid the pain of a future sync because the future sync is unnecessarily painful.

Instead, we should ensure that a future sync is low friction. If for example the diff is empty, then we should be comfortable with just syncing it without the overhead of a merge proposal and so forth.

So, IMHO, using the normal pattern of 2023010101ubuntu1 is appropriate in this case.

I've also added one minor comment inline.

I don't feel strongly about either of these points. If you disagree, feel free to upload as-is.

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks I followed the inline suggestions.

For the version, I think this case is more special - the version has to define which data set was used. Therefore I can't stay on anything starting with 2023010101.

Which overall means I chose "If you disagree, feel free to upload as-is."

I added even more explanation to the commit and upload it as 2023112702~maysync1

[Christian Ehrhardt  (paelzer)]

Arrrrr - and in constructing the SRU versions I find that in this case "willsync" would have been superior to "maysync" as the SRUs will have to follow the ubuntu0.$REL.1, they can do so with a ~ to stay before but they can not stay before the "m" of "maysync" easily.

Therefore I'll re-upload to noble with "~willsync1" (it builds superfast and does not trigger too many tests).

diff --git a/debian/changelog b/debian/changelog
index 8ae9a28..0e87177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dns-root-data (2023112702~maysync1) noble; urgency=medium
+
+  [ Imre Jonk ]
+  * update root hints to 2023112702
+    (LP: #2045297 Closes: #1054393)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 25 Jan 2024 11:11:29 +0100
+
 dns-root-data (2023010101) unstable; urgency=medium
 
   * merge current root hints and signatures (same contents as before)
diff --git a/debian/control b/debian/control
index 74d35d1..9686389 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 0e94324..f729f68 100644
--- a/root.hints
+++ b/root.hints
@@ -9,8 +9,8 @@
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:     January 01, 2023
-;       related version of root zone:     2023010101
+;       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
index 4d80700..4dceb7f 100644
Binary files a/root.hints.sig and b/root.hints.sig differ