From d659700d688968fdc2c45a51cffcdd5ea00bbb0e Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Sun, 14 May 2023 11:05:37 +1200
Subject: [PATCH] strace: Add strace 6.3

https://lists.strace.io/pipermail/strace-devel/2023-May/011317.html

Add strace 6.3. Remove 6.2.
Add upstream patch for working with newer Linux headers.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 packages/strace/6.2/chksum                    |  4 --
 ...-take-the-SUBLEVEL-part-of-the-kerne.patch | 39 +++++++++++++++++++
 packages/strace/6.3/chksum                    |  4 ++
 packages/strace/{6.2 => 6.3}/version.desc     |  0
 4 files changed, 43 insertions(+), 4 deletions(-)
 delete mode 100644 packages/strace/6.2/chksum
 create mode 100644 packages/strace/6.3/0000-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
 create mode 100644 packages/strace/6.3/chksum
 rename packages/strace/{6.2 => 6.3}/version.desc (100%)

diff --git a/packages/strace/6.2/chksum b/packages/strace/6.2/chksum
deleted file mode 100644
index 928ef376..00000000
--- a/packages/strace/6.2/chksum
+++ /dev/null
@@ -1,4 +0,0 @@
-md5 strace-6.2.tar.xz da0507c05f3cde62486755172e020f18
-sha1 strace-6.2.tar.xz bfb461e4ab6127ce127841253fe33a3b8fe2dc63
-sha256 strace-6.2.tar.xz 0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8
-sha512 strace-6.2.tar.xz 56708faa3f73c0673c98a5b8b8fe35289ecf2870f4f775bcb7a6be59451ef84685564c0129aca15b576d851f8efa1ff760e27658b914d1f31adf4de3b1ad721f
diff --git a/packages/strace/6.3/0000-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch b/packages/strace/6.3/0000-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
new file mode 100644
index 00000000..ffae1a68
--- /dev/null
+++ b/packages/strace/6.3/0000-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
@@ -0,0 +1,39 @@
+From 8f691206e4aa769cc99e264f1c15ae6956789f91 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@strace.io>
+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    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -278,7 +278,7 @@
+ 	[AS_IF([test $enable_bundled = check],
+ 	       [AC_COMPILE_IFELSE(
+ 			[AC_LANG_PROGRAM([#include <linux/version.h>
+-#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];]]
+ 			 )
+ 			],
+--- a/configure
++++ b/configure
+@@ -6303,7 +6303,7 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <linux/version.h>
+-#define USE_OS_HEADERS (LINUX_VERSION_CODE > 393984 ? 1 : -1)
++#define USE_OS_HEADERS ((LINUX_VERSION_CODE >> 8) > (]linux_version_code[ >> 8) ? 1 : -1)
+ int
+ main ()
+ {
diff --git a/packages/strace/6.3/chksum b/packages/strace/6.3/chksum
new file mode 100644
index 00000000..39f17012
--- /dev/null
+++ b/packages/strace/6.3/chksum
@@ -0,0 +1,4 @@
+md5 strace-6.3.tar.xz 119a0d932104452782149467ad619b97
+sha1 strace-6.3.tar.xz 9fc6a7c9d2de29aeb5a21b8a5099df2341584774
+sha256 strace-6.3.tar.xz e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731
+sha512 strace-6.3.tar.xz 2b0a57e3ee8a23eb3882123149cd732c568322614bf8fde69fabcea64d0d4e3c46c71d63183e0e8d9f8744a7b1cebc823cc67023660c37547f5b854fcc1ca9df
diff --git a/packages/strace/6.2/version.desc b/packages/strace/6.3/version.desc
similarity index 100%
rename from packages/strace/6.2/version.desc
rename to packages/strace/6.3/version.desc