From c828915560f314aba0cdc61deb225bf62a868f4f Mon Sep 17 00:00:00 2001
From: loki5512344 <mauhhhh7@gmail.com>
Date: Tue, 21 Jul 2026 16:16:07 +0200
Subject: [PATCH] fix: cargo-deny CDLA-Permissive-2.0, build.rs asm include
 path, eclipse-temurin noble tag

---
 crates/rampart-core/build.rs      | 5 +++--
 deny.toml                         | 1 +
 deploy/docker/Dockerfile.paper    | 2 +-
 deploy/docker/Dockerfile.velocity | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/crates/rampart-core/build.rs b/crates/rampart-core/build.rs
index 8b3865b..2a289f6 100644
--- a/crates/rampart-core/build.rs
+++ b/crates/rampart-core/build.rs
@@ -16,7 +16,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     println!("cargo:rerun-if-changed={}", src.display());
 
-    let host_arch = std::env::var("HOST").unwrap_or_default();
+    let host_triple = std::env::var("HOST").unwrap_or_default();
+    let arch = host_triple.split('-').next().unwrap_or(&host_triple);
     let status = Command::new("clang")
         .args([
             "-O2",
@@ -29,7 +30,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             "-o",
             dst.to_str().ok_or("dst path is not valid UTF-8")?,
             &format!("-I{}", xdp_dir.display()),
-            &format!("-I/usr/include/{}-linux-gnu", host_arch),
+            &format!("-I/usr/include/{}-linux-gnu", arch),
         ])
         .status()?;
 
diff --git a/deny.toml b/deny.toml
index 572d089..dc75996 100644
--- a/deny.toml
+++ b/deny.toml
@@ -23,6 +23,7 @@ allow = [
     "Zlib",
     "Unlicense",
     "CC0-1.0",
+    "CDLA-Permissive-2.0",
     "GPL-3.0",
     "GPL-3.0-only",
     "MPL-2.0",
diff --git a/deploy/docker/Dockerfile.paper b/deploy/docker/Dockerfile.paper
index ecdff51..0a9c653 100644
--- a/deploy/docker/Dockerfile.paper
+++ b/deploy/docker/Dockerfile.paper
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jre-bookworm
+FROM eclipse-temurin:21-jre-noble
 
 ARG PAPER_VERSION=1.21.4
 ARG PAPER_BUILD=latest
diff --git a/deploy/docker/Dockerfile.velocity b/deploy/docker/Dockerfile.velocity
index 474275e..f02903c 100644
--- a/deploy/docker/Dockerfile.velocity
+++ b/deploy/docker/Dockerfile.velocity
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jre-bookworm
+FROM eclipse-temurin:21-jre-noble
 
 ARG VELOCITY_VERSION=3.4.0-SNAPSHOT
 ARG VELOCITY_BUILD=latest