From c19fe25133cbd15fa633f47cce34a752a9fa5dbe Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 11:58:59 +0100
Subject: [PATCH 01/38] Update Cargo.lock

---
 Cargo.lock | 690 ++++++++++++++++++-----------------------------------
 1 file changed, 234 insertions(+), 456 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ce1c03a9..ed132794 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,26 +2,11 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -32,12 +17,6 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -49,9 +28,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.20"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -64,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 
 [[package]]
 name = "anstyle-parse"
@@ -79,22 +58,22 @@ dependencies = [
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.10"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -120,26 +99,11 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "bitflags"
-version = "2.9.3"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "bumpalo"
@@ -149,32 +113,32 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
 [[package]]
 name = "cc"
-version = "1.2.34"
+version = "1.2.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
+checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a"
 dependencies = [
+ "find-msvc-tools",
  "shlex",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
@@ -184,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.46"
+version = "4.5.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57"
+checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -194,9 +158,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.46"
+version = "4.5.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41"
+checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
 dependencies = [
  "anstream",
  "anstyle",
@@ -207,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.45"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -219,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "colorchoice"
@@ -240,9 +204,9 @@ dependencies = [
 
 [[package]]
 name = "const_format"
-version = "0.2.34"
+version = "0.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
+checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad"
 dependencies = [
  "const_format_proc_macros",
 ]
@@ -300,9 +264,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
 ]
@@ -315,7 +279,7 @@ checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
 [[package]]
 name = "dnst"
-version = "0.1.1-dev"
+version = "0.1.1-rc1"
 dependencies = [
  "bytes",
  "chrono",
@@ -387,14 +351,20 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
 [[package]]
 name = "errno"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -424,6 +394,12 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -476,20 +452,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "generator"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "605183a538e3e2a9c1038635cc5c2d194e2ee8fd0d1b66b8349fad7dbacce5a2"
-dependencies = [
- "cc",
- "cfg-if",
- "libc",
- "log",
- "rustversion",
- "windows",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.16"
@@ -498,27 +460,21 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.3+wasi-0.2.4",
+ "wasip2",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -536,9 +492,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -558,17 +514,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "io-uring"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "is_ci"
 version = "1.2.0"
@@ -577,9 +522,9 @@ checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "itoa"
@@ -589,22 +534,22 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiff"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
 dependencies = [
  "jiff-static",
  "log",
  "portable-atomic",
  "portable-atomic-util",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "jiff-static"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -613,9 +558,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -635,110 +580,85 @@ checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7"
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-
-[[package]]
-name = "loom"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "tracing",
- "tracing-subscriber",
-]
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
-]
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "mio"
-version = "1.0.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "moka"
-version = "0.12.10"
+version = "0.12.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926"
+checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077"
 dependencies = [
  "async-lock",
  "crossbeam-channel",
  "crossbeam-epoch",
  "crossbeam-utils",
+ "equivalent",
  "event-listener",
  "futures-util",
- "loom",
  "parking_lot",
  "portable-atomic",
  "rustc_version",
  "smallvec",
  "tagptr",
- "thiserror",
  "uuid",
 ]
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -756,15 +676,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "octseq"
 version = "0.5.2"
@@ -784,15 +695,15 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "once_cell_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "openssl"
-version = "0.10.73"
+version = "0.10.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -816,18 +727,18 @@ dependencies = [
 
 [[package]]
 name = "openssl-src"
-version = "300.5.2+3.5.2"
+version = "300.5.4+3.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d270b79e2926f5150189d475bc7e9d2c69f9c4697b185fa917d5a32b792d21b4"
+checksum = "a507b3792995dae9b0df8a1c1e3771e8418b7c2d9f0baeba32e6fe8b06c7cb72"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.109"
+version = "0.9.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
 dependencies = [
  "cc",
  "libc",
@@ -836,12 +747,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -850,9 +755,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -860,15 +765,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -931,18 +836,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
@@ -1005,56 +910,41 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.17"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.2"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.10",
- "regex-syntax 0.8.6",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.6",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "ring"
@@ -1070,12 +960,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
-
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
@@ -1087,15 +971,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.8"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
  "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1104,12 +988,6 @@ version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -1127,24 +1005,34 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1186,12 +1074,12 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1211,9 +1099,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1228,15 +1116,15 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
 
 [[package]]
 name = "tempfile"
-version = "3.21.0"
+version = "3.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
  "fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1255,26 +1143,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e7a7de15468c6e65dd7db81cf3822c1ec94c71b2a3c1a976ea8e4696c91115c"
 
-[[package]]
-name = "thiserror"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.1.9"
@@ -1286,9 +1154,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
  "deranged",
  "itoa",
@@ -1301,15 +1169,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
@@ -1317,27 +1185,24 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.47.1"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
  "bytes",
- "io-uring",
  "libc",
  "mio",
  "pin-project-lite",
- "slab",
  "socket2",
  "tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1357,9 +1222,9 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -1369,9 +1234,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1380,9 +1245,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -1401,14 +1266,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -1419,9 +1284,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-xid"
@@ -1443,11 +1308,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.18.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "js-sys",
  "wasm-bindgen",
 ]
@@ -1471,45 +1336,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.3+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
  "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1517,75 +1369,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.61.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
-dependencies = [
- "windows-collections",
- "windows-core",
- "windows-future",
- "windows-link",
- "windows-numerics",
-]
-
-[[package]]
-name = "windows-collections"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
-dependencies = [
- "windows-core",
-]
-
 [[package]]
 name = "windows-core"
-version = "0.61.2"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
@@ -1594,22 +1402,11 @@ dependencies = [
  "windows-strings",
 ]
 
-[[package]]
-name = "windows-future"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
-dependencies = [
- "windows-core",
- "windows-link",
- "windows-threading",
-]
-
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1618,9 +1415,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1629,34 +1426,24 @@ dependencies = [
 
 [[package]]
 name = "windows-link"
-version = "0.1.3"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-numerics"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
-dependencies = [
- "windows-core",
- "windows-link",
-]
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-result"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
  "windows-link",
 ]
@@ -1672,20 +1459,20 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.59.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets 0.53.5",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.60.2"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-targets 0.53.3",
+ "windows-link",
 ]
 
 [[package]]
@@ -1706,28 +1493,19 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.3"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
-dependencies = [
- "windows-link",
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
-[[package]]
-name = "windows-threading"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
  "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
@@ -1738,9 +1516,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1750,9 +1528,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1762,9 +1540,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -1774,9 +1552,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1786,9 +1564,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1798,9 +1576,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1810,9 +1588,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1822,15 +1600,15 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "wit-bindgen"
-version = "0.45.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "yansi"
@@ -1840,18 +1618,18 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.26"
+version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "4ea879c944afe8a2b25fef16bb4ba234f47c694565e97383b36f3a878219065c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "cf955aa904d6040f70dc8e9384444cb1030aed272ba3cb09bbc4ab9e7c1f34f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1860,6 +1638,6 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"

From 5b16801aa2eff2e3b416cbf9a9347da830c16d04 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 16:45:36 +0100
Subject: [PATCH 02/38] Move ldns obsoletion to separate package

---
 .github/workflows/pkg.yml                     | 11 ++++
 Cargo.toml                                    | 23 ---------
 pkg/debian/postinst                           |  7 ---
 pkg/debian/prerm                              |  4 +-
 pkg/dnst-ldnsutils/Cargo.lock                 |  7 +++
 pkg/dnst-ldnsutils/Cargo.toml                 | 51 +++++++++++++++++++
 pkg/dnst-ldnsutils/pkg/debian/postinst        | 13 +++++
 pkg/dnst-ldnsutils/pkg/debian/prerm           | 13 +++++
 pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml    | 40 +++++++++++++++
 .../pkg/rules/packages-to-build.yml           | 33 ++++++++++++
 .../pkg/rules/packages-to-test.yml            | 50 ++++++++++++++++++
 .../pkg/test-scripts/test-dnst-ldnsutils.sh   | 21 ++++++++
 pkg/dnst-ldnsutils/src/main.rs                |  1 +
 pkg/rpm/scriptlets.toml                       | 20 --------
 pkg/test-scripts/test-dnst.sh                 |  8 +--
 15 files changed, 242 insertions(+), 60 deletions(-)
 create mode 100644 pkg/dnst-ldnsutils/Cargo.lock
 create mode 100644 pkg/dnst-ldnsutils/Cargo.toml
 create mode 100644 pkg/dnst-ldnsutils/pkg/debian/postinst
 create mode 100644 pkg/dnst-ldnsutils/pkg/debian/prerm
 create mode 100644 pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
 create mode 100644 pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
 create mode 100644 pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
 create mode 100644 pkg/dnst-ldnsutils/pkg/test-scripts/test-dnst-ldnsutils.sh
 create mode 100644 pkg/dnst-ldnsutils/src/main.rs

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 18d5cd5e..6d231d7a 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -31,3 +31,14 @@ jobs:
       deb_extra_build_packages: libssl-dev
       rpm_extra_build_packages: make openssl-devel
       rpm_scriptlets_path: pkg/rpm/scriptlets.toml
+
+    # Package empty dnst-ldnsutils package to create symlinks
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
+    with:
+      package_build_rules: pkg/dnst-ldnsutils/pkg/rules/ldns_packages-to-build.yml
+      package_test_rules: pkg/dnst-ldnsutils/pkg/rules/ldns_packages-to-test.yml
+      package_test_scripts_path: pkg/dnst-ldnsutils/pkg/test-scripts/test-<package>.sh
+
+      rpm_scriptlets_path: pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
+
+      manifest_dir: pkg/dnst-ldnsutils
diff --git a/Cargo.toml b/Cargo.toml
index 77e70739..91e58a7e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -90,19 +90,10 @@ assets = [
     ["doc/manual/build/man/dnst-nsec3-hash.1", "/usr/share/man/man1/dnst-nsec3-hash.1", "644"],
     ["doc/manual/build/man/dnst-signzone.1", "/usr/share/man/man1/dnst-signzone.1", "644"],
     ["doc/manual/build/man/dnst-update.1", "/usr/share/man/man1/dnst-update.1", "644"],
-    ["doc/manual/build/man/ldns-key2ds.1", "/usr/share/man/man1/ldns-key2ds.1", "644"],
-    ["doc/manual/build/man/ldns-keygen.1", "/usr/share/man/man1/ldns-keygen.1", "644"],
-    ["doc/manual/build/man/ldns-notify.1", "/usr/share/man/man1/ldns-notify.1", "644"],
-    ["doc/manual/build/man/ldns-nsec3-hash.1", "/usr/share/man/man1/ldns-nsec3-hash.1", "644"],
-    ["doc/manual/build/man/ldns-signzone.1", "/usr/share/man/man1/ldns-signzone.1", "644"],
-    ["doc/manual/build/man/ldns-update.1", "/usr/share/man/man1/ldns-update.1", "644"],
 ]
 changelog = "target/debian/changelog" # this will be generated by the pkg workflow
 copyright = "Copyright (c) 2024, NLnet Labs. All rights reserved."
 maintainer-scripts = "pkg/debian"
-# See: https://www.debian.org/doc/debian-policy/ch-relationships.html#replacing-whole-packages-forcing-their-removal
-conflicts = "ldnsutils"
-replaces = "ldnsutils"
 
 # Related reading: https://docs.fedoraproject.org/en-US/packaging-guidelines/Rust/
 [package.metadata.generate-rpm]
@@ -116,18 +107,4 @@ assets = [
     { source = "doc/manual/build/man/dnst-nsec3-hash.1", dest = "/usr/share/man/man1/dnst-nsec3-hash.1", mode = "644", doc = true },
     { source = "doc/manual/build/man/dnst-signzone.1", dest = "/usr/share/man/man1/dnst-signzone.1", mode = "644", doc = true },
     { source = "doc/manual/build/man/dnst-update.1", dest = "/usr/share/man/man1/dnst-update.1", mode = "644", doc = true },
-    { source = "doc/manual/build/man/ldns-key2ds.1", dest = "/usr/share/man/man1/ldns-key2ds.1", mode = "644", doc = true },
-    { source = "doc/manual/build/man/ldns-keygen.1", dest = "/usr/share/man/man1/ldns-keygen.1", mode = "644", doc = true },
-    { source = "doc/manual/build/man/ldns-notify.1", dest = "/usr/share/man/man1/ldns-notify.1", mode = "644", doc = true },
-    { source = "doc/manual/build/man/ldns-nsec3-hash.1", dest = "/usr/share/man/man1/ldns-nsec3-hash.1", mode = "644", doc = true },
-    { source = "doc/manual/build/man/ldns-signzone.1", dest = "/usr/share/man/man1/ldns-signzone.1", mode = "644", doc = true },
-    { source = "doc/manual/build/man/ldns-update.1", dest = "/usr/share/man/man1/ldns-update.1", mode = "644", doc = true },
 ]
-
-# These get set using cargo-generate-rpm --set-metadata at package build time.
-#post_trans_script = ...
-#post_uninstall_script = ...
-
-# Set Obsoletes per https://docs.fedoraproject.org/en-US/packaging-guidelines/#renaming-or-replacing-existing-packages.
-[package.metadata.generate-rpm.obsoletes]
-ldns-utils = "< 0:1.8.4-2"
diff --git a/pkg/debian/postinst b/pkg/debian/postinst
index 86017a67..36b2e691 100644
--- a/pkg/debian/postinst
+++ b/pkg/debian/postinst
@@ -2,12 +2,5 @@
 
 case "$1" in
 configure)
-    # Create symbolic links
-    ln -f -s /usr/bin/dnst /usr/bin/ldns-keygen
-    ln -f -s /usr/bin/dnst /usr/bin/ldns-key2ds
-    ln -f -s /usr/bin/dnst /usr/bin/ldns-nsec3-hash
-    ln -f -s /usr/bin/dnst /usr/bin/ldns-notify
-    ln -f -s /usr/bin/dnst /usr/bin/ldns-signzone
-    ln -f -s /usr/bin/dnst /usr/bin/ldns-update
     ;;
 esac
diff --git a/pkg/debian/prerm b/pkg/debian/prerm
index 5644fb2f..22863486 100644
--- a/pkg/debian/prerm
+++ b/pkg/debian/prerm
@@ -2,7 +2,5 @@
 
 case "$1" in
 upgrade|remove)
-    # Remove symbolic links
-    rm -f /usr/bin/ldns-nsec3-hash
     ;;
-esac
\ No newline at end of file
+esac
diff --git a/pkg/dnst-ldnsutils/Cargo.lock b/pkg/dnst-ldnsutils/Cargo.lock
new file mode 100644
index 00000000..6fce324e
--- /dev/null
+++ b/pkg/dnst-ldnsutils/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "dnst-ldnsutils"
+version = "0.1.1-rc1"
diff --git a/pkg/dnst-ldnsutils/Cargo.toml b/pkg/dnst-ldnsutils/Cargo.toml
new file mode 100644
index 00000000..121b2a19
--- /dev/null
+++ b/pkg/dnst-ldnsutils/Cargo.toml
@@ -0,0 +1,51 @@
+[package]
+# This is a dummy program to build a separate package with ploutos
+name = "dnst-ldnsutils"
+version = "0.1.1-rc1"
+edition = "2021"
+repository = "https://github.com/nlnetlabs/dnst/"
+authors = ["NLnet Labs <dns-team@nlnetlabs.nl>"]
+description = "Package for dnst's ldns symlinks and man pages"
+license = "BSD-3-Clause"
+
+[dependencies]
+
+# Related reading: https://wiki.debian.org/Teams/RustPackaging/Policy
+[package.metadata.deb]
+depends = "$auto, dnst"
+section = "net"
+priority = "optional"
+assets = [
+    # TODO: Extend Ploutos to generate the man pages from sources.
+    ["../../doc/manual/build/man/ldns-key2ds.1", "/usr/share/man/man1/ldns-key2ds.1", "644"],
+    ["../../doc/manual/build/man/ldns-keygen.1", "/usr/share/man/man1/ldns-keygen.1", "644"],
+    ["../../doc/manual/build/man/ldns-notify.1", "/usr/share/man/man1/ldns-notify.1", "644"],
+    ["../../doc/manual/build/man/ldns-nsec3-hash.1", "/usr/share/man/man1/ldns-nsec3-hash.1", "644"],
+    ["../../doc/manual/build/man/ldns-signzone.1", "/usr/share/man/man1/ldns-signzone.1", "644"],
+    ["../../doc/manual/build/man/ldns-update.1", "/usr/share/man/man1/ldns-update.1", "644"],
+]
+changelog = "target/debian/changelog" # this will be generated by the pkg workflow
+copyright = "Copyright (c) 2024, NLnet Labs. All rights reserved."
+maintainer-scripts = "pkg/debian"
+# See: https://www.debian.org/doc/debian-policy/ch-relationships.html#replacing-whole-packages-forcing-their-removal
+conflicts = "ldnsutils"
+replaces = "ldnsutils"
+
+# Related reading: https://docs.fedoraproject.org/en-US/packaging-guidelines/Rust/
+[package.metadata.generate-rpm]
+assets = [
+    # TODO: Extend Ploutos to generate the man pages from sources.
+    { source = "../../doc/manual/build/man/ldns-key2ds.1", dest = "/usr/share/man/man1/ldns-key2ds.1", mode = "644", doc = true },
+    { source = "../../doc/manual/build/man/ldns-keygen.1", dest = "/usr/share/man/man1/ldns-keygen.1", mode = "644", doc = true },
+    { source = "../../doc/manual/build/man/ldns-notify.1", dest = "/usr/share/man/man1/ldns-notify.1", mode = "644", doc = true },
+    { source = "../../doc/manual/build/man/ldns-nsec3-hash.1", dest = "/usr/share/man/man1/ldns-nsec3-hash.1", mode = "644", doc = true },
+    { source = "../../doc/manual/build/man/ldns-signzone.1", dest = "/usr/share/man/man1/ldns-signzone.1", mode = "644", doc = true },
+    { source = "../../doc/manual/build/man/ldns-update.1", dest = "/usr/share/man/man1/ldns-update.1", mode = "644", doc = true },
+]
+
+[package.metadata.generate-rpm.requires]
+dnst = "*"
+
+# Set Obsoletes per https://docs.fedoraproject.org/en-US/packaging-guidelines/#renaming-or-replacing-existing-packages.
+[package.metadata.generate-rpm.obsoletes]
+ldns-utils = "< 0:1.8.4-2"
diff --git a/pkg/dnst-ldnsutils/pkg/debian/postinst b/pkg/dnst-ldnsutils/pkg/debian/postinst
new file mode 100644
index 00000000..86017a67
--- /dev/null
+++ b/pkg/dnst-ldnsutils/pkg/debian/postinst
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+case "$1" in
+configure)
+    # Create symbolic links
+    ln -f -s /usr/bin/dnst /usr/bin/ldns-keygen
+    ln -f -s /usr/bin/dnst /usr/bin/ldns-key2ds
+    ln -f -s /usr/bin/dnst /usr/bin/ldns-nsec3-hash
+    ln -f -s /usr/bin/dnst /usr/bin/ldns-notify
+    ln -f -s /usr/bin/dnst /usr/bin/ldns-signzone
+    ln -f -s /usr/bin/dnst /usr/bin/ldns-update
+    ;;
+esac
diff --git a/pkg/dnst-ldnsutils/pkg/debian/prerm b/pkg/dnst-ldnsutils/pkg/debian/prerm
new file mode 100644
index 00000000..1575418c
--- /dev/null
+++ b/pkg/dnst-ldnsutils/pkg/debian/prerm
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+case "$1" in
+upgrade|remove)
+    # Remove symbolic links
+    rm -f /usr/bin/ldns-keygen
+    rm -f /usr/bin/ldns-key2ds
+    rm -f /usr/bin/ldns-nsec3-hash
+    rm -f /usr/bin/ldns-notify
+    rm -f /usr/bin/ldns-signzone
+    rm -f /usr/bin/ldns-update
+    ;;
+esac
diff --git a/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml b/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
new file mode 100644
index 00000000..e02d10a1
--- /dev/null
+++ b/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
@@ -0,0 +1,40 @@
+post_trans_script = '''
+#!/bin/bash -e
+
+# This script will be run _after_ upgrade in the presence of an obsoleted ldns-utils
+# package. This is useful because the ldns-utils uninstall script will have been run
+# _after_ installation of dnst and so the symbolic links that we create will be
+# removed, and we have to make sure here that they get put back
+
+FORCE=
+# See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
+if [ $1 -eq 2 ]; then
+    # Upgrade
+    FORCE=-f
+fi
+
+# Create symbolic links
+ln -f -s /usr/bin/dnst /usr/bin/ldns-keygen
+ln -f -s /usr/bin/dnst /usr/bin/ldns-key2ds
+ln -f -s /usr/bin/dnst /usr/bin/ldns-nsec3-hash
+ln -f -s /usr/bin/dnst /usr/bin/ldns-notify
+ln -f -s /usr/bin/dnst /usr/bin/ldns-signzone
+ln -f -s /usr/bin/dnst /usr/bin/ldns-update
+'''
+
+post_uninstall_script = '''
+#!/bin/bash -e
+#RPM_SYSTEMD_MACROS#
+
+# See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
+if [ $1 -eq 0 ] ; then
+    # Uninstallation
+    # Remove symbolic links
+    rm -f /usr/bin/ldns-keygen
+    rm -f /usr/bin/ldns-key2ds
+    rm -f /usr/bin/ldns-nsec3-hash
+    rm -f /usr/bin/ldns-notify
+    rm -f /usr/bin/ldns-signzone
+    rm -f /usr/bin/ldns-update
+fi
+'''
diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
new file mode 100644
index 00000000..52e5a469
--- /dev/null
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -0,0 +1,33 @@
+# This matrix definition is used as both the package_build_rules and the package_test_rules Ploutos packaging
+# workflow inputs.
+---
+pkg:
+  - 'dnst-ldnsutils'
+image:
+  - "ubuntu:focal"    # ubuntu/20.04
+  - "ubuntu:jammy"    # ubuntu/22.04
+  - "ubuntu:noble"    # ubuntu/24.04
+  - "debian:buster"   # debian/10
+  - "debian:bullseye" # debian/11
+  - "debian:bookworm" # debian/12
+  - 'rockylinux:8'    # compatible with EOL centos:8
+  - 'rockylinux:9'
+target:
+  - 'x86_64'
+include:
+  # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
+  # Raspbian 11 is based.
+  - pkg: 'dnst-ldnsutils'
+    image: 'debian:bullseye'
+    target: 'armv7-unknown-linux-musleabihf'
+
+  # package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
+  # Raspbian 10 is based.
+  - pkg: 'dnst-ldnsutils'
+    image: 'debian:buster'
+    target: 'arm-unknown-linux-musleabihf'
+
+  # package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is based.
+  - pkg: 'dnst-ldnsutils'
+    image: 'debian:buster'
+    target: 'aarch64-unknown-linux-musl'
diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
new file mode 100644
index 00000000..5c5e0c8f
--- /dev/null
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
@@ -0,0 +1,50 @@
+# This matrix definition is used as both the package_build_rules and the package_test_rules Ploutos packaging
+# workflow inputs.
+---
+pkg:
+  - 'dnst-ldnsutils'
+image:
+  - "ubuntu:focal"    # ubuntu/20.04
+  - "ubuntu:jammy"    # ubuntu/22.04
+  - "debian:buster"   # debian/10
+  - "debian:bullseye" # debian/11
+  - "debian:bookworm" # debian/12
+published_pkg:
+  - 'ldnsutils'       # correct for Ubuntu/Debian
+target:
+  - 'x86_64'
+test-image:
+  # Set 'test-image' to the empty string for all matrix permutations so that the default ('image') will be used
+  # to launch an LXC container to test the created packages in. Why explicitly set what is already the default?
+  # If this isn't present, later entries in the include set below will overwrite earlier entries that differ
+  # only by their 'test-image' value. If however 'test-image' is present in the original matrix by defining it
+  # here, then 'included' entries will no longer overwrite each other because they alter a key that is present
+  # in the original matrix. This is just how GitHub Actions matrix include rules work.
+  - ""
+test-mode:   
+  - 'fresh-install'
+  - 'upgrade-from-published'
+include:
+  - pkg: 'dnst-ldnsutils'
+    image: 'rockylinux:8'
+    target: 'x86_64'
+    test-mode: 'fresh-install'
+
+  - pkg: 'dnst-ldnsutils'
+    image: 'rockylinux:8'
+    target: 'x86_64'
+    test-mode: 'upgrade-from-published'
+    published_pkg: 'ldns-utils'
+    rpm_yum_extra_args: --enablerepo powertools
+
+  - pkg: 'dnst-ldnsutils'
+    image: 'rockylinux:9'
+    target: 'x86_64'
+    test-mode: 'fresh-install'
+
+  - pkg: 'dnst-ldnsutils'
+    image: 'rockylinux:9'
+    target: 'x86_64'
+    test-mode: 'upgrade-from-published'
+    published_pkg: 'ldns-utils'
+    rpm_yum_extra_args: --enablerepo crb
diff --git a/pkg/dnst-ldnsutils/pkg/test-scripts/test-dnst-ldnsutils.sh b/pkg/dnst-ldnsutils/pkg/test-scripts/test-dnst-ldnsutils.sh
new file mode 100644
index 00000000..9e70ca3f
--- /dev/null
+++ b/pkg/dnst-ldnsutils/pkg/test-scripts/test-dnst-ldnsutils.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+set -x
+
+case $1 in
+  post-install)
+    # Run some sanity checks
+    ldns-keygen -v
+    ldns-nsec3-hash nlnetlabs.nl
+    man ldns-keygen
+    ;;
+
+  post-upgrade)
+    # Nothing to do.
+    # Run some sanity checks
+    ldns-keygen -v
+    ldns-nsec3-hash nlnetlabs.nl
+    man ldns-keygen
+    ;;
+esac
diff --git a/pkg/dnst-ldnsutils/src/main.rs b/pkg/dnst-ldnsutils/src/main.rs
new file mode 100644
index 00000000..f328e4d9
--- /dev/null
+++ b/pkg/dnst-ldnsutils/src/main.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/pkg/rpm/scriptlets.toml b/pkg/rpm/scriptlets.toml
index 8aae9b97..7856830b 100644
--- a/pkg/rpm/scriptlets.toml
+++ b/pkg/rpm/scriptlets.toml
@@ -1,25 +1,12 @@
 post_trans_script = '''
 #!/bin/bash -e
 
-# This script will be run _after_ upgrade in the presence of an obsoleted ldns-utils
-# package. This is useful because the ldns-utils uninstall script will have been run
-# _after_ installation of dnst and so the symbolic links that we create will be
-# removed, and we have to make sure here that they get put back
-
 FORCE=
 # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
 if [ $1 -eq 2 ]; then
     # Upgrade
     FORCE=-f
 fi
-
-# Create symbolic links
-ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-keygen
-ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-key2ds
-ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-nsec3-hash
-ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-notify
-ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-signzone
-ln -f -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-update
 '''
 
 post_uninstall_script = '''
@@ -29,12 +16,5 @@ post_uninstall_script = '''
 # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
 if [ $1 -eq 0 ] ; then
     # Uninstallation
