From 6ea8cabc6ff34c36b66846218cd65518484485e3 Mon Sep 17 00:00:00 2001
From: Ralf Hubert <ralf.hubert@secunet.com>
Date: Fri, 23 Jan 2026 14:24:19 +0100
Subject: [PATCH 1/2] treewide: use cmake 3.31 where needed

After updating Cmake in basement to v4.2 all packages using a
cmake_minimum_version <= 3.5 can no longer be cmaked. Use an older cmake
version for them.
---
 recipes/libs/double-conversion.yaml | 2 +-
 recipes/libs/jsonc.yaml             | 2 +-
 recipes/libs/yajl.yaml              | 2 +-
 recipes/utils/tidy.yaml             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/libs/double-conversion.yaml b/recipes/libs/double-conversion.yaml
index 956aaae3..c147046a 100644
--- a/recipes/libs/double-conversion.yaml
+++ b/recipes/libs/double-conversion.yaml
@@ -1,4 +1,4 @@
-inherit: [cmake]
+inherit: ['compat::cmake-3.31']
 
 metaEnvironment:
     PKG_VERSION: "3.3.0"
diff --git a/recipes/libs/jsonc.yaml b/recipes/libs/jsonc.yaml
index b255a0db..bf82e6bc 100644
--- a/recipes/libs/jsonc.yaml
+++ b/recipes/libs/jsonc.yaml
@@ -1,4 +1,4 @@
-inherit: [cmake]
+inherit: ['compat::cmake-3.31']
 
 metaEnvironment:
     PKG_DESCRIPTION: "A JSON implementation in C"
diff --git a/recipes/libs/yajl.yaml b/recipes/libs/yajl.yaml
index 58d00cb7..c732da5a 100644
--- a/recipes/libs/yajl.yaml
+++ b/recipes/libs/yajl.yaml
@@ -1,4 +1,4 @@
-inherit: [cmake]
+inherit: ['compat::cmake-3.31']
 
 metaEnvironment:
     PKG_VERSION: "2.1.0"
diff --git a/recipes/utils/tidy.yaml b/recipes/utils/tidy.yaml
index 580ee558..5d6ed5e8 100644
--- a/recipes/utils/tidy.yaml
+++ b/recipes/utils/tidy.yaml
@@ -1,4 +1,4 @@
-inherit: [cmake]
+inherit: ['compat::cmake-3.31']
 
 metaEnvironment:
     PKG_VERSION: "5.8.0"

From 58aff39758d992a480a859ba75c2afc6765ee411 Mon Sep 17 00:00:00 2001
From: Ralf Hubert <ralf.hubert@secunet.com>
Date: Fri, 23 Jan 2026 14:26:02 +0100
Subject: [PATCH 2/2] utils/strace: bump to v6.18

This fixes a incompatibility with glibc2.42.
---
 recipes/utils/strace.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/utils/strace.yaml b/recipes/utils/strace.yaml
index 0e32c673..a21d3427 100644
--- a/recipes/utils/strace.yaml
+++ b/recipes/utils/strace.yaml
@@ -1,13 +1,13 @@
 inherit: [autotools]
 
 metaEnvironment:
-    PKG_VERSION: "6.10"
+    PKG_VERSION: "6.18"
     PKG_LICENSE: "LGPL-2.1-or-later"
 
 checkoutSCM:
     scm: url
     url: https://strace.io/files/${PKG_VERSION}/strace-${PKG_VERSION}.tar.xz
-    digestSHA256: 765ec71aa1de2fe37363c1e40c7b7669fc1d40c44bb5d38ba8e8cd82c4edcf07
+    digestSHA256: 0ad5dcba973a69e779650ef1cb335b12ee60716fc7326609895bd33e6d2a7325
     stripComponents: 1
 
 buildTools: [host-toolchain]