commit: cd37f4a2b64f730128f8ec855dc2b086140c00cc Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Thu Jul 20 18:12:07 2023 +0000 Commit: Arsen Arsenović <arsen <AT> gentoo <DOT> org> CommitDate: Thu Jul 20 19:17:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd37f4a2
dev-util/muon: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31972 Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org> .../files/muon-0.1.0-fix-potential-overflow.patch | 39 ---------------------- ...test-Wincompatible-function-pointer-types.patch | 28 ---------------- 2 files changed, 67 deletions(-) diff --git a/dev-util/muon/files/muon-0.1.0-fix-potential-overflow.patch b/dev-util/muon/files/muon-0.1.0-fix-potential-overflow.patch deleted file mode 100644 index fc33cb98f611..000000000000 --- a/dev-util/muon/files/muon-0.1.0-fix-potential-overflow.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 44daee7db0e6cc32f67ad2e944e7e68d73d3acc4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <[email protected]> -Date: Sun, 20 Nov 2022 22:23:33 +0100 -Subject: [PATCH] build_target: Fix possible out-of-bounds edge case - -Detected on Tinderbox with FORTIFY_SOURCE=3. - -Bug: https://bugs.gentoo.org/882295 ---- - src/functions/kernel/build_target.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/functions/kernel/build_target.c b/src/functions/kernel/build_target.c -index 07b20e29..2ecc27c4 100644 ---- a/src/functions/kernel/build_target.c -+++ b/src/functions/kernel/build_target.c -@@ -307,7 +307,6 @@ determine_target_build_name(struct workspace *wk, struct obj_build_target *tgt, - obj name_pre, obj name_suff, char plain_name[BUF_SIZE_2k]) - { - const char *pref, *suff, *ver_suff = NULL; -- uint32_t i; - - switch (tgt->type) { - case tgt_executable: -@@ -341,10 +340,7 @@ determine_target_build_name(struct workspace *wk, struct obj_build_target *tgt, - suff = get_cstr(wk, name_suff); - } - -- i = snprintf(plain_name, BUF_SIZE_2k, "%s%s", pref, get_cstr(wk, tgt->name)); -- if (suff) { -- snprintf(&plain_name[i], BUF_SIZE_2k, ".%s", suff); -- } -+ snprintf(plain_name, BUF_SIZE_2k, "%s%s%s%s", pref, get_cstr(wk, tgt->name), suff ? "." : "", suff ? suff : ""); - - tgt->build_name = make_strf(wk, "%s%s%s", plain_name, ver_suff ? "." : "", ver_suff ? ver_suff : ""); - return true; --- -2.34.5 - diff --git a/dev-util/muon/files/muon-0.1.0-test-Wincompatible-function-pointer-types.patch b/dev-util/muon/files/muon-0.1.0-test-Wincompatible-function-pointer-types.patch deleted file mode 100644 index cdf0ebd5ceff..000000000000 --- a/dev-util/muon/files/muon-0.1.0-test-Wincompatible-function-pointer-types.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5362fa8b5182c72d4d58b6569e65c0bdd988320e Mon Sep 17 00:00:00 2001 -From: Stone Tickle <[email protected]> -Date: Sat, 17 Dec 2022 20:23:59 -0500 -Subject: [PATCH] fix signature of thread entrypoint function - ---- -https://git.sr.ht/~lattis/muon/commit/5362fa8b5182c72d4d58b6569e65c0bdd988320e -https://bugs.gentoo.org/885567 - - tests/project/common/94 threads/threadprog.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/project/common/94 threads/threadprog.c b/tests/project/common/94 threads/threadprog.c -index 7bfb7c44..787b8472 100644 ---- a/tests/project/common/94 threads/threadprog.c -+++ b/tests/project/common/94 threads/threadprog.c -@@ -22,7 +22,7 @@ int main(void) { - #include<pthread.h> - #include<stdio.h> - --void* main_func(void) { -+void *main_func(void *_) { - printf("Printing from a thread.\n"); - return NULL; - } --- -2.34.5 -
