ntpd-rs: update to 1.5.0

srcpkgs/ntpd-rs/patches/use-ring.patch

@@ -0,0 +1,451 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index b27b7ed..40b9ef9 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -54,15 +54,6 @@ dependencies = [
+  "zeroize",
+ ]
+ 
+-[[package]]
+-name = "aho-corasick"
+-version = "1.1.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+-dependencies = [
+- "memchr",
+-]
+-
+ [[package]]
+ name = "arbitrary"
+ version = "1.4.1"
+@@ -80,31 +71,6 @@ dependencies = [
+  "syn",
+ ]
+ 
+-[[package]]
+-name = "aws-lc-rs"
+-version = "1.12.4"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4cd755adf9707cf671e31d944a189be3deaaeee11c8bc1d669bb8022ac90fbd0"
+-dependencies = [
+- "aws-lc-sys",
+- "paste",
+- "zeroize",
+-]
+-
+-[[package]]
+-name = "aws-lc-sys"
+-version = "0.26.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0f9dd2e03ee80ca2822dd6ea431163d2ef259f2066a4d6ccaca6d9dcb386aa43"
+-dependencies = [
+- "bindgen",
+- "cc",
+- "cmake",
+- "dunce",
+- "fs_extra",
+- "paste",
+-]
+-
+ [[package]]
+ name = "backtrace"
+ version = "0.3.74"
+@@ -120,29 +86,6 @@ dependencies = [
+  "windows-targets 0.52.6",
+ ]
+ 
+-[[package]]
+-name = "bindgen"
+-version = "0.69.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+-dependencies = [
+- "bitflags",
+- "cexpr",
+- "clang-sys",
+- "itertools",
+- "lazy_static",
+- "lazycell",
+- "log",
+- "prettyplease",
+- "proc-macro2",
+- "quote",
+- "regex",
+- "rustc-hash",
+- "shlex",
+- "syn",
+- "which",
+-]
+-
+ [[package]]
+ name = "bitflags"
+ version = "2.8.0"
+@@ -176,8 +119,6 @@ version = "1.2.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+ dependencies = [
+- "jobserver",
+- "libc",
+  "shlex",
+ ]
+ 
+@@ -187,15 +128,6 @@ version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+ 
+-[[package]]
+-name = "cexpr"
+-version = "0.6.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+-dependencies = [
+- "nom",
+-]
+-
+ [[package]]
+ name = "cfg-if"
+ version = "1.0.0"
+@@ -212,17 +144,6 @@ dependencies = [
+  "inout",
+ ]
+ 
+-[[package]]
+-name = "clang-sys"
+-version = "1.8.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+-dependencies = [
+- "glob",
+- "libc",
+- "libloading",
+-]
+-
+ [[package]]
+ name = "clock-steering"
+ version = "0.2.1"
+@@ -243,15 +164,6 @@ dependencies = [
+  "digest",
+ ]
+ 
+-[[package]]
+-name = "cmake"
+-version = "0.1.54"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+-dependencies = [
+- "cc",
+-]
+-
+ [[package]]
+ name = "combine"
+ version = "4.6.7"
+@@ -327,40 +239,12 @@ dependencies = [
+  "subtle",
+ ]
+ 
+-[[package]]
+-name = "dunce"
+-version = "1.0.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+-
+-[[package]]
+-name = "either"
+-version = "1.14.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
+-
+ [[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.10"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+-dependencies = [
+- "libc",
+- "windows-sys 0.59.0",
+-]
+-
+-[[package]]
+-name = "fs_extra"
+-version = "1.3.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+-
+ [[package]]
+ name = "generic-array"
+ version = "0.14.7"
+@@ -388,27 +272,12 @@ version = "0.31.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+ 
+-[[package]]
+-name = "glob"
+-version = "0.3.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+-
+ [[package]]
+ name = "hashbrown"
+ version = "0.15.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+ 
+-[[package]]
+-name = "home"
+-version = "0.5.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+-dependencies = [
+- "windows-sys 0.59.0",
+-]
+-
+ [[package]]
+ name = "indexmap"
+ version = "2.7.1"
+@@ -428,15 +297,6 @@ dependencies = [
+  "generic-array",
+ ]
+ 
+-[[package]]
+-name = "itertools"
+-version = "0.12.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+-dependencies = [
+- "either",
+-]
+-
+ [[package]]
+ name = "itoa"
+ version = "1.0.14"
+@@ -465,49 +325,18 @@ version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+ 
+-[[package]]
+-name = "jobserver"
+-version = "0.1.32"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+-dependencies = [
+- "libc",
+-]
+-
+ [[package]]
+ name = "lazy_static"
+ version = "1.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+ 
+-[[package]]
+-name = "lazycell"
+-version = "1.3.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+-
+ [[package]]
+ name = "libc"
+ version = "0.2.170"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+ 
+-[[package]]
+-name = "libloading"
+-version = "0.8.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+-dependencies = [
+- "cfg-if",
+- "windows-targets 0.52.6",
+-]
+-
+-[[package]]
+-name = "linux-raw-sys"
+-version = "0.4.15"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+-
+ [[package]]
+ name = "log"
+ version = "0.4.26"
+@@ -530,12 +359,6 @@ version = "2.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+ 
+-[[package]]
+-name = "minimal-lexical"
+-version = "0.2.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+-
+ [[package]]
+ name = "miniz_oxide"
+ version = "0.8.5"
+@@ -556,16 +379,6 @@ dependencies = [
+  "windows-sys 0.52.0",
+ ]
+ 
+-[[package]]
+-name = "nom"
+-version = "7.1.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+-dependencies = [
+- "memchr",
+- "minimal-lexical",
+-]
+-
+ [[package]]
+ name = "ntp-proto"
+ version = "1.5.0"
+@@ -656,12 +469,6 @@ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+ 
+-[[package]]
+-name = "paste"
+-version = "1.0.15"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+-
+ [[package]]
+ name = "pin-project-lite"
+ version = "0.2.16"
+@@ -686,16 +493,6 @@ dependencies = [
+  "zerocopy",
+ ]
+ 
+-[[package]]
+-name = "prettyplease"
+-version = "0.2.29"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
+-dependencies = [
+- "proc-macro2",
+- "syn",
+-]
+-
+ [[package]]
+ name = "proc-macro2"
+ version = "1.0.93"
+@@ -744,35 +541,6 @@ dependencies = [
+  "getrandom",
+ ]
+ 
+-[[package]]
+-name = "regex"
+-version = "1.11.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+-dependencies = [
+- "aho-corasick",
+- "memchr",
+- "regex-automata",
+- "regex-syntax",
+-]
+-
+-[[package]]
+-name = "regex-automata"
+-version = "0.4.9"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+-dependencies = [
+- "aho-corasick",
+- "memchr",
+- "regex-syntax",
+-]
+-
+-[[package]]
+-name = "regex-syntax"
+-version = "0.8.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+-
+ [[package]]
+ name = "ring"
+ version = "0.17.11"
+@@ -793,34 +561,15 @@ version = "0.1.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+ 
+-[[package]]
+-name = "rustc-hash"
+-version = "1.1.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+-
+-[[package]]
+-name = "rustix"
+-version = "0.38.44"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+-dependencies = [
+- "bitflags",
+- "errno",
+- "libc",
+- "linux-raw-sys",
+- "windows-sys 0.59.0",
+-]
+-
+ [[package]]
+ name = "rustls"
+ version = "0.23.23"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
+ dependencies = [
+- "aws-lc-rs",
+  "log",
+  "once_cell",
++ "ring",
+  "rustls-pki-types",
+  "rustls-webpki",
+  "subtle",
+@@ -878,7 +627,6 @@ version = "0.102.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+ dependencies = [
+- "aws-lc-rs",
+  "ring",
+  "rustls-pki-types",
+  "untrusted",
+@@ -1220,18 +968,6 @@ dependencies = [
+  "rustls-pki-types",
+ ]
+ 
+-[[package]]
+-name = "which"
+-version = "4.4.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+-dependencies = [
+- "either",
+- "home",
+- "once_cell",
+- "rustix",
+-]
+-
+ [[package]]
+ name = "winapi"
+ version = "0.3.9"
+diff --git a/Cargo.toml b/Cargo.toml
+index 681f70a..7652eae 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -48,9 +48,9 @@ clock-steering = "0.2.1"
+ pps-time = "0.2.3"
+ 
+ # TLS
+-rustls23 = { package = "rustls", version = "0.23.16", features = ["logging", "std", "tls12"] }
++rustls23 = { package = "rustls", version = "0.23.16", default-features = false, features = ["ring", "logging", "std", "tls12"] }
+ rustls-platform-verifier = "0.5.0"
+-tokio-rustls = { version = "0.26.0", features = ["logging", "tls12"] } # testing only
++tokio-rustls = { version = "0.26.0", default-features = false, features = ["ring", "logging", "tls12"] } # testing only
+ 
+ # crypto
+ aead = "0.5.0"

srcpkgs/ntpd-rs/template

@@ -1,7 +1,7 @@
 # Template file for 'ntpd-rs'
 pkgname=ntpd-rs
-version=1.4.0
-revision=2
+version=1.5.0
+revision=1
 build_style=cargo
 make_check_args="--
  --skip daemon::keyexchange::tests::client_connection_refused
@@ -15,7 +15,7 @@ license="Apache-2.0 OR MIT"
 homepage="https://github.com/pendulum-project/ntpd-rs"
 changelog="https://raw.githubusercontent.com/pendulum-project/ntpd-rs/main/CHANGELOG.md"
 distfiles="https://github.com/pendulum-project/ntpd-rs/archive/refs/tags/v${version}.tar.gz"
-checksum=172210e8ef5f4fbac9b09f211cedc6bebce0f2686870ba33dd87cb579da07e80
+checksum=3ba8ed9b8b89bfa5d3bc93ac1783e57005db251e70e4d8bdb970ded11c010819
 
 system_accounts="_ntpd_rs"
 conf_files="/etc/ntpd-rs/ntp.toml"