-    # Remove symbolic links
-    rm -f /usr/bin/ldns-keygen
-    rm -f /usr/bin/ldns-key2ds
-    rm -f /usr/bin/ldns-nsec3-hash
-    rm -f /usr/bin/ldns-notify
-    rm -f /usr/bin/ldns-signzone
-    rm -f /usr/bin/ldns-update
 fi
 '''
diff --git a/pkg/test-scripts/test-dnst.sh b/pkg/test-scripts/test-dnst.sh
index 2738a571..89eb0414 100644
--- a/pkg/test-scripts/test-dnst.sh
+++ b/pkg/test-scripts/test-dnst.sh
@@ -7,23 +7,17 @@ case $1 in
   post-install)
     # Run some sanity checks
     dnst --version
-    ldns-keygen -v
     dnst nsec3-hash nlnetlabs.nl
-    ldns-nsec3-hash nlnetlabs.nl
     man dnst
     man dnst-keygen
-    man ldns-keygen
     ;;
 
   post-upgrade)
     # Nothing to do.
     # Run some sanity checks
     dnst --version
-    ldns-keygen -v
     dnst nsec3-hash nlnetlabs.nl
-    ldns-nsec3-hash nlnetlabs.nl
     man dnst
     man dnst-keygen
-    man ldns-keygen
     ;;
-esac
\ No newline at end of file
+esac

From d0f3d09090754c2dc7ff144d9222894f8e9e4e4e Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 16:49:29 +0100
Subject: [PATCH 03/38] Fix pkg syntax error

---
 .github/workflows/pkg.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 6d231d7a..35d9b933 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  package:
+  package-dnst:
     uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v8
     # secrets:
     #   DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
@@ -32,6 +32,8 @@ jobs:
       rpm_extra_build_packages: make openssl-devel
       rpm_scriptlets_path: pkg/rpm/scriptlets.toml
 
+  package-dnst-ldnsutils:
+    needs: package-dnst
     # Package empty dnst-ldnsutils package to create symlinks
     uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
     with:

From b3dcf4c79577b03b5135ba8a039ab3a1ad756003 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 16:51:54 +0100
Subject: [PATCH 04/38] Bump MSRV to that of domain

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 91e58a7e..0035ca81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ description = "Rust reimplementation of important ldns programs."
 categories = ["command-line-utilities"]
 license = "BSD-3-Clause"
 keywords = ["DNS", "domain", "ldns"]
-rust-version = "1.80"
+rust-version = "1.85.0"
 
 [[bin]]
 name = "ldns"

From 67ea9784c607f459552b3ff45be2cb5bf1330435 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 16:55:19 +0100
Subject: [PATCH 05/38] Set version to rc1

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0035ca81..db5697f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dnst"
-version = "0.1.1-dev"
+version = "0.1.1-rc1"
 edition = "2021"
 default-run = "dnst"
 readme = "README.md"

From 8663270557c4f0aebdb73997b1b17855f1044af6 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 17:03:15 +0100
Subject: [PATCH 06/38] Use MSRV available in docker

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index db5697f6..7500222b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ description = "Rust reimplementation of important ldns programs."
 categories = ["command-line-utilities"]
 license = "BSD-3-Clause"
 keywords = ["DNS", "domain", "ldns"]
-rust-version = "1.85.0"
+rust-version = "1.83.0"
 
 [[bin]]
 name = "ldns"

From e8cdbf9a7ec3fa8f96c59ecc974cfef2f7a35366 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 17:08:27 +0100
Subject: [PATCH 07/38] Fix package rule file name

---
 .github/workflows/pkg.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 35d9b933..513324e2 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -33,12 +33,11 @@ jobs:
       rpm_scriptlets_path: pkg/rpm/scriptlets.toml
 
   package-dnst-ldnsutils:
-    needs: package-dnst
     # Package empty dnst-ldnsutils package to create symlinks
     uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
     with:
-      package_build_rules: pkg/dnst-ldnsutils/pkg/rules/ldns_packages-to-build.yml
-      package_test_rules: pkg/dnst-ldnsutils/pkg/rules/ldns_packages-to-test.yml
+      package_build_rules: pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+      package_test_rules: pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
       package_test_scripts_path: pkg/dnst-ldnsutils/pkg/test-scripts/test-<package>.sh
 
       rpm_scriptlets_path: pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml

From 30ba612e0ce4265aed8fddab7d843b2e46b36043 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 17:08:40 +0100
Subject: [PATCH 08/38] Add testing repo for the ldnsutils test

---
 .github/workflows/pkg.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 513324e2..2701f5a1 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -43,3 +43,25 @@ jobs:
       rpm_scriptlets_path: pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
 
       manifest_dir: pkg/dnst-ldnsutils
+
+      # About the use of deb_apt_source and rpm_yum_repo:
+      # ----------------------------------------------------------------------
+      # These settings are used below to direct Ploutos to add an alternate
+      # package repository than the default (also packages.nlnetlabs.nl but
+      # normal channel rather than the "-proposed" channel). This repository
+      # is used during the package testing phase and is needed so that when
+      # the newly built Cascade package is installed that its dependencies,
+      # dnst and kmip2pkcs11, can be resolved. This is because those
+      # dependencies are at the time of writing not yet published in the main
+      # channel but only in the "-proposed" channel.
+      package_test_always_add_repo: true
+
+      deb_extra_build_packages: libssl-dev
+      deb_apt_source: 'deb [arch=amd64] https://packages.nlnetlabs.nl/linux/${OS_NAME} ${OS_REL}-proposed main'
+
+      rpm_extra_build_packages: make openssl-devel
+      rpm_yum_repo: |
+        [nlnetlabs]
+        name=NLnet Labs Testing
+        baseurl=https://packages.nlnetlabs.nl/linux/centos/$releasever/proposed/$basearch
+        enabled=1

From 738e731d2ac1bcce1206a8925a1cc9faf3123e05 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 17:11:33 +0100
Subject: [PATCH 09/38] TESTING: disable many images to save minutes

---
 .../pkg/rules/packages-to-build.yml           | 40 +++++++++----------
 .../pkg/rules/packages-to-test.yml            | 26 ++++++------
 pkg/rules/packages-to-build.yml               | 40 +++++++++----------
 pkg/rules/packages-to-test.yml                | 30 +++++++-------
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
index 52e5a469..506d5384 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -4,30 +4,30 @@
 pkg:
   - 'dnst-ldnsutils'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
+  # - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
-  - "ubuntu:noble"    # ubuntu/24.04
-  - "debian:buster"   # debian/10
-  - "debian:bullseye" # debian/11
+  # - "ubuntu:noble"    # ubuntu/24.04
+  # - "debian:buster"   # debian/10
+  # - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
-  - 'rockylinux:8'    # compatible with EOL centos:8
+  # - 'rockylinux:8'    # compatible with EOL centos:8
   - 'rockylinux:9'
 target:
   - 'x86_64'
-include:
-  # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
-  # Raspbian 11 is based.
-  - pkg: 'dnst-ldnsutils'
-    image: 'debian:bullseye'
-    target: 'armv7-unknown-linux-musleabihf'
+# include:
+#   # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
+#   # Raspbian 11 is based.
+#   - pkg: 'dnst-ldnsutils'
+#     image: 'debian:bullseye'
+#     target: 'armv7-unknown-linux-musleabihf'
 
-  # package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
-  # Raspbian 10 is based.
-  - pkg: 'dnst-ldnsutils'
-    image: 'debian:buster'
-    target: 'arm-unknown-linux-musleabihf'
+#   # package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
+#   # Raspbian 10 is based.
+#   - pkg: 'dnst-ldnsutils'
+#     image: 'debian:buster'
+#     target: 'arm-unknown-linux-musleabihf'
 
-  # package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is based.
-  - pkg: 'dnst-ldnsutils'
-    image: 'debian:buster'
-    target: 'aarch64-unknown-linux-musl'
+#   # package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is based.
+#   - pkg: 'dnst-ldnsutils'
+#     image: 'debian:buster'
+#     target: 'aarch64-unknown-linux-musl'
diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
index 5c5e0c8f..4ec0193f 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
@@ -4,10 +4,10 @@
 pkg:
   - 'dnst-ldnsutils'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
+  # - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
-  - "debian:buster"   # debian/10
-  - "debian:bullseye" # debian/11
+  # - "debian:buster"   # debian/10
+  # - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
 published_pkg:
   - 'ldnsutils'       # correct for Ubuntu/Debian
@@ -25,17 +25,17 @@ test-mode:
   - 'fresh-install'
   - 'upgrade-from-published'
 include:
-  - pkg: 'dnst-ldnsutils'
-    image: 'rockylinux:8'
-    target: 'x86_64'
-    test-mode: 'fresh-install'
+  # - pkg: 'dnst-ldnsutils'
+  #   image: 'rockylinux:8'
+  #   target: 'x86_64'
+  #   test-mode: 'fresh-install'
 
-  - pkg: 'dnst-ldnsutils'
-    image: 'rockylinux:8'
-    target: 'x86_64'
-    test-mode: 'upgrade-from-published'
-    published_pkg: 'ldns-utils'
-    rpm_yum_extra_args: --enablerepo powertools
+  # - pkg: 'dnst-ldnsutils'
+  #   image: 'rockylinux:8'
+  #   target: 'x86_64'
+  #   test-mode: 'upgrade-from-published'
+  #   published_pkg: 'ldns-utils'
+  #   rpm_yum_extra_args: --enablerepo powertools
 
   - pkg: 'dnst-ldnsutils'
     image: 'rockylinux:9'
diff --git a/pkg/rules/packages-to-build.yml b/pkg/rules/packages-to-build.yml
index 31358c02..6e9f7137 100644
--- a/pkg/rules/packages-to-build.yml
+++ b/pkg/rules/packages-to-build.yml
@@ -4,30 +4,30 @@
 pkg:
   - 'dnst'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
+  # - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
-  - "ubuntu:noble"    # ubuntu/24.04
-  - "debian:buster"   # debian/10
-  - "debian:bullseye" # debian/11
+  # - "ubuntu:noble"    # ubuntu/24.04
+  # - "debian:buster"   # debian/10
+  # - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
-  - 'rockylinux:8'    # compatible with EOL centos:8
+  # - 'rockylinux:8'    # compatible with EOL centos:8
   - 'rockylinux:9'
 target:
   - 'x86_64'
-include:
-  # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
-  # Raspbian 11 is based.
-  - pkg: 'dnst'
-    image: 'debian:bullseye'
-    target: 'armv7-unknown-linux-musleabihf'
+# include:
+#   # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
+#   # Raspbian 11 is based.
+#   - pkg: 'dnst'
+#     image: 'debian:bullseye'
+#     target: 'armv7-unknown-linux-musleabihf'
 
-  # package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
-  # Raspbian 10 is based.
-  - pkg: 'dnst'
-    image: 'debian:buster'
-    target: 'arm-unknown-linux-musleabihf'
+#   # package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
+#   # Raspbian 10 is based.
+#   - pkg: 'dnst'
+#     image: 'debian:buster'
+#     target: 'arm-unknown-linux-musleabihf'
 
-  # package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is based.
-  - pkg: 'dnst'
-    image: 'debian:buster'
-    target: 'aarch64-unknown-linux-musl'
+#   # package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is based.
+#   - pkg: 'dnst'
+#     image: 'debian:buster'
+#     target: 'aarch64-unknown-linux-musl'
diff --git a/pkg/rules/packages-to-test.yml b/pkg/rules/packages-to-test.yml
index 1441b687..5d99f154 100644
--- a/pkg/rules/packages-to-test.yml
+++ b/pkg/rules/packages-to-test.yml
@@ -4,10 +4,10 @@
 pkg:
   - 'dnst'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
+  # - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
-  - "debian:buster"   # debian/10
-  - "debian:bullseye" # debian/11
+  # - "debian:buster"   # debian/10
+  # - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
 published_pkg:
   - 'ldnsutils'       # correct for Ubuntu/Debian
@@ -24,18 +24,18 @@ test-image:
 test-mode:   
   - 'fresh-install'
   - 'upgrade-from-published'
-include:
-  - pkg: 'dnst'
-    image: 'rockylinux:8'
-    target: 'x86_64'
-    test-mode: 'fresh-install'
+# include:
+#   - pkg: 'dnst'
+#     image: 'rockylinux:8'
+#     target: 'x86_64'
+#     test-mode: 'fresh-install'
 
-  - pkg: 'dnst'
-    image: 'rockylinux:8'
-    target: 'x86_64'
-    test-mode: 'upgrade-from-published'
-    published_pkg: 'ldns-utils'
-    rpm_yum_extra_args: --enablerepo powertools
+#   - pkg: 'dnst'
+#     image: 'rockylinux:8'
+#     target: 'x86_64'
+#     test-mode: 'upgrade-from-published'
+#     published_pkg: 'ldns-utils'
+#     rpm_yum_extra_args: --enablerepo powertools
 
   - pkg: 'dnst'
     image: 'rockylinux:9'
@@ -57,4 +57,4 @@ include:
 #    mode: 'upgrade-from-published'
 #  - pkg: 'routinator'
 #    image: 'debian:bookworm'
-#    mode: 'upgrade-from-published'
\ No newline at end of file
+#    mode: 'upgrade-from-published'

From 7735a23b0ccffbdfab6ba8895672c89e1d595b1d Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 17:35:07 +0100
Subject: [PATCH 10/38] Remove explicit changelog path, ploutos should pick the
 right one

---
 pkg/dnst-ldnsutils/Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/dnst-ldnsutils/Cargo.toml b/pkg/dnst-ldnsutils/Cargo.toml
index 121b2a19..6a66af56 100644
--- a/pkg/dnst-ldnsutils/Cargo.toml
+++ b/pkg/dnst-ldnsutils/Cargo.toml
@@ -24,7 +24,6 @@ assets = [
     ["../../doc/manual/build/man/ldns-signzone.1", "/usr/share/man/man1/ldns-signzone.1", "644"],
     ["../../doc/manual/build/man/ldns-update.1", "/usr/share/man/man1/ldns-update.1", "644"],
 ]
-changelog = "target/debian/changelog" # this will be generated by the pkg workflow
 copyright = "Copyright (c) 2024, NLnet Labs. All rights reserved."
 maintainer-scripts = "pkg/debian"
 # See: https://www.debian.org/doc/debian-policy/ch-relationships.html#replacing-whole-packages-forcing-their-removal

From e2a9a171eaf24b1709692e5b0dfc5ac0f8636b08 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 17:37:30 +0100
Subject: [PATCH 11/38] TESTING: disable dnst build to save minutes

---
 .github/workflows/pkg.yml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 2701f5a1..43220c2d 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -11,26 +11,26 @@ on:
   workflow_dispatch:
 
 jobs:
-  package-dnst:
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v8
-    # secrets:
-    #   DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
-    #   DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
-    with:
-      docker_org: nlnetlabs
-      docker_repo: dnst
-      docker_build_rules: pkg/rules/docker-images-to-build.yml
-      docker_sanity_check_command: --version
+  # package-dnst:
+  #   uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v8
+  #   # secrets:
+  #   #   DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
+  #   #   DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+  #   with:
+  #     docker_org: nlnetlabs
+  #     docker_repo: dnst
+  #     docker_build_rules: pkg/rules/docker-images-to-build.yml
+  #     docker_sanity_check_command: --version
 
-      package_build_rules: pkg/rules/packages-to-build.yml
-      package_test_rules: pkg/rules/packages-to-test.yml
-      package_test_scripts_path: pkg/test-scripts/test-<package>.sh
+  #     package_build_rules: pkg/rules/packages-to-build.yml
+  #     package_test_rules: pkg/rules/packages-to-test.yml
+  #     package_test_scripts_path: pkg/test-scripts/test-<package>.sh
 
-      cross_build_args: --features static-openssl
+  #     cross_build_args: --features static-openssl
 
-      deb_extra_build_packages: libssl-dev
-      rpm_extra_build_packages: make openssl-devel
-      rpm_scriptlets_path: pkg/rpm/scriptlets.toml
+  #     deb_extra_build_packages: libssl-dev
+  #     rpm_extra_build_packages: make openssl-devel
+  #     rpm_scriptlets_path: pkg/rpm/scriptlets.toml
 
   package-dnst-ldnsutils:
     # Package empty dnst-ldnsutils package to create symlinks

From 90a7e0fb75c3dbd5db299e7245f019f82075f6a5 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 17:41:18 +0100
Subject: [PATCH 12/38] Add extended description

---
 pkg/dnst-ldnsutils/Cargo.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/dnst-ldnsutils/Cargo.toml b/pkg/dnst-ldnsutils/Cargo.toml
index 6a66af56..aa2daced 100644
--- a/pkg/dnst-ldnsutils/Cargo.toml
+++ b/pkg/dnst-ldnsutils/Cargo.toml
@@ -25,6 +25,10 @@ assets = [
     ["../../doc/manual/build/man/ldns-update.1", "/usr/share/man/man1/ldns-update.1", "644"],
 ]
 copyright = "Copyright (c) 2024, NLnet Labs. All rights reserved."
+extended-description = """\
+This is a meta package that replaces the original ldnsutils with their dnst
+counterparts (where implemented).
+"""
 maintainer-scripts = "pkg/debian"
 # See: https://www.debian.org/doc/debian-policy/ch-relationships.html#replacing-whole-packages-forcing-their-removal
 conflicts = "ldnsutils"

From 528b2180ca6d8592f8fe343bd8e234bbec211440 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 18:44:59 +0100
Subject: [PATCH 13/38] Try fixed scriptlets ploutos

---
 .github/workflows/pkg.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 43220c2d..bc919472 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -34,7 +34,8 @@ jobs:
 
   package-dnst-ldnsutils:
     # Package empty dnst-ldnsutils package to create symlinks
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
+    # uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@relative-scriptlets
     with:
       package_build_rules: pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
       package_test_rules: pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml

From 1170c0048e663a2de4be12551270247ef1bec433 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 18:54:40 +0100
Subject: [PATCH 14/38] Filter out rpm no-binary lint

---
 pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
index 506d5384..1cacf876 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -14,7 +14,7 @@ image:
   - 'rockylinux:9'
 target:
   - 'x86_64'
-# include:
+include:
 #   # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
 #   # Raspbian 11 is based.
 #   - pkg: 'dnst-ldnsutils'
@@ -31,3 +31,11 @@ target:
 #   - pkg: 'dnst-ldnsutils'
 #     image: 'debian:buster'
 #     target: 'aarch64-unknown-linux-musl'
+  - image: 'almalinux:9'
+    rpm_rpmlint_check_filters: no-binary
+
+  - image: 'almalinux:8'
+    rpm_rpmlint_check_filters: no-binary
+
+  - image: 'almalinux:10'
+    rpm_rpmlint_check_filters: no-binary

From dc98ca6365959738785d51ed0d182d7483d96bde Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 20:22:01 +0100
Subject: [PATCH 15/38] Only the specified one

---
 pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
index 1cacf876..4741b5dc 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -34,8 +34,8 @@ include:
   - image: 'almalinux:9'
     rpm_rpmlint_check_filters: no-binary
 
-  - image: 'almalinux:8'
-    rpm_rpmlint_check_filters: no-binary
+  # - image: 'almalinux:8'
+  #   rpm_rpmlint_check_filters: no-binary
 
-  - image: 'almalinux:10'
-    rpm_rpmlint_check_filters: no-binary
+  # - image: 'almalinux:10'
+  #   rpm_rpmlint_check_filters: no-binary

From cc7c0dc3770047167f949bf24725082560c94760 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 20:27:13 +0100
Subject: [PATCH 16/38] It's rocky

---
 pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
index 4741b5dc..fff00d0e 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -31,7 +31,7 @@ include:
 #   - pkg: 'dnst-ldnsutils'
 #     image: 'debian:buster'
 #     target: 'aarch64-unknown-linux-musl'
-  - image: 'almalinux:9'
+  - image: 'rockylinux:9'
     rpm_rpmlint_check_filters: no-binary
 
   # - image: 'almalinux:8'

From bc00e425683c8497767ee25fa19a4e6f781b5716 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 20:37:00 +0100
Subject: [PATCH 17/38] Revert "TESTING: disable dnst build to save minutes"

This reverts commit e2a9a171eaf24b1709692e5b0dfc5ac0f8636b08.
---
 .github/workflows/pkg.yml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index bc919472..c5aa8438 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -11,26 +11,26 @@ on:
   workflow_dispatch:
 
 jobs:
-  # package-dnst:
-  #   uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v8
-  #   # secrets:
-  #   #   DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
-  #   #   DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
-  #   with:
-  #     docker_org: nlnetlabs
-  #     docker_repo: dnst
-  #     docker_build_rules: pkg/rules/docker-images-to-build.yml
-  #     docker_sanity_check_command: --version
+  package-dnst:
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v8
+    # secrets:
+    #   DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
+    #   DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+    with:
+      docker_org: nlnetlabs
+      docker_repo: dnst
+      docker_build_rules: pkg/rules/docker-images-to-build.yml
+      docker_sanity_check_command: --version
 
-  #     package_build_rules: pkg/rules/packages-to-build.yml
-  #     package_test_rules: pkg/rules/packages-to-test.yml
-  #     package_test_scripts_path: pkg/test-scripts/test-<package>.sh
+      package_build_rules: pkg/rules/packages-to-build.yml
+      package_test_rules: pkg/rules/packages-to-test.yml
+      package_test_scripts_path: pkg/test-scripts/test-<package>.sh
 
-  #     cross_build_args: --features static-openssl
+      cross_build_args: --features static-openssl
 
-  #     deb_extra_build_packages: libssl-dev
-  #     rpm_extra_build_packages: make openssl-devel
-  #     rpm_scriptlets_path: pkg/rpm/scriptlets.toml
+      deb_extra_build_packages: libssl-dev
+      rpm_extra_build_packages: make openssl-devel
+      rpm_scriptlets_path: pkg/rpm/scriptlets.toml
 
   package-dnst-ldnsutils:
     # Package empty dnst-ldnsutils package to create symlinks

From 6d3c363e0e340adb5ef1e541cc5d1f964db8feef Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 20:46:13 +0100
Subject: [PATCH 18/38] Re-enable all build and test targets and change
 rockylinux to almalinux

---
 .../pkg/rules/packages-to-build.yml           | 56 ++++++++++---------
 .../pkg/rules/packages-to-test.yml            | 45 ++++++++++-----
 pkg/rules/packages-to-build.yml               | 44 ++++++++-------
 pkg/rules/packages-to-test.yml                | 55 +++++++++---------
 4 files changed, 112 insertions(+), 88 deletions(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
index fff00d0e..b25908ce 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -4,38 +4,40 @@
 pkg:
   - 'dnst-ldnsutils'
 image:
-  # - "ubuntu:focal"    # ubuntu/20.04
+  - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
-  # - "ubuntu:noble"    # ubuntu/24.04
-  # - "debian:buster"   # debian/10
-  # - "debian:bullseye" # debian/11
+  - "ubuntu:noble"    # ubuntu/24.04
+  - "debian:buster"   # debian/10
+  - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
-  # - 'rockylinux:8'    # compatible with EOL centos:8
-  - 'rockylinux:9'
+  - "debian:trixie"   # debian/13
+  - 'almalinux:8'     # compatible with EOL centos:8
+  - 'almalinux:9'
+  - 'almalinux:10'
 target:
   - 'x86_64'
 include:
-#   # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
-#   # Raspbian 11 is based.
-#   - pkg: 'dnst-ldnsutils'
-#     image: 'debian:bullseye'
-#     target: 'armv7-unknown-linux-musleabihf'
+  # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
+  # Raspbian 11 is based.
+  - pkg: 'dnst-ldnsutils'
+    image: 'debian:bullseye'
+    target: 'armv7-unknown-linux-musleabihf'
 
-#   # package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
-#   # Raspbian 10 is based.
-#   - pkg: 'dnst-ldnsutils'
-#     image: 'debian:buster'
-#     target: 'arm-unknown-linux-musleabihf'
+  # package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
+  # Raspbian 10 is based.
+  - pkg: 'dnst-ldnsutils'
+    image: 'debian:buster'
+    target: 'arm-unknown-linux-musleabihf'
 
-#   # package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is based.
-#   - pkg: 'dnst-ldnsutils'
-#     image: 'debian:buster'
-#     target: 'aarch64-unknown-linux-musl'
-  - image: 'rockylinux:9'
-    rpm_rpmlint_check_filters: no-binary
-
-  # - image: 'almalinux:8'
-  #   rpm_rpmlint_check_filters: no-binary
+  # package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is based.
+  - pkg: 'dnst-ldnsutils'
+    image: 'debian:buster'
+    target: 'aarch64-unknown-linux-musl'
 
-  # - image: 'almalinux:10'
-  #   rpm_rpmlint_check_filters: no-binary
+  # Set rpmlint filters for RHEL rpmlint
+  - image: 'almalinux:8'
+    rpm_rpmlint_check_filters: no-binary
+  - image: 'almalinux:9'
+    rpm_rpmlint_check_filters: no-binary
+  - image: 'almalinux:10'
+    rpm_rpmlint_check_filters: no-binary
diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
index 4ec0193f..c34a0090 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
@@ -4,11 +4,13 @@
 pkg:
   - 'dnst-ldnsutils'
 image:
-  # - "ubuntu:focal"    # ubuntu/20.04
+  - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
-  # - "debian:buster"   # debian/10
-  # - "debian:bullseye" # debian/11
+  - "ubuntu:noble"    # ubuntu/24.04
+  - "debian:buster"   # debian/10
+  - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
+  - "debian:trixie"   # debian/13
 published_pkg:
   - 'ldnsutils'       # correct for Ubuntu/Debian
 target:
@@ -25,26 +27,39 @@ test-mode:
   - 'fresh-install'
   - 'upgrade-from-published'
 include:
-  # - pkg: 'dnst-ldnsutils'
-  #   image: 'rockylinux:8'
-  #   target: 'x86_64'
-  #   test-mode: 'fresh-install'
+  - pkg: 'dnst-ldnsutils'
+    image: 'almalinux:8'
+    target: 'x86_64'
+    test-mode: 'fresh-install'
 
-  # - pkg: 'dnst-ldnsutils'
-  #   image: 'rockylinux:8'
-  #   target: 'x86_64'
-  #   test-mode: 'upgrade-from-published'
-  #   published_pkg: 'ldns-utils'
-  #   rpm_yum_extra_args: --enablerepo powertools
+  - pkg: 'dnst-ldnsutils'
+    image: 'almalinux:8'
+    target: 'x86_64'
+    test-mode: 'upgrade-from-published'
+    published_pkg: 'ldns-utils'
+    rpm_yum_extra_args: --enablerepo powertools
 
   - pkg: 'dnst-ldnsutils'
-    image: 'rockylinux:9'
+    image: 'almalinux:9'
     target: 'x86_64'
     test-mode: 'fresh-install'
 
   - pkg: 'dnst-ldnsutils'
-    image: 'rockylinux:9'
+    image: 'almalinux:9'
     target: 'x86_64'
     test-mode: 'upgrade-from-published'
     published_pkg: 'ldns-utils'
     rpm_yum_extra_args: --enablerepo crb
+
+  - pkg: 'dnst-ldnsutils'
+    image: 'almalinux:10'
+    target: 'x86_64'
+    test-mode: 'fresh-install'
+
+  - pkg: 'dnst-ldnsutils'
+    image: 'almalinux:10'
+    target: 'x86_64'
+    test-mode: 'upgrade-from-published'
+    published_pkg: 'ldns-utils'
+    # --enablerepo crb is no longer needed since alma10 (https://almalinux.org/blog/2025-09-08-enabling-crb-by-default-for-almalinux10/)
+    # rpm_yum_extra_args: --enablerepo crb
diff --git a/pkg/rules/packages-to-build.yml b/pkg/rules/packages-to-build.yml
index 6e9f7137..05517a00 100644
--- a/pkg/rules/packages-to-build.yml
+++ b/pkg/rules/packages-to-build.yml
@@ -4,30 +4,32 @@
 pkg:
   - 'dnst'
 image:
-  # - "ubuntu:focal"    # ubuntu/20.04
+  - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
-  # - "ubuntu:noble"    # ubuntu/24.04
-  # - "debian:buster"   # debian/10
-  # - "debian:bullseye" # debian/11
+  - "ubuntu:noble"    # ubuntu/24.04
+  - "debian:buster"   # debian/10
+  - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
-  # - 'rockylinux:8'    # compatible with EOL centos:8
-  - 'rockylinux:9'
+  - "debian:trixie"   # debian/13
+  - 'almalinux:8'     # compatible with EOL centos:8
+  - 'almalinux:9'
+  - 'almalinux:10'
 target:
   - 'x86_64'
-# include:
-#   # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
-#   # Raspbian 11 is based.
-#   - pkg: 'dnst'
-#     image: 'debian:bullseye'
-#     target: 'armv7-unknown-linux-musleabihf'
+include:
+  # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
+  # Raspbian 11 is based.
+  - pkg: 'dnst'
+    image: 'debian:bullseye'
+    target: 'armv7-unknown-linux-musleabihf'
 
-#   # package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
-#   # Raspbian 10 is based.
-#   - pkg: 'dnst'
-#     image: 'debian:buster'
-#     target: 'arm-unknown-linux-musleabihf'
+  # package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
+  # Raspbian 10 is based.
+  - pkg: 'dnst'
+    image: 'debian:buster'
+    target: 'arm-unknown-linux-musleabihf'
 
-#   # package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is based.
-#   - pkg: 'dnst'
-#     image: 'debian:buster'
-#     target: 'aarch64-unknown-linux-musl'
+  # package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is based.
+  - pkg: 'dnst'
+    image: 'debian:buster'
+    target: 'aarch64-unknown-linux-musl'
diff --git a/pkg/rules/packages-to-test.yml b/pkg/rules/packages-to-test.yml
index 5d99f154..db132d93 100644
--- a/pkg/rules/packages-to-test.yml
+++ b/pkg/rules/packages-to-test.yml
@@ -4,11 +4,13 @@
 pkg:
   - 'dnst'
 image:
-  # - "ubuntu:focal"    # ubuntu/20.04
+  - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
-  # - "debian:buster"   # debian/10
-  # - "debian:bullseye" # debian/11
+  - "ubuntu:noble"    # ubuntu/24.04
+  - "debian:buster"   # debian/10
+  - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
+  - "debian:trixie"   # debian/13
 published_pkg:
   - 'ldnsutils'       # correct for Ubuntu/Debian
 target:
@@ -24,37 +26,40 @@ test-image:
 test-mode:   
   - 'fresh-install'
   - 'upgrade-from-published'
-# include:
-#   - pkg: 'dnst'
-#     image: 'rockylinux:8'
-#     target: 'x86_64'
-#     test-mode: 'fresh-install'
+include:
+  - pkg: 'dnst'
+    image: 'almalinux:8'
+    target: 'x86_64'
+    test-mode: 'fresh-install'
 
-#   - pkg: 'dnst'
-#     image: 'rockylinux:8'
-#     target: 'x86_64'
-#     test-mode: 'upgrade-from-published'
-#     published_pkg: 'ldns-utils'
-#     rpm_yum_extra_args: --enablerepo powertools
+  - pkg: 'dnst'
+    image: 'almalinux:8'
+    target: 'x86_64'
+    test-mode: 'upgrade-from-published'
+    published_pkg: 'ldns-utils'
+    rpm_yum_extra_args: --enablerepo powertools
 
   - pkg: 'dnst'
-    image: 'rockylinux:9'
+    image: 'almalinux:9'
     target: 'x86_64'
     test-mode: 'fresh-install'
 
   - pkg: 'dnst'
-    image: 'rockylinux:9'
+    image: 'almalinux:9'
     target: 'x86_64'
     test-mode: 'upgrade-from-published'
     published_pkg: 'ldns-utils'
     rpm_yum_extra_args: --enablerepo crb
 
-# Disable upgrade testing on Rocky Linux 9 and Debian Bookworm as we haven't published any packages for
-# those O/S versions yet.
-#test-exclude:
-#  - pkg: 'routinator'
-#    image: 'rockylinux:9'
-#    mode: 'upgrade-from-published'
-#  - pkg: 'routinator'
-#    image: 'debian:bookworm'
-#    mode: 'upgrade-from-published'
+  - pkg: 'dnst'
+    image: 'almalinux:10'
+    target: 'x86_64'
+    test-mode: 'fresh-install'
+
+  - pkg: 'dnst'
+    image: 'almalinux:10'
+    target: 'x86_64'
+    test-mode: 'upgrade-from-published'
+    published_pkg: 'ldns-utils'
+    # --enablerepo crb is no longer needed since alma10 (https://almalinux.org/blog/2025-09-08-enabling-crb-by-default-for-almalinux10/)
+    # rpm_yum_extra_args: --enablerepo crb

From 7d01d6d7c7165be375eefdb3a5c02a371c346c1a Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 21:03:48 +0100
Subject: [PATCH 19/38] Cannot have an empty if

---
 pkg/rpm/scriptlets.toml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/rpm/scriptlets.toml b/pkg/rpm/scriptlets.toml
index 7856830b..279c7f4f 100644
--- a/pkg/rpm/scriptlets.toml
+++ b/pkg/rpm/scriptlets.toml
@@ -1,12 +1,12 @@
 post_trans_script = '''
 #!/bin/bash -e
 
-FORCE=
+# FORCE=
 # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
-if [ $1 -eq 2 ]; then
-    # Upgrade
-    FORCE=-f
-fi
+# if [ $1 -eq 2 ]; then
+#     # Upgrade
+#     FORCE=-f
+# fi
 '''
 
 post_uninstall_script = '''
@@ -14,7 +14,7 @@ post_uninstall_script = '''
 #RPM_SYSTEMD_MACROS#
 
 # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
-if [ $1 -eq 0 ] ; then
-    # Uninstallation
-fi
+# if [ $1 -eq 0 ] ; then
+#     # Uninstallation
+# fi
 '''

From 04e99f8e1000829ef71cef076464fd99e25b9e87 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 21:31:24 +0100
Subject: [PATCH 20/38] Maybe this helps having a binary

---
 pkg/dnst-ldnsutils/src/main.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/dnst-ldnsutils/src/main.rs b/pkg/dnst-ldnsutils/src/main.rs
index f328e4d9..e7a11a96 100644
--- a/pkg/dnst-ldnsutils/src/main.rs
+++ b/pkg/dnst-ldnsutils/src/main.rs
@@ -1 +1,3 @@
-fn main() {}
+fn main() {
+    println!("Hello, world!");
+}

From 81458d1618b77599945f99f70563dfa8b1572de5 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 21:32:22 +0100
Subject: [PATCH 21/38] Try with few builds

---
 .../pkg/rules/packages-to-build.yml           | 32 +++++++++----------
 pkg/rules/packages-to-build.yml               | 18 +++++------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
index b25908ce..fa6bc981 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -4,15 +4,15 @@
 pkg:
   - 'dnst-ldnsutils'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
-  - "ubuntu:jammy"    # ubuntu/22.04
-  - "ubuntu:noble"    # ubuntu/24.04
-  - "debian:buster"   # debian/10
-  - "debian:bullseye" # debian/11
-  - "debian:bookworm" # debian/12
-  - "debian:trixie"   # debian/13
-  - 'almalinux:8'     # compatible with EOL centos:8
-  - 'almalinux:9'
+  # - "ubuntu:focal"    # ubuntu/20.04
+  # - "ubuntu:jammy"    # ubuntu/22.04
+  # - "ubuntu:noble"    # ubuntu/24.04
+  # - "debian:buster"   # debian/10
+  # - "debian:bullseye" # debian/11
+  # - "debian:bookworm" # debian/12
+  # - "debian:trixie"   # debian/13
+  # - 'almalinux:8'     # compatible with EOL centos:8
+  # - 'almalinux:9'
   - 'almalinux:10'
 target:
   - 'x86_64'
@@ -34,10 +34,10 @@ include:
     image: 'debian:buster'
     target: 'aarch64-unknown-linux-musl'
 
-  # Set rpmlint filters for RHEL rpmlint
-  - image: 'almalinux:8'
-    rpm_rpmlint_check_filters: no-binary
-  - image: 'almalinux:9'
-    rpm_rpmlint_check_filters: no-binary
-  - image: 'almalinux:10'
-    rpm_rpmlint_check_filters: no-binary
+  # # Set rpmlint filters for RHEL rpmlint
+  # - image: 'almalinux:8'
+  #   rpm_rpmlint_check_filters: no-binary
+  # - image: 'almalinux:9'
+  #   rpm_rpmlint_check_filters: no-binary
+  # - image: 'almalinux:10'
+  #   rpm_rpmlint_check_filters: no-binary
diff --git a/pkg/rules/packages-to-build.yml b/pkg/rules/packages-to-build.yml
index 05517a00..d3769b7a 100644
--- a/pkg/rules/packages-to-build.yml
+++ b/pkg/rules/packages-to-build.yml
@@ -4,15 +4,15 @@
 pkg:
   - 'dnst'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
-  - "ubuntu:jammy"    # ubuntu/22.04
-  - "ubuntu:noble"    # ubuntu/24.04
-  - "debian:buster"   # debian/10
-  - "debian:bullseye" # debian/11
-  - "debian:bookworm" # debian/12
-  - "debian:trixie"   # debian/13
-  - 'almalinux:8'     # compatible with EOL centos:8
-  - 'almalinux:9'
+  # - "ubuntu:focal"    # ubuntu/20.04
+  # - "ubuntu:jammy"    # ubuntu/22.04
+  # - "ubuntu:noble"    # ubuntu/24.04
+  # - "debian:buster"   # debian/10
+  # - "debian:bullseye" # debian/11
+  # - "debian:bookworm" # debian/12
+  # - "debian:trixie"   # debian/13
+  # - 'almalinux:8'     # compatible with EOL centos:8
+  # - 'almalinux:9'
   - 'almalinux:10'
 target:
   - 'x86_64'

