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.

diff --git a/testing/scripts/recipes/008_xfrm-ada.mk b/testing/scripts/recipes/008_xfrm-ada.mk
index 185f813e7200fb14bf3d1c58a7700a95ae2cbc45..6202d7bb6711ee351694fedf1f83a30cc42a6a7e 100644 (file)
--- 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 589d965336c8ef0cbba4388453b3da7faa8979f9..d82f6a95c99e03afb0a444795397aeb712d06093 100644 (file)
--- 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