guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 0075d65fd9efcfc13632da5f4c317b5dcb1ff4e0
Author: Anderson Torres <[email protected]>
AuthorDate: Wed Dec 31 21:07:05 2025 -0300
gnu: atf: Update to 0.23.
The patch atf-execute-with-shell.patch was incorporated.
* gnu/packages/check.scm (atf): Update to 0.23.
* gnu/packages/patches/atf-execute-with-shell.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Remove it.
Change-Id: I8106a47b501cdeac47e246d916e387dec1b664fd
Signed-off-by: Ludovic Courtès <[email protected]>
Modified-by: Ludovic Courtès <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/check.scm | 6 ++--
gnu/packages/patches/atf-execute-with-shell.patch | 39 -----------------------
3 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 797e063c75..e477c6bd6f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1005,7 +1005,6 @@ dist_patch_DATA =
\
%D%/packages/patches/asli-use-system-libs.patch \
%D%/packages/patches/aspell-CVE-2019-25051.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \
- %D%/packages/patches/atf-execute-with-shell.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch \
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 09eecde3b3..633d33197c 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -140,7 +140,7 @@
(define-public atf
(package
(name "atf")
- (version "0.21")
+ (version "0.23")
(source
(origin
(method git-fetch)
@@ -150,9 +150,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "0jwzz6g9jdi5f8v10y0wf3hq73vxyv5qqhkh832ddsj36gn8rlcz"))
- (patches
- (search-patches "atf-execute-with-shell.patch"))))
+ "12hcvclzphgkhmp226abhn9nl2j5vcm7nfnqbs8232ws41x1gmw3"))))
(build-system gnu-build-system)
(arguments
(list
diff --git a/gnu/packages/patches/atf-execute-with-shell.patch
b/gnu/packages/patches/atf-execute-with-shell.patch
deleted file mode 100644
index bde4fb336a..0000000000
--- a/gnu/packages/patches/atf-execute-with-shell.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Submitted here: https://github.com/freebsd/atf/pull/57
-
-From 098b66269b1cf1d944b8b214ceb7ce9febde3682 Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <[email protected]>
-Date: Mon, 29 Jan 2024 22:35:49 -0500
-Subject: [PATCH] Fix use after free in execute_with_shell.
-
-The temporary string returned by atf::env::get would be used outside
-its statement, which is invalid and cause undefined behavior. Copy it
-to a local variable to avoid the issue.
-
-Fixes: https://github.com/freebsd/atf/issues/26
-Fixes: https://github.com/freebsd/kyua/issues/223
-
-Reported-by: Ruslan Bukin <[email protected]>
----
- atf-sh/atf-check.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp
-index 41f0b13..9d6f7a8 100644
---- a/atf-sh/atf-check.cpp
-+++ b/atf-sh/atf-check.cpp
-@@ -436,7 +436,9 @@ execute_with_shell(char* const* argv)
- const std::string cmd = flatten_argv(argv);
-
- const char* sh_argv[4];
-- sh_argv[0] = atf::env::get("ATF_SHELL", ATF_SHELL).c_str();
-+ const std::string shell = atf::env::get("ATF_SHELL", ATF_SHELL);
-+
-+ sh_argv[0] = shell.c_str();
- sh_argv[1] = "-c";
- sh_argv[2] = cmd.c_str();
- sh_argv[3] = NULL;
-
-base-commit: 18eb8168b70a0f934b4824b6391b55ac0b2f4fdf
---
-2.41.0
-