From 97c970e20be49cda9d6b5e53d2dec72a464f6882 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 21:58:18 +0100
Subject: [PATCH 22/38] Revert "Try with few builds"

This reverts commit 81458d1618b77599945f99f70563dfa8b1572de5.
---
 .../pkg/rules/packages-to-build.yml           | 32 +++++++++----------
 pkg/rules/packages-to-build.yml               | 18 +++++------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
index fa6bc981..b25908ce 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -4,15 +4,15 @@
 pkg:
   - 'dnst-ldnsutils'
 image:
-  # - "ubuntu:focal"    # ubuntu/20.04
-  # - "ubuntu:jammy"    # ubuntu/22.04
-  # - "ubuntu:noble"    # ubuntu/24.04
-  # - "debian:buster"   # debian/10
-  # - "debian:bullseye" # debian/11
-  # - "debian:bookworm" # debian/12
-  # - "debian:trixie"   # debian/13
-  # - 'almalinux:8'     # compatible with EOL centos:8
-  # - 'almalinux:9'
+  - "ubuntu:focal"    # ubuntu/20.04
+  - "ubuntu:jammy"    # ubuntu/22.04
+  - "ubuntu:noble"    # ubuntu/24.04
+  - "debian:buster"   # debian/10
+  - "debian:bullseye" # debian/11
+  - "debian:bookworm" # debian/12
+  - "debian:trixie"   # debian/13
+  - 'almalinux:8'     # compatible with EOL centos:8
+  - 'almalinux:9'
   - 'almalinux:10'
 target:
   - 'x86_64'
