diff --git a/Cargo.lock b/Cargo.lock index a288aa91..6e5a0f2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ "gimli", ] @@ -32,12 +32,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 +43,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 +58,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" @@ -122,9 +116,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "backtrace" -version = "0.3.75" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" dependencies = [ "addr2line", "cfg-if", @@ -132,7 +126,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -143,9 +137,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bcder" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ffdaa8c6398acd07176317eb6c1f9082869dd1cc3fee7c72c6354866b928cc" +checksum = "1f7c42c9913f68cf9390a225e81ad56a5c515347287eb98baa710090ca1de86d" dependencies = [ "bytes", "smallvec", @@ -171,9 +165,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.35" +version = "1.2.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3" +checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb" dependencies = [ "find-msvc-tools", "shlex", @@ -187,11 +181,10 @@ checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[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", @@ -201,9 +194,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.47" +version = "4.5.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" +checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae" dependencies = [ "clap_builder", "clap_derive", @@ -211,9 +204,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.47" +version = "4.5.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" +checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9" dependencies = [ "anstream", "anstyle", @@ -317,9 +310,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "deranged" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc" +checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071" dependencies = [ "powerfmt", ] @@ -343,7 +336,7 @@ dependencies = [ [[package]] name = "dnst" -version = "0.1.0-rc2" +version = "0.1.0-alpha" dependencies = [ "bytes", "chrono", @@ -375,7 +368,7 @@ dependencies = [ [[package]] name = "domain" version = "0.11.1-dev" -source = "git+https://github.com/NLnetLabs/domain.git?branch=patches-for-nameshed-prototype#4f2e0ced06c06f8c66aa71b398237ce9189835dc" +source = "git+https://github.com/NLnetLabs/domain.git?branch=patches-for-nameshed-prototype#1753a62e1e4290181153d401ab2bcc14843bccbd" dependencies = [ "arc-swap", "bcder", @@ -411,7 +404,7 @@ dependencies = [ [[package]] name = "domain-macros" version = "0.11.1-dev" -source = "git+https://github.com/NLnetLabs/domain.git?branch=patches-for-nameshed-prototype#4f2e0ced06c06f8c66aa71b398237ce9189835dc" +source = "git+https://github.com/NLnetLabs/domain.git?branch=patches-for-nameshed-prototype#1753a62e1e4290181153d401ab2bcc14843bccbd" dependencies = [ "proc-macro2", "quote", @@ -446,14 +439,20 @@ dependencies = [ "syn 1.0.109", ] +[[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.1", ] [[package]] @@ -485,9 +484,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "find-msvc-tools" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650" +checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3" [[package]] name = "foreign-types" @@ -602,20 +601,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" @@ -636,14 +621,14 @@ dependencies = [ "cfg-if", "libc", "r-efi", - "wasi 0.14.3+wasi-0.2.4", + "wasi 0.14.7+wasi-0.2.4", ] [[package]] name = "gimli" -version = "0.31.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" [[package]] name = "hashbrown" @@ -668,9 +653,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[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", @@ -852,9 +837,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.78" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -912,15 +897,15 @@ checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7" [[package]] name = "libc" -version = "0.2.175" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[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 = "litemap" @@ -944,19 +929,6 @@ version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" -[[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", -] - [[package]] name = "matchers" version = "0.2.0" @@ -979,9 +951,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "miniz_oxide" @@ -1005,23 +977,22 @@ dependencies = [ [[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", ] @@ -1051,9 +1022,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.7" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] @@ -1109,9 +1080,9 @@ dependencies = [ [[package]] name = "openssl-src" -version = "300.5.2+3.5.2" +version = "300.5.3+3.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d270b79e2926f5150189d475bc7e9d2c69f9c4697b185fa917d5a32b792d21b4" +checksum = "dc6bad8cd0233b63971e232cc9c5e83039375b8586d2312f31fda85db8f888c2" dependencies = [ "cc", ] @@ -1242,9 +1213,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] @@ -1356,9 +1327,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.2" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -1368,9 +1339,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -1414,15 +1385,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.1", ] [[package]] @@ -1460,9 +1431,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.6" +version = "0.103.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb" +checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf" dependencies = [ "ring", "rustls-pki-types", @@ -1490,12 +1461,6 @@ dependencies = [ "parking_lot", ] -[[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" @@ -1513,33 +1478,44 @@ 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_bytes" -version = "0.11.17" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" +checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8" dependencies = [ "serde", + "serde_core", +] + +[[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", @@ -1548,14 +1524,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.143" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1660,15 +1637,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", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.1", ] [[package]] @@ -1687,26 +1664,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 2.0.106", -] - [[package]] name = "thread_local" version = "1.1.9" @@ -1718,11 +1675,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.43" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", + "itoa", "num-conv", "powerfmt", "serde", @@ -1871,9 +1829,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unicode-xid" @@ -1942,18 +1900,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" -version = "0.14.3+wasi-0.2.4" +version = "0.14.7+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", @@ -1964,9 +1931,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", @@ -1978,9 +1945,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1988,9 +1955,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -2001,9 +1968,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] @@ -2017,33 +1984,11 @@ dependencies = [ "rustls-pki-types", ] -[[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.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" dependencies = [ "windows-implement", "windows-interface", @@ -2052,22 +1997,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.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0" dependencies = [ "proc-macro2", "quote", @@ -2076,9 +2010,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5" dependencies = [ "proc-macro2", "quote", @@ -2087,34 +2021,24 @@ dependencies = [ [[package]] name = "windows-link" -version = "0.1.3" -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 = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" dependencies = [ "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" dependencies = [ "windows-link", ] @@ -2143,7 +2067,16 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.3", + "windows-targets 0.53.4", +] + +[[package]] +name = "windows-sys" +version = "0.61.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" +dependencies = [ + "windows-link", ] [[package]] @@ -2164,9 +2097,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.3" +version = "0.53.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" dependencies = [ "windows-link", "windows_aarch64_gnullvm 0.53.0", @@ -2179,15 +2112,6 @@ dependencies = [ "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" -dependencies = [ - "windows-link", -] - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -2286,9 +2210,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[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 = "writeable" @@ -2328,18 +2252,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", @@ -2369,9 +2293,9 @@ 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" [[package]] name = "zerotrie" diff --git a/Cargo.toml b/Cargo.toml index e87279d3..a12c1d07 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dnst" -version = "0.1.0-rc2" +version = "0.1.0-alpha" edition = "2021" default-run = "dnst" readme = "README.md" @@ -79,58 +79,74 @@ pretty_assertions = "1.4.1" # Related reading: https://wiki.debian.org/Teams/RustPackaging/Policy [package.metadata.deb] +# Package a Cascade specific variant of dnst because Cascade depends on dnst +# and dnst replaces ldns-utils, so uses of Cascade would have their ldns-utils +# uninstalled but may want to use ldns-verify-zone for example with Cascade. +# So we make a separate cascade-dnst package that doesn't uninstall ldns-utils, +# for now at least. Another reason for a separate package is at present this +# keyset branch of dnst depends on as yet unreleased domain crate patches which +# is fine for the alpha of Cascade but not for a normal dnst release. +name = "cascade-dnst" depends = "$auto" section = "net" priority = "optional" assets = [ - ["target/release/dnst", "usr/bin/", "755"], - ["README.md", "usr/share/doc/dnst/", "644"], +# ["target/release/dnst", "usr/bin/", "755"], + # Install into the Cascade directory, and name separately to dnst, to + # avoid collisions with the real dnst package and binary. + ["target/release/dnst", "usr/libexec/cascade/cascade-dnst", "755"], + ["README.md", "usr/share/doc/cascade-dnst/", "644"], # TODO: Extend Ploutos to generate the man pages from sources. - ["doc/manual/build/man/dnst.1", "/usr/share/man/man1/dnst.1", "644"], - ["doc/manual/build/man/dnst-key2ds.1", "/usr/share/man/man1/dnst-key2ds.1", "644"], - ["doc/manual/build/man/dnst-keygen.1", "/usr/share/man/man1/dnst-keygen.1", "644"], - ["doc/manual/build/man/dnst-notify.1", "/usr/share/man/man1/dnst-notify.1", "644"], - ["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"], + # Don't install the normal dnst man pages in case the user actually does + # have the real dnst package installed. + ["doc/manual/build/man/dnst.1", "/usr/share/man/man1/cascade-dnst.1", "644"], + #["doc/manual/build/man/dnst-key2ds.1", "/usr/share/man/man1/dnst-key2ds.1", "644"], + #["doc/manual/build/man/dnst-keygen.1", "/usr/share/man/man1/dnst-keygen.1", "644"], + ["doc/manual/build/man/dnst-keyset.1", "/usr/share/man/man1/cascade-dnst-keyset.1", "644"], + #["doc/manual/build/man/dnst-notify.1", "/usr/share/man/man1/dnst-notify.1", "644"], + #["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" +# # 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] +name = "cascade-dnst" # see explanation above in the cargo-deb section. assets = [ - { source = "target/release/dnst", dest = "/usr/bin/dnst", mode = "755" }, + { source = "target/release/dnst", dest = "/usr/libexec/cascade/cascade-dnst", mode = "755" }, # TODO: Extend Ploutos to generate the man pages from sources. - { source = "doc/manual/build/man/dnst.1", dest = "/usr/share/man/man1/dnst.1", mode = "644", doc = true }, - { source = "doc/manual/build/man/dnst-key2ds.1", dest = "/usr/share/man/man1/dnst-key2ds.1", mode = "644", doc = true }, - { source = "doc/manual/build/man/dnst-keygen.1", dest = "/usr/share/man/man1/dnst-keygen.1", mode = "644", doc = true }, - { source = "doc/manual/build/man/dnst-notify.1", dest = "/usr/share/man/man1/dnst-notify.1", mode = "644", doc = true }, - { 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 }, + { source = "doc/manual/build/man/dnst.1", dest = "/usr/share/man/man1/cascade-dnst.1", mode = "644", doc = true }, + #{ source = "doc/manual/build/man/dnst-key2ds.1", dest = "/usr/share/man/man1/dnst-key2ds.1", mode = "644", doc = true }, + #{ source = "doc/manual/build/man/dnst-keygen.1", dest = "/usr/share/man/man1/dnst-keygen.1", mode = "644", doc = true }, + { source = "doc/manual/build/man/dnst-keyset.1", dest = "/usr/share/man/man1/cascade-dnst-keyset.1", mode = "644", doc = true }, + #{ source = "doc/manual/build/man/dnst-notify.1", dest = "/usr/share/man/man1/dnst-notify.1", mode = "644", doc = true }, + #{ 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" +# # 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/doc/manual/build/man/dnst-key2ds.1 b/doc/manual/build/man/dnst-key2ds.1 index 8bbac3f4..4d11e5c8 100644 --- a/doc/manual/build/man/dnst-key2ds.1 +++ b/doc/manual/build/man/dnst-key2ds.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "DNST-KEY2DS" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "DNST-KEY2DS" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME dnst-key2ds \- Generate DS RRs from the DNSKEYs in a keyfile .SH SYNOPSIS diff --git a/doc/manual/build/man/dnst-keygen.1 b/doc/manual/build/man/dnst-keygen.1 index 69d202f4..c51b2362 100644 --- a/doc/manual/build/man/dnst-keygen.1 +++ b/doc/manual/build/man/dnst-keygen.1 @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "DNST-KEYGEN" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "DNST-KEYGEN" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME dnst-keygen \- Generate a new key pair for a domain name .SH SYNOPSIS @@ -73,9 +73,8 @@ Use the given signing algorithm. Mandatory. .sp Possible values are: .TS -center; -|l|l|l|. -_ +box center; +l|l|l. T{ \fBMnemonic\fP T} T{ @@ -130,7 +129,6 @@ T} T{ T} T{ ED448 T} -_ .TE .UNINDENT .INDENT 0.0 diff --git a/doc/manual/build/man/dnst-keyset.1 b/doc/manual/build/man/dnst-keyset.1 index 6f61090f..98aba2da 100644 --- a/doc/manual/build/man/dnst-keyset.1 +++ b/doc/manual/build/man/dnst-keyset.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "DNST-KEYSET" "1" "Oct 02, 2025" "0.1.0-rc2" "dnst" +.TH "DNST-KEYSET" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME dnst-keyset \- Manage DNSSEC signing keys for a domain .SH SYNOPSIS @@ -35,7 +35,7 @@ dnst-keyset \- Manage DNSSEC signing keys for a domain \fBdnst keyset\fP \fB\-c \fP \fB[OPTIONS]\fP \fB\fP \fB[ARGS]\fP .SH DESCRIPTION .sp -The \fBkeyset\fP subcommand manages a set of DNSSEC (\fI\%RFC 9364\fP) signing keys. +The \fBkeyset\fP subcommand manages a set of DNSSEC (\X'tty: link https://www.rfc-editor.org/rfc/rfc9364'\fI\%RFC 9364\fP\X'tty: link') signing keys. This subcommand is meant to be part of a DNSSEC signing solution. The \fBkeyset\fP subcommand manages signing keys and generates a signed DNSKEY RRset. A separate zone signer (not part of dnst) is expected to use the zone diff --git a/doc/manual/build/man/dnst-notify.1 b/doc/manual/build/man/dnst-notify.1 index ec399344..d2d9d1cc 100644 --- a/doc/manual/build/man/dnst-notify.1 +++ b/doc/manual/build/man/dnst-notify.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "DNST-NOTIFY" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "DNST-NOTIFY" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME dnst-notify \- Send a NOTIFY message to a list of name servers .SH SYNOPSIS diff --git a/doc/manual/build/man/dnst-nsec3-hash.1 b/doc/manual/build/man/dnst-nsec3-hash.1 index df91b687..3c979993 100644 --- a/doc/manual/build/man/dnst-nsec3-hash.1 +++ b/doc/manual/build/man/dnst-nsec3-hash.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "DNST-NSEC3-HASH" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "DNST-NSEC3-HASH" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME dnst-nsec3-hash \- Print out the NSEC3 hash of a domain name .SH SYNOPSIS diff --git a/doc/manual/build/man/dnst-signzone.1 b/doc/manual/build/man/dnst-signzone.1 index d4c64e1a..24148249 100644 --- a/doc/manual/build/man/dnst-signzone.1 +++ b/doc/manual/build/man/dnst-signzone.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "DNST-SIGNZONE" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "DNST-SIGNZONE" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME dnst-signzone \- Sign the zone with the given key(s) .SH SYNOPSIS diff --git a/doc/manual/build/man/dnst-update.1 b/doc/manual/build/man/dnst-update.1 index 131bd1f9..727a6c5b 100644 --- a/doc/manual/build/man/dnst-update.1 +++ b/doc/manual/build/man/dnst-update.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "DNST-UPDATE" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "DNST-UPDATE" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME dnst-update \- Send a dynamic update packet to update an IP (or delete all existing IPs) for a domain name .SH SYNOPSIS diff --git a/doc/manual/build/man/dnst.1 b/doc/manual/build/man/dnst.1 index 5efaf01f..0cc6eda5 100644 --- a/doc/manual/build/man/dnst.1 +++ b/doc/manual/build/man/dnst.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "DNST" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "DNST" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME dnst \- DNS Management Tools .SH SYNOPSIS diff --git a/doc/manual/build/man/ldns-key2ds.1 b/doc/manual/build/man/ldns-key2ds.1 index bac7b309..2e8f7e5c 100644 --- a/doc/manual/build/man/ldns-key2ds.1 +++ b/doc/manual/build/man/ldns-key2ds.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "LDNS-KEY2DS" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "LDNS-KEY2DS" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME ldns-key2ds \- Generate DS RRs from the DNSKEYs in a keyfile .SH SYNOPSIS diff --git a/doc/manual/build/man/ldns-keygen.1 b/doc/manual/build/man/ldns-keygen.1 index 7113fa39..2454331d 100644 --- a/doc/manual/build/man/ldns-keygen.1 +++ b/doc/manual/build/man/ldns-keygen.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "LDNS-KEYGEN" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "LDNS-KEYGEN" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME ldns-keygen \- Generate a new key pair for a domain name .SH SYNOPSIS diff --git a/doc/manual/build/man/ldns-notify.1 b/doc/manual/build/man/ldns-notify.1 index 672be962..7bcdb434 100644 --- a/doc/manual/build/man/ldns-notify.1 +++ b/doc/manual/build/man/ldns-notify.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "LDNS-NOTIFY" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "LDNS-NOTIFY" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME ldns-notify \- Send a NOTIFY message to a list of name servers .SH SYNOPSIS diff --git a/doc/manual/build/man/ldns-nsec3-hash.1 b/doc/manual/build/man/ldns-nsec3-hash.1 index 9945d507..c98bb2cb 100644 --- a/doc/manual/build/man/ldns-nsec3-hash.1 +++ b/doc/manual/build/man/ldns-nsec3-hash.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "LDNS-NSEC3-HASH" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "LDNS-NSEC3-HASH" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME ldns-nsec3-hash \- Print out the NSEC3 hash of a domain name .SH SYNOPSIS diff --git a/doc/manual/build/man/ldns-signzone.1 b/doc/manual/build/man/ldns-signzone.1 index 62dbd95d..380e4efc 100644 --- a/doc/manual/build/man/ldns-signzone.1 +++ b/doc/manual/build/man/ldns-signzone.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "LDNS-SIGNZONE" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "LDNS-SIGNZONE" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME ldns-signzone \- Sign the zone with the given key(s) .SH SYNOPSIS diff --git a/doc/manual/build/man/ldns-update.1 b/doc/manual/build/man/ldns-update.1 index 68a17958..3a174431 100644 --- a/doc/manual/build/man/ldns-update.1 +++ b/doc/manual/build/man/ldns-update.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "LDNS-UPDATE" "1" "Sep 15, 2025" "0.1.0-rc2" "dnst" +.TH "LDNS-UPDATE" "1" "Oct 03, 2025" "0.1.0-rc2" "dnst" .SH NAME ldns-update \- Send a dynamic update packet to update an IP (or delete all existing IPs) for a domain name .SH SYNOPSIS diff --git a/pkg/debian/postinst b/pkg/debian/postinst index 86017a67..cb917632 100644 --- a/pkg/debian/postinst +++ b/pkg/debian/postinst @@ -1,13 +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 +# 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..552dbf84 100644 --- a/pkg/debian/prerm +++ b/pkg/debian/prerm @@ -1,8 +1,8 @@ #!/bin/sh -e -case "$1" in -upgrade|remove) - # Remove symbolic links - rm -f /usr/bin/ldns-nsec3-hash - ;; -esac \ No newline at end of file +# case "$1" in +# upgrade|remove) +# # Remove symbolic links +# rm -f /usr/bin/ldns-nsec3-hash +# ;; +# esac diff --git a/pkg/rpm/scriptlets.toml b/pkg/rpm/scriptlets.toml index 8aae9b97..838ec664 100644 --- a/pkg/rpm/scriptlets.toml +++ b/pkg/rpm/scriptlets.toml @@ -1,40 +1,38 @@ 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 +# # 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 = ''' #!/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 +# # 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/rules/packages-to-build.yml b/pkg/rules/packages-to-build.yml index 05517a00..e37f8092 100644 --- a/pkg/rules/packages-to-build.yml +++ b/pkg/rules/packages-to-build.yml @@ -2,7 +2,7 @@ # workflow inputs. --- pkg: - - 'dnst' + - 'cascade-dnst' image: - "ubuntu:focal" # ubuntu/20.04 - "ubuntu:jammy" # ubuntu/22.04 @@ -19,17 +19,17 @@ target: 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' + - pkg: 'cascade-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' + - pkg: 'cascade-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' + - pkg: 'cascade-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 cbc78fa7..885bfc61 100644 --- a/pkg/rules/packages-to-test.yml +++ b/pkg/rules/packages-to-test.yml @@ -2,7 +2,7 @@ # workflow inputs. --- pkg: - - 'dnst' + - 'cascade-dnst' image: - "ubuntu:focal" # ubuntu/20.04 - "ubuntu:jammy" # ubuntu/22.04 @@ -27,36 +27,36 @@ test-mode: - 'fresh-install' - 'upgrade-from-published' include: - - pkg: 'dnst' + - pkg: 'cascade-dnst' image: 'almalinux:8' target: 'x86_64' test-mode: 'fresh-install' - - pkg: 'dnst' + - pkg: 'cascade-dnst' image: 'almalinux:8' target: 'x86_64' test-mode: 'upgrade-from-published' published_pkg: 'ldns-utils' rpm_yum_extra_args: --enablerepo powertools - - pkg: 'dnst' + - pkg: 'cascade-dnst' image: 'almalinux:9' target: 'x86_64' test-mode: 'fresh-install' - - pkg: 'dnst' + - pkg: 'cascade-dnst' image: 'almalinux:9' target: 'x86_64' test-mode: 'upgrade-from-published' published_pkg: 'ldns-utils' rpm_yum_extra_args: --enablerepo crb - - pkg: 'dnst' + - pkg: 'cascade-dnst' image: 'almalinux:10' target: 'x86_64' test-mode: 'fresh-install' - - pkg: 'dnst' + - pkg: 'cascade-dnst' image: 'almalinux:10' target: 'x86_64' test-mode: 'upgrade-from-published' diff --git a/pkg/test-scripts/test-cascade-dnst.sh b/pkg/test-scripts/test-cascade-dnst.sh new file mode 100644 index 00000000..b1e2a2d2 --- /dev/null +++ b/pkg/test-scripts/test-cascade-dnst.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +set -eo pipefail +set -x + +case $1 in + post-install) + # Run some sanity checks + /usr/libexec/cascade/cascade-dnst --version + # ldns-keygen -v + # dnst nsec3-hash nlnetlabs.nl + # ldns-nsec3-hash nlnetlabs.nl + /usr/libexec/cascade/cascade-dnst keyset --help + man cascade-dnst + # man dnst-keygen + # man ldns-keygen + man cascade-dnst-keyset + ;; + + post-upgrade) + # Nothing to do. + # Run some sanity checks + /usr/libexec/cascade/cascade-dnst --version + # ldns-keygen -v + # dnst nsec3-hash nlnetlabs.nl + # ldns-nsec3-hash nlnetlabs.nl + /usr/libexec/cascade/cascade-dnst keyset --help + man cascade-dnst + # man dnst + # man dnst-keygen + # man ldns-keygen + man cascade-dnst-keyset + ;; +esac diff --git a/pkg/test-scripts/test-dnst.sh b/pkg/test-scripts/test-dnst.sh deleted file mode 100644 index 2738a571..00000000 --- a/pkg/test-scripts/test-dnst.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -set -eo pipefail -set -x - -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