From b4a51f1719af2545f3275d881207330fd3bf4c07 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 15 Aug 2025 14:40:38 +0200 Subject: [PATCH] testing: Use newer version of TKM on trixie The API for libgmpada has change with 1.6 in a way that's not backwards-compatible. So we use a different revision that includes the required changes depending on the Debian version. This also adds support for esa_select(), to support seamless rekeyings, which requires updating xfrm-ada as well. --- testing/scripts/recipes/008_xfrm-ada.mk | 2 +- testing/scripts/recipes/010_tkm.mk | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/testing/scripts/recipes/008_xfrm-ada.mk b/testing/scripts/recipes/008_xfrm-ada.mk index 185f813e72..6202d7bb67 100644 --- a/testing/scripts/recipes/008_xfrm-ada.mk +++ b/testing/scripts/recipes/008_xfrm-ada.mk @@ -2,7 +2,7 @@ PKG = xfrm-ada SRC = https://git.codelabs.ch/git/$(PKG).git -REV = v0.1 +REV = e0590c6bb3c6a5b7f2edd8f95dce9e8c77e22230 PREFIX = /usr/local/ada diff --git a/testing/scripts/recipes/010_tkm.mk b/testing/scripts/recipes/010_tkm.mk index 589d965336..d82f6a95c9 100644 --- a/testing/scripts/recipes/010_tkm.mk +++ b/testing/scripts/recipes/010_tkm.mk @@ -2,7 +2,11 @@ PKG = tkm SRC = https://git.codelabs.ch/git/$(PKG).git +ifeq (,$(filter $(BASEIMG),bullseye bookworm)) +REV = 85d49c9255360663c344ccf3175092524dc66eae +else REV = v0.3 +endif export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat -- 2.47.3