From d1849ceeb9c09150c11cc0d112883cfba503af27 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Jul 2023 01:09:27 +0100 Subject: gentoo auto-resync : 21:07:2023 - 01:09:27 --- dev-util/muon/Manifest | 2 -- .../files/muon-0.1.0-fix-potential-overflow.patch | 39 ---------------------- ...test-Wincompatible-function-pointer-types.patch | 28 ---------------- 3 files changed, 69 deletions(-) delete mode 100644 dev-util/muon/files/muon-0.1.0-fix-potential-overflow.patch delete mode 100644 dev-util/muon/files/muon-0.1.0-test-Wincompatible-function-pointer-types.patch (limited to 'dev-util/muon') diff --git a/dev-util/muon/Manifest b/dev-util/muon/Manifest index 3ccc1f286610..6287591c4d83 100644 --- a/dev-util/muon/Manifest +++ b/dev-util/muon/Manifest @@ -1,5 +1,3 @@ -AUX muon-0.1.0-fix-potential-overflow.patch 1437 BLAKE2B 1aca2550d95961834953eacf019a644e97d1e88a0fb07af86663f49913966a921e3aae178990da3305cd82d91e7d17dee2be60b8016c52e9727fc0cc9b3b2a76 SHA512 ee1c156ab71e8ac9abc4adfd0c345e8d7d0a6ed8a991019961d06a9bc5e67cdd2126af3284cfc46eb31dd3bc239cfcb44c7de658fb270d9dc929ddc016429edd -AUX muon-0.1.0-test-Wincompatible-function-pointer-types.patch 873 BLAKE2B 492a63c022c38199dd21c1038342385632189a7d23d0f0d977c301eed21fc7873daad1b643066ff903931189f48f505c40d8ec066633f321cc32846a73762b14 SHA512 c82ccc3d59c60a718b35c1a3cd9ab94c7838591bb3053aa48a47a07811cbb158f21ee3f87fccd5b2a8e305f571f20e7b844cbde39730e43f1b0b9a43548346b0 DIST meson-docs-0.64.1-19-g39c6fa4bc.tar.gz 78525 BLAKE2B 19f4768e70f38f744de9bebfcc7416f8ab7f414693dc1f3e379bbbc8370e3d3187e6a9e311a08c054bdfaf1d15efd225558de7d41d688fc4c4a10e3215af85ae SHA512 59c986c4c4d545a6488cd74a2b6563b867716b74aab95fd19a745ce46a99fe5222232e132c80c5ed80f3e61d13e74cf2dc13b1b6d4638fd40a69d82d0d74faaa DIST muon-0.2.0.tar.gz 510533 BLAKE2B 6ec67f8875e84fbc2f23f412825dd47b820cd44e97a16d9ac0ab0ba9db6e755a604b66b79d3dbe13d99440daf21c2f0ccbe69661b1fb3c7df3f636c61a0e4dcb SHA512 b2e90048756bdc26bdea24fe227a87ad4d0e57176e217e22ea492a55229c62e2a70243f60af1e162e2dde8468fdda9662a32ea5cfadd69fab95a83499efa077b EBUILD muon-0.2.0-r1.ebuild 1488 BLAKE2B 85769edb7bf1d6a9b8075d1f60e42078b2618bc1f380c6a1c789b147fd14711d1974d8e53168c69c073dacb242b0d7976b20a767d5770c0b2ac8f3767f61288d SHA512 5a9e59ee7bd928842f958e6095822f0b032e3f3ab0c21a420d9d91b2436b84640f0ae62a924e1c0a96877d6a8059aa82004cb0cbd1abc114592deec76e9f13b9 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?= -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 -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 - #include - --void* main_func(void) { -+void *main_func(void *_) { - printf("Printing from a thread.\n"); - return NULL; - } --- -2.34.5 - -- cgit v1.2.3