@@ -34,10 +34,10 @@ include:
     image: 'debian:buster'
     target: 'aarch64-unknown-linux-musl'
 
-  # # Set rpmlint filters for RHEL rpmlint
-  # - image: 'almalinux:8'
-  #   rpm_rpmlint_check_filters: no-binary
-  # - image: 'almalinux:9'
-  #   rpm_rpmlint_check_filters: no-binary
-  # - image: 'almalinux:10'
-  #   rpm_rpmlint_check_filters: no-binary
+  # Set rpmlint filters for RHEL rpmlint
+  - image: 'almalinux:8'
+    rpm_rpmlint_check_filters: no-binary
+  - image: 'almalinux:9'
+    rpm_rpmlint_check_filters: no-binary
+  - image: 'almalinux:10'
+    rpm_rpmlint_check_filters: no-binary
diff --git a/pkg/rules/packages-to-build.yml b/pkg/rules/packages-to-build.yml
index d3769b7a..05517a00 100644
--- a/pkg/rules/packages-to-build.yml
+++ b/pkg/rules/packages-to-build.yml
@@ -4,15 +4,15 @@
 pkg:
   - 'dnst'
 image:
-  # - "ubuntu:focal"    # ubuntu/20.04
-  # - "ubuntu:jammy"    # ubuntu/22.04
-  # - "ubuntu:noble"    # ubuntu/24.04
-  # - "debian:buster"   # debian/10
-  # - "debian:bullseye" # debian/11
-  # - "debian:bookworm" # debian/12
-  # - "debian:trixie"   # debian/13
-  # - 'almalinux:8'     # compatible with EOL centos:8
-  # - 'almalinux:9'
+  - "ubuntu:focal"    # ubuntu/20.04
+  - "ubuntu:jammy"    # ubuntu/22.04
+  - "ubuntu:noble"    # ubuntu/24.04
+  - "debian:buster"   # debian/10
+  - "debian:bullseye" # debian/11
+  - "debian:bookworm" # debian/12
+  - "debian:trixie"   # debian/13
+  - 'almalinux:8'     # compatible with EOL centos:8
+  - 'almalinux:9'
   - 'almalinux:10'
 target:
   - 'x86_64'

From a3ac98b24931d4dabf75f8822ea741ed8ffafd8f Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 21:58:23 +0100
Subject: [PATCH 23/38] Revert "Maybe this helps having a binary"

This reverts commit 04e99f8e1000829ef71cef076464fd99e25b9e87.
---
 pkg/dnst-ldnsutils/src/main.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg/dnst-ldnsutils/src/main.rs b/pkg/dnst-ldnsutils/src/main.rs
index e7a11a96..f328e4d9 100644
--- a/pkg/dnst-ldnsutils/src/main.rs
+++ b/pkg/dnst-ldnsutils/src/main.rs
@@ -1,3 +1 @@
-fn main() {
-    println!("Hello, world!");
-}
+fn main() {}

From 24aa6ef34cb85c3b4ed854ef7157bcac446eb86d Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 22:03:47 +0100
Subject: [PATCH 24/38] Add differentiator for uploaded artifacts for the
 ldnsutils pkg

---
 .github/workflows/pkg.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index c5aa8438..2e8995ce 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -44,6 +44,7 @@ jobs:
       rpm_scriptlets_path: pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
 
       manifest_dir: pkg/dnst-ldnsutils
+      artifact_prefix: dnst-ldnsutils
 
       # About the use of deb_apt_source and rpm_yum_repo:
       # ----------------------------------------------------------------------

From 75d49a22d72fe6bae8e34ee8d33d2692fb81da10 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 22:40:55 +0100
Subject: [PATCH 25/38] Remove openssl deps from ldnsutils pkg

---
 .github/workflows/pkg.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 2e8995ce..46ece5b0 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -57,11 +57,7 @@ jobs:
       # dependencies are at the time of writing not yet published in the main
       # channel but only in the "-proposed" channel.
       package_test_always_add_repo: true
-
-      deb_extra_build_packages: libssl-dev
       deb_apt_source: 'deb [arch=amd64] https://packages.nlnetlabs.nl/linux/${OS_NAME} ${OS_REL}-proposed main'
-
-      rpm_extra_build_packages: make openssl-devel
       rpm_yum_repo: |
         [nlnetlabs]
         name=NLnet Labs Testing

From c64d3f69d165d01112a44dff6a8d15d5ccbdbacb Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 28 Nov 2025 23:52:38 +0100
Subject: [PATCH 26/38] Update ploutos to v9

---
 .github/workflows/pkg.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 46ece5b0..1430a56e 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   package-dnst:
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v8
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
     # secrets:
     #   DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
     #   DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
@@ -34,8 +34,7 @@ jobs:
 
   package-dnst-ldnsutils:
     # Package empty dnst-ldnsutils package to create symlinks
-    # uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@relative-scriptlets
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
     with:
       package_build_rules: pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
       package_test_rules: pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml

From ea002742c0387c05b7bc40a40d038527d84843d9 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Sat, 29 Nov 2025 00:02:39 +0100
Subject: [PATCH 27/38] Fix using the force

---
 pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml b/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
index e02d10a1..b9a6dd52 100644
--- a/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
+++ b/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
@@ -14,12 +14,12 @@ if [ $1 -eq 2 ]; then
 fi
 
 # Create symbolic links
-ln -f -s /usr/bin/dnst /usr/bin/ldns-keygen
-ln -f -s /usr/bin/dnst /usr/bin/ldns-key2ds
-ln -f -s /usr/bin/dnst /usr/bin/ldns-nsec3-hash
-ln -f -s /usr/bin/dnst /usr/bin/ldns-notify
-ln -f -s /usr/bin/dnst /usr/bin/ldns-signzone
-ln -f -s /usr/bin/dnst /usr/bin/ldns-update
+ln -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-keygen
+ln -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-key2ds
+ln -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-nsec3-hash
+ln -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-notify
+ln -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-signzone
+ln -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-update
 '''
 
 post_uninstall_script = '''

From 6a2457c831b548ec17147d81e7de4f12eb8d3401 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Sat, 29 Nov 2025 00:05:59 +0100
Subject: [PATCH 28/38] Remove debian:buster

---
 pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml | 1 -
 pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml  | 1 -
 pkg/rules/packages-to-build.yml                    | 1 -
 pkg/rules/packages-to-test.yml                     | 1 -
 4 files changed, 4 deletions(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
index b25908ce..41c4c5a3 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -7,7 +7,6 @@ image:
   - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
   - "ubuntu:noble"    # ubuntu/24.04
-  - "debian:buster"   # debian/10
   - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
   - "debian:trixie"   # debian/13
diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
index c34a0090..c910df8d 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
@@ -7,7 +7,6 @@ image:
   - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
   - "ubuntu:noble"    # ubuntu/24.04
-  - "debian:buster"   # debian/10
   - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
   - "debian:trixie"   # debian/13
diff --git a/pkg/rules/packages-to-build.yml b/pkg/rules/packages-to-build.yml
index 05517a00..850c1131 100644
--- a/pkg/rules/packages-to-build.yml
+++ b/pkg/rules/packages-to-build.yml
@@ -7,7 +7,6 @@ image:
   - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
   - "ubuntu:noble"    # ubuntu/24.04
-  - "debian:buster"   # debian/10
   - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
   - "debian:trixie"   # debian/13
diff --git a/pkg/rules/packages-to-test.yml b/pkg/rules/packages-to-test.yml
index db132d93..07187065 100644
--- a/pkg/rules/packages-to-test.yml
+++ b/pkg/rules/packages-to-test.yml
@@ -7,7 +7,6 @@ image:
   - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
   - "ubuntu:noble"    # ubuntu/24.04
-  - "debian:buster"   # debian/10
   - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
   - "debian:trixie"   # debian/13

From 89ed2b4f7c30ba7f8937b3304fc413e0d9f530c4 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Sat, 29 Nov 2025 00:07:26 +0100
Subject: [PATCH 29/38] Remove proposed channel from pkg-test

The packages published in proposed are so outdated, they fail pkg-test
anyway.
---
 .github/workflows/pkg.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 1430a56e..b0cbb0c9 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -44,21 +44,3 @@ jobs:
 
       manifest_dir: pkg/dnst-ldnsutils
       artifact_prefix: dnst-ldnsutils
-
-      # About the use of deb_apt_source and rpm_yum_repo:
-      # ----------------------------------------------------------------------
-      # These settings are used below to direct Ploutos to add an alternate
-      # package repository than the default (also packages.nlnetlabs.nl but
-      # normal channel rather than the "-proposed" channel). This repository
-      # is used during the package testing phase and is needed so that when
-      # the newly built Cascade package is installed that its dependencies,
-      # dnst and kmip2pkcs11, can be resolved. This is because those
-      # dependencies are at the time of writing not yet published in the main
-      # channel but only in the "-proposed" channel.
-      package_test_always_add_repo: true
-      deb_apt_source: 'deb [arch=amd64] https://packages.nlnetlabs.nl/linux/${OS_NAME} ${OS_REL}-proposed main'
-      rpm_yum_repo: |
-        [nlnetlabs]
-        name=NLnet Labs Testing
-        baseurl=https://packages.nlnetlabs.nl/linux/centos/$releasever/proposed/$basearch
-        enabled=1

From 6e26260450a5cbaad7b96dbd422d63e735dcacc8 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 23 Jan 2026 11:14:46 +0100
Subject: [PATCH 30/38] Remove EOL versions from build targets

---
 pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml | 1 -
 pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml  | 1 -
 pkg/rules/packages-to-build.yml                    | 1 -
 pkg/rules/packages-to-test.yml                     | 2 --
 4 files changed, 5 deletions(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
index 41c4c5a3..dcf9ee7a 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-build.yml
@@ -4,7 +4,6 @@
 pkg:
   - 'dnst-ldnsutils'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
   - "ubuntu:noble"    # ubuntu/24.04
   - "debian:bullseye" # debian/11
diff --git a/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
index c910df8d..b93ffdb9 100644
--- a/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
+++ b/pkg/dnst-ldnsutils/pkg/rules/packages-to-test.yml
@@ -4,7 +4,6 @@
 pkg:
   - 'dnst-ldnsutils'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
   - "ubuntu:noble"    # ubuntu/24.04
   - "debian:bullseye" # debian/11
diff --git a/pkg/rules/packages-to-build.yml b/pkg/rules/packages-to-build.yml
index 850c1131..8bb84b60 100644
--- a/pkg/rules/packages-to-build.yml
+++ b/pkg/rules/packages-to-build.yml
@@ -4,7 +4,6 @@
 pkg:
   - 'dnst'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
   - "ubuntu:noble"    # ubuntu/24.04
   - "debian:bullseye" # debian/11
diff --git a/pkg/rules/packages-to-test.yml b/pkg/rules/packages-to-test.yml
index db132d93..2a6b6ff7 100644
--- a/pkg/rules/packages-to-test.yml
+++ b/pkg/rules/packages-to-test.yml
@@ -4,10 +4,8 @@
 pkg:
   - 'dnst'
 image:
-  - "ubuntu:focal"    # ubuntu/20.04
   - "ubuntu:jammy"    # ubuntu/22.04
   - "ubuntu:noble"    # ubuntu/24.04
-  - "debian:buster"   # debian/10
   - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
   - "debian:trixie"   # debian/13

From 9134475ad357f33ceb5ef272f180400884477056 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 23 Jan 2026 11:20:17 +0100
Subject: [PATCH 31/38] Cargo update and bump dnst minor version

---
 Cargo.lock                    | 10 +++++-----
 Cargo.toml                    |  2 +-
 pkg/dnst-ldnsutils/Cargo.lock |  2 +-
 pkg/dnst-ldnsutils/Cargo.toml |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ae4a24e4..f6018e22 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -138,9 +138,9 @@ checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
 [[package]]
 name = "cc"
-version = "1.2.53"
+version = "1.2.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932"
+checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -315,7 +315,7 @@ dependencies = [
 
 [[package]]
 name = "dnst"
-version = "0.1.0-alpha"
+version = "0.2.0-rc1"
 dependencies = [
  "bytes",
  "chrono",
@@ -1176,9 +1176,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 dependencies = [
  "proc-macro2",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index f4711196..9d525cde 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dnst"
-version = "0.1.1-rc1"
+version = "0.2.0-rc1"
 edition = "2021"
 default-run = "dnst"
 readme = "README.md"
diff --git a/pkg/dnst-ldnsutils/Cargo.lock b/pkg/dnst-ldnsutils/Cargo.lock
index 6fce324e..b7982aaa 100644
--- a/pkg/dnst-ldnsutils/Cargo.lock
+++ b/pkg/dnst-ldnsutils/Cargo.lock
@@ -4,4 +4,4 @@ version = 4
 
 [[package]]
 name = "dnst-ldnsutils"
-version = "0.1.1-rc1"
+version = "0.2.0-rc1"
diff --git a/pkg/dnst-ldnsutils/Cargo.toml b/pkg/dnst-ldnsutils/Cargo.toml
index aa2daced..fae742e8 100644
--- a/pkg/dnst-ldnsutils/Cargo.toml
+++ b/pkg/dnst-ldnsutils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 # This is a dummy program to build a separate package with ploutos
 name = "dnst-ldnsutils"
-version = "0.1.1-rc1"
+version = "0.2.0-rc1"
 edition = "2021"
 repository = "https://github.com/nlnetlabs/dnst/"
 authors = ["NLnet Labs <dns-team@nlnetlabs.nl>"]

From 650c4c1f0e27b7173595eb7dbd6dd8ce79a4aa8b Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 23 Jan 2026 11:28:36 +0100
Subject: [PATCH 32/38] Try out the ploutos fix

---
 .github/workflows/pkg.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index b0cbb0c9..1258cc08 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   package-dnst:
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@update-docker-buildx
     # secrets:
     #   DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
     #   DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}

From f7efea47f7a8848223b81175cb59b940005997f4 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 23 Jan 2026 11:33:25 +0100
Subject: [PATCH 33/38] Update Dockerfile base image to alpine 2.23

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 603041e9..0d6637e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ ARG MODE=build
 # ========
 #
 # Only used when MODE=build.
-ARG BASE_IMG=alpine:3.21
+ARG BASE_IMG=alpine:3.23
 
 
 # CARGO_ARGS

From b6b712f95e29aa7b26b0abeb3680a0432c649f57 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 23 Jan 2026 11:34:02 +0100
Subject: [PATCH 34/38] Revert "Try out the ploutos fix"

This reverts commit 650c4c1f0e27b7173595eb7dbd6dd8ce79a4aa8b.
---
 .github/workflows/pkg.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 1258cc08..b0cbb0c9 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   package-dnst:
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@update-docker-buildx
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v9
     # secrets:
     #   DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
     #   DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}

From efe9953cc04d14dfe786fd860c225ac26e20804d Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 23 Jan 2026 11:55:38 +0100
Subject: [PATCH 35/38] Lower MSRV to 1.85 as available in Debian stable

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9d525cde..dd2d99c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ description = "Rust reimplementation of important ldns programs."
 categories = ["command-line-utilities"]
 license = "BSD-3-Clause"
 keywords = ["DNS", "domain", "ldns"]
-rust-version = "1.88"
+rust-version = "1.85"
 
 [[bin]]
 name = "ldns"

From b89eb1fab61cb63d420ab9aa2f30bb28a4efacc3 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Fri, 23 Jan 2026 12:06:58 +0100
Subject: [PATCH 36/38] Revert "Lower MSRV to 1.85 as available in Debian
 stable"

This reverts commit efe9953cc04d14dfe786fd860c225ac26e20804d.

kmip-protocol requires rust version 1.88
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index dd2d99c0..9d525cde 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ description = "Rust reimplementation of important ldns programs."
 categories = ["command-line-utilities"]
 license = "BSD-3-Clause"
 keywords = ["DNS", "domain", "ldns"]
-rust-version = "1.85"
+rust-version = "1.88"
 
 [[bin]]
 name = "ldns"

From e9ae13c2a3b87fc549495f33f50f594cde89fbbd Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Mon, 16 Feb 2026 11:55:37 +0100
Subject: [PATCH 37/38] Remove systemd macros from scriptlets

---
 pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml | 1 -
 pkg/rpm/scriptlets.toml                    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml b/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
index b9a6dd52..1313d817 100644
--- a/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
+++ b/pkg/dnst-ldnsutils/pkg/rpm/scriptlets.toml
@@ -24,7 +24,6 @@ ln -s ${FORCE} /usr/bin/dnst /usr/bin/ldns-update
 
 post_uninstall_script = '''
 #!/bin/bash -e
-#RPM_SYSTEMD_MACROS#
 
 # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
 if [ $1 -eq 0 ] ; then
diff --git a/pkg/rpm/scriptlets.toml b/pkg/rpm/scriptlets.toml
index 279c7f4f..44717267 100644
--- a/pkg/rpm/scriptlets.toml
+++ b/pkg/rpm/scriptlets.toml
@@ -11,7 +11,6 @@ post_trans_script = '''
 
 post_uninstall_script = '''
 #!/bin/bash -e
-#RPM_SYSTEMD_MACROS#
 
 # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
 # if [ $1 -eq 0 ] ; then

From 2e659c1b47dadc4e13b43bc05cb746ada575d3f0 Mon Sep 17 00:00:00 2001
From: Jannik Peters <jannik@nlnetlabs.nl>
Date: Thu, 5 Mar 2026 12:05:04 +0100
Subject: [PATCH 38/38] Change version to 0.2.0-alpha1

---
 Cargo.lock                    | 2 +-
 Cargo.toml                    | 2 +-
 pkg/dnst-ldnsutils/Cargo.lock | 2 +-
 pkg/dnst-ldnsutils/Cargo.toml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f6018e22..ddf4c5c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -315,7 +315,7 @@ dependencies = [
 
 [[package]]
 name = "dnst"
-version = "0.2.0-rc1"
+version = "0.2.0-alpha1"
 dependencies = [
  "bytes",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 9d525cde..adcf3bcb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dnst"
-version = "0.2.0-rc1"
+version = "0.2.0-alpha1"
 edition = "2021"
 default-run = "dnst"
 readme = "README.md"
diff --git a/pkg/dnst-ldnsutils/Cargo.lock b/pkg/dnst-ldnsutils/Cargo.lock
index b7982aaa..51792418 100644
--- a/pkg/dnst-ldnsutils/Cargo.lock
+++ b/pkg/dnst-ldnsutils/Cargo.lock
@@ -4,4 +4,4 @@ version = 4
 
 [[package]]
 name = "dnst-ldnsutils"
-version = "0.2.0-rc1"
+version = "0.2.0-alpha1"
diff --git a/pkg/dnst-ldnsutils/Cargo.toml b/pkg/dnst-ldnsutils/Cargo.toml
index fae742e8..bc09909e 100644
--- a/pkg/dnst-ldnsutils/Cargo.toml
+++ b/pkg/dnst-ldnsutils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 # This is a dummy program to build a separate package with ploutos
 name = "dnst-ldnsutils"
-version = "0.2.0-rc1"
+version = "0.2.0-alpha1"
 edition = "2021"
 repository = "https://github.com/nlnetlabs/dnst/"
 authors = ["NLnet Labs <dns-team@nlnetlabs.nl>"]