gentoo auto-resync : 24:09:2023 - 23:23:49

3 files changed, 31 insertions, 7 deletions

diff --git a/sys-process/numad/Manifest b/sys-process/numad/Manifest
index c9995d325770..09e0585ea5d2 100644
--- a/sys-process/numad/Manifest
+++ b/sys-process/numad/Manifest
@@ -1,4 +1,5 @@
 AUX 0001-Fix-man-page-directory-creation.patch 722 BLAKE2B c98194d7b9a3679d800dcbd5346bc8b8c141b9021d75f574c876b1f9a8972dfe5a6247cc891c0795a2bd1687db70377e96b3e8bef663e20fedbfc1e324102bfb SHA512 e43609c3e6af1f01c886e707cd126126b9bbc8da98b8313e67d98909889f2c81d640db9bc999ca056611dc7792c8a0d3e9ecf9949b4c0a58d33e9bbe74b127ae
+AUX 0001-numad_log-fix-buffer-overflow.patch 656 BLAKE2B 9cea7193b84769487886b9259e44f43e6a9dde3f8eda515cf1582deca1c9f0867c51dd5c9f9a4f02443f5b11adb6e52a1d79b108a7b9492d3f12cad6c47d6cf7 SHA512 251dd1d748635395a901c5b00290ab87f67a05d6ca9f7a7a559da816285124f8566c6b1b2f5a60875b2ccc33369756b452a30108a0896c550c660760deaaa8c3
 AUX numad-0.5-fix-build-for-no-NR-migrate-pages.patch 1260 BLAKE2B ad1f44a208fb117ad29bffe20bca8013eb9ff07199fa6100dff792172390cc9f4dce6462d40f5e896c500bb0c0539729cbd64995e5e9d2f559152f59a2b0c60f SHA512 4a3bfe31e436edb2e1de60f8564652718f3fa3da273bac4120dc19b2de606cac7b35b9e5c225fd1094b5be13a17ca55522df7b73caf7385069acd0fcec321830
 AUX numad-0.5-fix-sparse-node-ids.patch 1941 BLAKE2B 874d49dfbe14bab9f5c58e492dcbed85b333b6859b763acbb84b27d76afbea722f701279f242ee6618c31148b1268ff3709efc86d7524076b2e1c845b1d36108 SHA512 a13df0b02ff2eb4c346e6c484deff58e8bdb563f3b075a2b308f4bed6e1d00ffad4d5cc3905920a8eceb5d7372c9b72506bf6a5c43715f792c04ff8c693a37a8
 AUX numad-0.5-ldlibs.patch 912 BLAKE2B 0e086913e819d91469bfae5a6d9e5553c91fcd2971e33e3a1066c277319671fb3157393f5ef8f6771c8d8df719d1b728c310f6de51f41112b7a954e4d149f9d9 SHA512 7bd6e90617382080aaa217fa82c1b792d4b33b2dfc51ec43f3539e2b98eec1aa7fa8312e11fef97974d3ecd3f888a997a3c2b21ee980fc8ec4e74dd4bcdb6cbc
@@ -10,6 +11,6 @@ DIST numad-0.5-334278f.tar.bz2 21007 BLAKE2B f226e90e0ad664b0cccd82c060b21cc8b7c
 DIST numad-0.5_p20180531.tar.gz 29797 BLAKE2B 455feba97685b0f0c6dd8ce10227d397b14d51d6fc128805648dd94b627ae61c4889ea4cc17667b9a1953c5122d39972172e05d3e782a313ecedbe7f85bfce41 SHA512 36b0387369b7d23b28ad8b4bd8b27089c304efb8357ad9f6693ff3098c56a3a88e39b30f70d35688e6090f4917250fd40d1aaac084a91310450412a05b8d6746
 EBUILD numad-0.5-r3.ebuild 1135 BLAKE2B 84339d76f976cbe544f05194adebecad561c7a85886f9367d4487140b15e19ce5f1307bb8ab7a6d744f5784fb93a66bd01bdbab0b5d5fdbb348bad43920dbd94 SHA512 4d7827a7c3c051748d527a7e03576f243719ecdf3cd291ca5b1343bdb36c74a5dcd7524a986cf4cff1213277ebb2f1e19132429d9ece41d581d18f3f1b01197c
 EBUILD numad-0.5-r4.ebuild 1176 BLAKE2B 945aed6353b8fcb0b4c0e146295c8ae7fca184159accce1ee421c71b3870c58af3bea59dafa99172ac2dd6ad3e44e75af1200dcde6a492f911ae428e82723f68 SHA512 e865c8dde6b328540b7f2d4ae10ae7897abf5193b57faea37a3afeac188b9f7c360d495ae1fba21f1435316b7312c2bc0871841dfc7c48903cf48a235f7cd42d
-EBUILD numad-0.5_p20180531-r1.ebuild 1526 BLAKE2B 9383ff72e18922a6e5b738706442f4a781611f0b0eb5e48c271682a86ab085bb30eece7361387eb4d19aebaa7dcc230599db323659c5954ad3e852ffc6d3fc23 SHA512 3068feb1646537a397ab42811a633223b40e59ae073658b2038ceaf2a1025e11a19fbf8f56ccf63f0a2851789e738a292b7a5c35932a2dff299b310cd89a6b4d
+EBUILD numad-0.5_p20180531-r2.ebuild 1520 BLAKE2B 63c1e51ff4b55c95e9bb089bd479b17dfb41b24fb1d1817ea1373e1810ce728a899c547abf4acf69090f642a6d96404a682f59d94bcecf69a66fce7f42712017 SHA512 d4552ed939ca2130a1f41ec44ff298961993f4e893b5aeae5e5637c079038856957ebbd0161bea9ca9bca036b126826a2eb7d6efe4ec3ecf40c681db1d619233
 EBUILD numad-9999.ebuild 1290 BLAKE2B c5a669b3c7f990ecc53c901c41a748c6e77cabd4b284a08fa7692dac20cc608383b8cbec7a7174fe36c79b8ed35d407ed436634ea1be5896aeeafaeeba869a74 SHA512 0b44f8a664bdb5af054e9ff5712884a6905cd4e6b1bc58869e134c551248920e0924fbd5281cbbacd2dd64c22854583daa1e2e6b2b366181786b43d5a3ec1d90
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-process/numad/files/0001-numad_log-fix-buffer-overflow.patch b/sys-process/numad/files/0001-numad_log-fix-buffer-overflow.patch
new file mode 100644
index 000000000000..c67d58192169
--- /dev/null
+++ b/sys-process/numad/files/0001-numad_log-fix-buffer-overflow.patch
@@ -0,0 +1,25 @@
+From a9e6f292f4ce9443ee95c77c60dd8da68d0db7e9 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Wed, 6 Sep 2023 12:27:47 +0200
+Subject: [PATCH] numad_log: fix buffer overflow
+
+---
+ numad.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numad.c b/numad.c
+index 4c85486..2923842 100644
+--- a/numad.c
++++ b/numad.c
+@@ -153,7 +153,7 @@ void numad_log(int level, const char *fmt, ...) {
+     *p++ = ' ';
+     va_list ap;
+     va_start(ap, fmt);
+-    vsnprintf(p, BUF_SIZE, fmt, ap);
++    vsnprintf(p, BUF_SIZE - strlen(buf) , fmt, ap);
+     va_end(ap);
+     fprintf(log_fs, "%s", buf);
+     fflush(log_fs);
+-- 
+2.39.2
+
diff --git a/sys-process/numad/numad-0.5_p20180531-r1.ebuild b/sys-process/numad/numad-0.5_p20180531-r2.ebuild
index 229cae6f6556..ce503112f43e 100644
--- a/sys-process/numad/numad-0.5_p20180531-r1.ebuild
+++ b/sys-process/numad/numad-0.5_p20180531-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic linux-info systemd toolchain-funcs
+inherit linux-info systemd toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://pagure.io/numad.git"
@@ -31,15 +31,13 @@ PATCHES=(
 
 	# from debian/ubuntu: https://sources.debian.org/patches/numad
 	"${FILESDIR}/${PN}-0.5-fix-build-for-no-NR-migrate-pages.patch"
+
+	# from fedora: https://src.fedoraproject.org/rpms/numad/c/b9fdb5b1b09611ba164c04cd994e5e9ddf7fb8f4
+	"${FILESDIR}/0001-numad_log-fix-buffer-overflow.patch"
 )
 
 src_configure() {
 	tc-export AR CC RANLIB
-
-	# FIXME: https://bugs.gentoo.org/890985
-	# temp workaround
-	filter-flags -D_FORTIFY_SOURCE=3
-	append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
 }
 
 src_compile() {