commit 4b4aa8a7feaab08492c3f596df9182070ee8d814
parent a903133cdcd78b6a25687bd23c793d17d17b90c8
Author: triesap <tyson@radroots.org>
Date: Wed, 21 Oct 2026 23:51:53 +0000
build: use the maintained parser for native binding generation
- Pin the reviewed upstream Askama repair and exact source inventory
- Remove archived basic-toml while retaining the current registry graph
- Bind the existing source-policy test to the governed package catalog
- Verify frozen output, native language workflows and dependency contracts
Diffstat:
5 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -174,11 +174,9 @@ dependencies = [
[[package]]
name = "askama_derive"
version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071ee5ebf2138e3ad180e0aacf6940c2cab5e6d8333741d9925c7bee2b153f39"
+source = "git+https://github.com/askama-rs/askama?rev=d47daf8767805c0c4dfb456145fc857bfd9c1d2c#d47daf8767805c0c4dfb456145fc857bfd9c1d2c"
dependencies = [
"askama_parser",
- "basic-toml",
"glob",
"memchr",
"proc-macro2",
@@ -187,6 +185,7 @@ dependencies = [
"serde",
"serde_derive",
"syn 3.0.2",
+ "toml 1.1.8+spec-1.1.0",
]
[[package]]
@@ -201,8 +200,7 @@ dependencies = [
[[package]]
name = "askama_parser"
version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c5ae75772275d268b03ab8bdccdd12117b6169ee23256942b34e46c9f476583"
+source = "git+https://github.com/askama-rs/askama?rev=d47daf8767805c0c4dfb456145fc857bfd9c1d2c#d47daf8767805c0c4dfb456145fc857bfd9c1d2c"
dependencies = [
"rustc-hash 2.1.3",
"serde",
@@ -366,15 +364,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
[[package]]
-name = "basic-toml"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba62675e8242a4c4e806d12f11d136e626e6c8361d6b829310732241652a178a"
-dependencies = [
- "serde",
-]
-
-[[package]]
name = "bech32"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
@@ -295,3 +295,7 @@ walkdir = { version = "2" }
x509-parser = { version = "0.17", default-features = false }
zstd = { version = "0.13", default-features = false }
zeroize = { version = "1", default-features = false }
+
+[patch.crates-io]
+# Official Askama repair removes archived basic-toml (RUSTSEC-2026-0374).
+askama_derive = { git = "https://github.com/askama-rs/askama", rev = "d47daf8767805c0c4dfb456145fc857bfd9c1d2c", version = "=0.16.1" }
diff --git a/contracts/releases/supply_chain.toml b/contracts/releases/supply_chain.toml
@@ -53,6 +53,12 @@ revision = "b323ae0c1c1424b78bf8bb8832b95e86771f1dee"
packages = ["async-utility"]
removal_when = "The selected upstream SDK uses a registry async-utility with the same required behavior."
+[[git_source]]
+url = "https://github.com/askama-rs/askama"
+revision = "d47daf8767805c0c4dfb456145fc857bfd9c1d2c"
+packages = ["askama_derive", "askama_parser"]
+removal_when = "A published Askama release removes basic-toml and passes the native binding generator and exact source-policy checks."
+
[[package]]
name = "radroots_core"
manifest_path = "crates/core/Cargo.toml"
diff --git a/deny.toml b/deny.toml
@@ -58,8 +58,10 @@ skip-tree = []
[sources]
unknown-registry = "deny"
unknown-git = "deny"
+required-git-spec = "rev"
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
allow-git = [
+ "https://github.com/askama-rs/askama",
"https://github.com/nostrdevkit/nostr.git",
"https://github.com/yukibtc/async-utility",
]
diff --git a/tools/xtask/src/supply_chain_qualification.rs b/tools/xtask/src/supply_chain_qualification.rs
@@ -883,7 +883,8 @@ mod tests {
fn current_contract_is_exact_and_exception_bound() {
let root = root();
let contract = load(&root).expect("contract");
- validate(&root, &contract, 21).expect("valid contract");
+ let packages = crate::catalog::public_packages(&root).expect("catalog");
+ validate(&root, &contract, packages.len()).expect("valid contract");
qualify_git_sources(&root, &contract).expect("exact direct and transitive Git sources");
}