diff --git a/packages/debug/strace/package.mk b/packages/debug/strace/package.mk index 3831891d66..52fd8b462a 100644 --- a/packages/debug/strace/package.mk +++ b/packages/debug/strace/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="strace" -PKG_VERSION="6.2" -PKG_SHA256="0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8" +PKG_VERSION="6.3" +PKG_SHA256="e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731" PKG_LICENSE="BSD" PKG_SITE="https://strace.io/" PKG_URL="https://strace.io/files/${PKG_VERSION}/strace-${PKG_VERSION}.tar.xz" diff --git a/packages/debug/strace/patches/strace-0003-fix-build-with-linux6-3-2.patch b/packages/debug/strace/patches/strace-0003-fix-build-with-linux6-3-2.patch new file mode 100644 index 0000000000..e3e082ee4f --- /dev/null +++ b/packages/debug/strace/patches/strace-0003-fix-build-with-linux6-3-2.patch @@ -0,0 +1,29 @@ +From 8f691206e4aa769cc99e264f1c15ae6956789f91 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Mon, 15 May 2023 08:00:00 +0000 +Subject: [PATCH] configure: do not take the SUBLEVEL part of the kernel + version into account + +* configure.ac: When deciding whether to use bundled version of kernel +headers, ignore the SUBLEVEL part of the kernel version, assuming that +any potential changes in UAPI introduced in stable kernels are not +important. + +Resolves: https://github.com/strace/strace/issues/253 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index efd0632e80..f12ad7a725 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -278,7 +278,7 @@ AC_CACHE_CHECK( + [AS_IF([test $enable_bundled = check], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#include +-#define USE_OS_HEADERS (LINUX_VERSION_CODE > ]linux_version_code[ ? 1 : -1)], ++#define USE_OS_HEADERS ((LINUX_VERSION_CODE >> 8) > (]linux_version_code[ >> 8) ? 1 : -1)], + [[int i[USE_OS_HEADERS];]] + ) + ],