[ptxdist] [PATCH] strace: Version bump. 6.3 -> 6.4

[ptxdist] [PATCH] strace: Version bump. 6.3 -> 6.4

[Christian Melki]

Very minor release.
https://github.com/strace/strace/releases/tag/v6.4

* Remove patches. Included in the new release.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ...-take-the-SUBLEVEL-part-of-the-kerne.patch | 28 -------------------
 patches/strace-6.3/autogen.sh                 |  1 -
 patches/strace-6.3/series                     |  4 ---
 rules/strace.make                             |  4 +--
 4 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 patches/strace-6.3/0001-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
 delete mode 120000 patches/strace-6.3/autogen.sh
 delete mode 100644 patches/strace-6.3/series

diff --git a/patches/strace-6.3/0001-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch b/patches/strace-6.3/0001-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
deleted file mode 100644
index 4ee977079..000000000
--- a/patches/strace-6.3/0001-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index efd0632e80c8..f12ad7a7257c 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 <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];]]
- 			 )
- 			],
diff --git a/patches/strace-6.3/autogen.sh b/patches/strace-6.3/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/strace-6.3/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/strace-6.3/series b/patches/strace-6.3/series
deleted file mode 100644
index 4f9bdb276..000000000
--- a/patches/strace-6.3/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
-# 99397f80711e4eb5b4c255ca93cf7344  - git-ptx-patches magic
diff --git a/rules/strace.make b/rules/strace.make
index 48f5a0f55..3d92d8db5 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace
 #
 # Paths and names
 #
-STRACE_VERSION	:= 6.3
-STRACE_MD5	:= 119a0d932104452782149467ad619b97
+STRACE_VERSION	:= 6.4
+STRACE_MD5	:= b6e5842f27b5cc9022c8bd7238435a6a
 STRACE		:= strace-$(STRACE_VERSION)
 STRACE_SUFFIX	:= tar.xz
 STRACE_URL	:= https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX)
-- 
2.34.1

Re: [ptxdist] [APPLIED] strace: Version bump. 6.3 -> 6.4

[Michael Olbrich]

Thanks, applied as c0f2bee9a61b6c4a82bb18f27dde80714146d04b.

Michael

[sent from post-receive hook]

On Sat, 08 Jul 2023 09:02:44 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Very minor release.
> https://github.com/strace/strace/releases/tag/v6.4
> 
> * Remove patches. Included in the new release.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230628181408.3666014-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/strace-6.3/0001-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch b/patches/strace-6.3/0001-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
> deleted file mode 100644
> index 4ee977079e76..000000000000
> --- a/patches/strace-6.3/0001-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -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.ac | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index efd0632e80c8..f12ad7a7257c 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 <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];]]
> - 			 )
> - 			],
> diff --git a/patches/strace-6.3/autogen.sh b/patches/strace-6.3/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7ddcb..000000000000
> --- a/patches/strace-6.3/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/strace-6.3/series b/patches/strace-6.3/series
> deleted file mode 100644
> index 4f9bdb27642e..000000000000
> --- a/patches/strace-6.3/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-configure-do-not-take-the-SUBLEVEL-part-of-the-kerne.patch
> -# 99397f80711e4eb5b4c255ca93cf7344  - git-ptx-patches magic
> diff --git a/rules/strace.make b/rules/strace.make
> index 48f5a0f5597f..3d92d8db5d30 100644
> --- a/rules/strace.make
> +++ b/rules/strace.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace
>  #
>  # Paths and names
>  #
> -STRACE_VERSION	:= 6.3
> -STRACE_MD5	:= 119a0d932104452782149467ad619b97
> +STRACE_VERSION	:= 6.4
> +STRACE_MD5	:= b6e5842f27b5cc9022c8bd7238435a6a
>  STRACE		:= strace-$(STRACE_VERSION)
>  STRACE_SUFFIX	:= tar.xz
>  STRACE_URL	:= https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX)