gentoo auto-resync : 05:12:2022 - 15:06:42

3 files changed, 45 insertions, 1 deletions

diff --git a/dev-util/muon/Manifest b/dev-util/muon/Manifest
index b0b69097e69e..5d2ca426f4c1 100644
--- a/dev-util/muon/Manifest
+++ b/dev-util/muon/Manifest
@@ -1,7 +1,8 @@
+AUX muon-0.1.0-fix-potential-overflow.patch 1437 BLAKE2B 1aca2550d95961834953eacf019a644e97d1e88a0fb07af86663f49913966a921e3aae178990da3305cd82d91e7d17dee2be60b8016c52e9727fc0cc9b3b2a76 SHA512 ee1c156ab71e8ac9abc4adfd0c345e8d7d0a6ed8a991019961d06a9bc5e67cdd2126af3284cfc46eb31dd3bc239cfcb44c7de658fb270d9dc929ddc016429edd
 DIST meson-docs-0.63.0-239-g41a05ff93.tar.gz 78127 BLAKE2B ec4e8ced8ca58ebcef50075ba4e1a93fd54e306089f736cdd3a2236d79b2db0509a7ed4dd4dc9064a8eabb796107f26771fbfb44a17a56b27c891740c73eca3f SHA512 47e0e736db8fcd039b1778296f0dd28bea1c7688bb52c1d7e84bf568050bd058b7569f18f5df6440a9c319558f6397bcc3c35e4c8b261e438220205f96fb44de
 DIST meson-docs-0.63.0-40-g280f3423b.tar.gz 77042 BLAKE2B 2724d720ed05b99d933f85039a22a9a46c5f83322aa6ada16023a721828f0063a3cbc74150b6e682a45493f7af3887fb4422bce656827c638d13467b54d69b79 SHA512 119e6b857e109af47044d0a1515d377490f4c4f4b94a4134f642cf1ed5d9ad7ffc99628133ed5fb49d46891469fddb369b8a469f8eb07a903421b48b835a64e3
 DIST muon-0.1.0.tar.gz 472632 BLAKE2B f55fffcc56adc6e84646eae627aa17e3b929f2083d8faf8838ade9f032f23538256dd6f354fc93d3640fd331a2fa98fc42d290f51177b1973883ade3b20b4e34 SHA512 54337fed8ae41bf2dca3cbb0a303a521b7750eb7e5b40ca1aeb0fc045ac82b163d77c7b06a6a790eb3feef6f8d10f2a6b7937f55cfb1404c70b429dd0899dd5f
 DIST muon-0_pre20220714.tar.gz 441746 BLAKE2B 22a9c2d1ba76c01553cfd7c13b738f505710df7337f52a0dcbff0779fd0ff01b188994f25f9f31b84d0730d3d88e4334301f1252170ab0258e4cb835924f27d2 SHA512 326424a626788308e608d0c63db39b8d25c493c7f3636ed3fd87c90c8c89800fab231680c18b97c66a9f316cf569a767f9653a4bddd8c57bf5460e7ab9764259
-EBUILD muon-0.1.0.ebuild 1406 BLAKE2B 05b5042967e1901a1f0f2a26a408964d565061d6e9ee41608654ad7e837cba115fef9fe8f67432e9412bf4135edec5f2eab055af0eb6e2cc8d52e825c24729ac SHA512 32980e781784b5fc3067ccfadb6c61cef9df6d876d8ac3a7bb320f24d90aeecd9d6a875e8c4cf6d2fa6b7876369b5c943e2857a9c4c746fd02c6d4e252cba358
+EBUILD muon-0.1.0-r1.ebuild 1474 BLAKE2B b58589b7401b5eed04a787066908438641809946908049c47f1bdeb02e162e061c17996bf30dd4b02ca273f5305bb1447e0d660d664ce895b4c76049d1cba3ef SHA512 7d1ad5d308494bd3ce3e453bc61ec07b6141d65edf385d771bfca004897cd7b5bba6490409e642a4f9e7a0c6c967dfe6bba21ff2cdc0c6d41a622bf1c9c6e53b
 EBUILD muon-0_pre20220714.ebuild 1440 BLAKE2B 26de57b49675973875c0b6d19e3e5e7b767b4d44a551fded5f81bb5c8213a66e3ef41ee4b3c7619ec1ce817da36b1fcb8c2a90c231f0e286e668d70abcadc325 SHA512 3cb1fafb860f3984018b706cf7e75582bf89e309a6b587fcc88013954e065fe15dfec834713411e8508c5819afc4373e1ec7b522257f5c38037e754d1c4962c6
 MISC metadata.xml 721 BLAKE2B 931fe009d24ade52e7bb48c4af43c9934a64c536a1382f57948fce1f6128c832b37ed6de5086e0bfca4936bb10204fe225ddffa1a3f15a480f8b847b890c9a51 SHA512 dec94997352d6e498eeef43f6853f2bf2c84be1d84afe80a8a7f837084e8365714517cb6caf158ae47d226d1de5b10c2ac69afa69486c12e0e6fb28f55c785fe
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
new file mode 100644
index 000000000000..fc33cb98f611
--- /dev/null
+++ b/dev-util/muon/files/muon-0.1.0-fix-potential-overflow.patch
@@ -0,0 +1,39 @@
+From 44daee7db0e6cc32f67ad2e944e7e68d73d3acc4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+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/muon-0.1.0.ebuild b/dev-util/muon/muon-0.1.0-r1.ebuild
index 45c2381becbd..005a2ec004fd 100644
--- a/dev-util/muon/muon-0.1.0.ebuild
+++ b/dev-util/muon/muon-0.1.0-r1.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/muon-0.1.0-fix-potential-overflow.patch"
+)
+
 python_check_deps() {
 	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }