gentoo auto-resync : 15:01:2023 - 23:56:06

7 files changed, 131 insertions, 15 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 1c5d247e7190..315ef42f4373 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/btop/Manifest b/sys-process/btop/Manifest
index a4717dac24c2..d7d5dedd9a70 100644
--- a/sys-process/btop/Manifest
+++ b/sys-process/btop/Manifest
@@ -1,6 +1,6 @@
 AUX btop-1.2.13-fix-makefile-deps.patch 1289 BLAKE2B adde21eb39016350f48fddfd98655074c6c29b3116ea5c7f19bc0373ef464ab611e6a183a8f3fd25b10eea944e6e3809596b988364796fcf26991837826444f8 SHA512 10fb0b76eac61e510bcfed4f7eda368d3e4d2935462ebe67a0355e38df0b4f503e95fe0cbf619fc3ef640ecea4d80d622d445ef57c5da16add6f89765f602a36
 AUX btop-1.2.13-verbose-mkdir.patch 669 BLAKE2B f8d4ae11816a511302a206e7ca4a32ac7704a739df69b45dd925e1fe2e572b7fc00a36c8f2c4c26f4adabddf794b478c02ba4f029a5831acbb66e5dcd31e2bdc SHA512 ef4b43c30bc286f6f96602934df32645e2b28706e824f3312fab8134a99c49cf4b8c634fadb76bc86e3e6bb9a2ef865bdcfbc0bd09933d9d833dfb4cc137089f
 DIST btop-1.2.13.tar.gz 982660 BLAKE2B 053c1ef87203b894c2cbe6007c3b5962dca232733d28f97d82a2f70e771d4cc92fe4c49d3582c80cb79974d65329d3e95e758b9e8a7fa51a2ff0cdbf6cbd9a75 SHA512 324e572d43e57e5e65e646aa743f7730e6d535fdc52e848aeb55d60c8d73945850c5b89fe0b541e98495ddf2bae71427a6ec8fe8a495b41cef885c535d01019b
-EBUILD btop-1.2.13-r1.ebuild 1380 BLAKE2B e2fc53be5650543515685db0cb9a503dcfe42263688722897d6ca244cdf1c148d24780fdfce97a2787cb7a95dd00bba959c04155c6d2c4d1239fc4a0b823d9cb SHA512 91eb2ecc3fd0cc272454182110e873f33afddee3e72a6d35dc0369e5ceee49131e0d92c78e4c14d46fc49006cc77f418a7ed91d7190173dcd3bd3c8f468ffd81
+EBUILD btop-1.2.13-r1.ebuild 1376 BLAKE2B 4a88233c246c0f06b2323fb22391f767c1a6ff4a263ba94f5ec9af2954602fb7511d84f1f19679ad92f1cabe2e19b76fa97cfc2dfdf90ceca863ab382304ea30 SHA512 0d5c2e5f995fd891ff3501211f95cde53d8d32c20ed9c4353ca7847d2b068fb444000a94943c852d93c221c0490d8085778344c0a7cce45f0b68ce9c3ae0042c
 EBUILD btop-1.2.13.ebuild 1186 BLAKE2B a32f46e360180e5ffa670093905d89935c5112201cd7b563f4b3549c307b3860f5a8dff0e0e4ff3d67852d919d359153ec5aa83ccef458fd30f2edc0a1165b80 SHA512 317625f55c5b140d1c9c4a33d6595b850ed76719fdc37860d2128c82403bc301d02a21d93bf3c458c1e957dd08bff74a4698635772e8fa599907f0c4729717e9
 MISC metadata.xml 548 BLAKE2B 74762cdc63011b363a4c06de8190541f862d70f0006461c7a1cf2d734caf20601ba0769dc067e261957fe42a64bdaf26297bf3d080c3c08203eabd73165f2f8c SHA512 bb16944df9321001ca5c9e9fff49ea39069386117f0cfde67e8f19e3f44c13d360effb578d2c44c67f792d1ff574830f13cb9ef183f594e39ad3669083f2cf41
diff --git a/sys-process/btop/btop-1.2.13-r1.ebuild b/sys-process/btop/btop-1.2.13-r1.ebuild
index 9383842c640d..6451ce359cdb 100644
--- a/sys-process/btop/btop-1.2.13-r1.ebuild
+++ b/sys-process/btop/btop-1.2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aristocratos/btop/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 ~riscv x86"
 
 BDEPEND="
 	>=sys-devel/gcc-8
diff --git a/sys-process/numad/Manifest b/sys-process/numad/Manifest
index b3ed142035ee..976231fe4325 100644
--- a/sys-process/numad/Manifest
+++ b/sys-process/numad/Manifest
@@ -1,11 +1,14 @@
 AUX 0001-Fix-man-page-directory-creation.patch 722 BLAKE2B c98194d7b9a3679d800dcbd5346bc8b8c141b9021d75f574c876b1f9a8972dfe5a6247cc891c0795a2bd1687db70377e96b3e8bef663e20fedbfc1e324102bfb SHA512 e43609c3e6af1f01c886e707cd126126b9bbc8da98b8313e67d98909889f2c81d640db9bc999ca056611dc7792c8a0d3e9ecf9949b4c0a58d33e9bbe74b127ae
+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
 AUX numad-0.5-wformat-security.patch 661 BLAKE2B 213400a08547a4c7391bed4e2f373e44f1bbdea2398d7f5037bebf3748d4ab63a5b116ca2a8b97f519891cd33186055adefbef72c86fc34576835caf23f7919a SHA512 20bb8d8dddfcc27dc0b7174aacbdac910136482369dfe2a4c99e47ca810c0604cd23faffd3c2fdab33b79f5fa40987a0b78877672345c0278fbd8a8fb3a56879
 AUX numad.confd 157 BLAKE2B c2b2c983c2192f63a8212bfbf05f51bebe5854e7bcee6df15ccb8943b08996276d840555bd658782c0baad1dd6cce458a5f7fba785d866224008c49bffd8b074 SHA512 59cb56e31e9581c4b8cdc52f2547269987afb513a9e21ac7c218733d8b7643da6587b38d491b9c739a9cf57fd8713fbfbf849112ed0b49a0b7166f0c6697ae00
 AUX numad.initd 315 BLAKE2B 6cc341364e6766a2376773f453973bb72353eda8fa95c1a768f119b3202c347e9807afb51659a323dc66fdd547b964595975c61b69222efc38909bdefd36ca2f SHA512 80b7f006f2f8a934413ec435ee1a48019e2dfeac16585f794102c47cc9011c3db0b290a9ce0b6df01b1ba8dda85e56932ae1f52eac7023e5658edf7d828d14de
 AUX numad.logrotated 60 BLAKE2B 384bada94db096e9c02555d5342fc998482012bfedb3a6c71af95ff41655a5ce17cddef19e589cfa0d4162f38228a7602ba24ba0ff5d791201593f7096776784 SHA512 6ffdc65b85fd44866b18318b3259e72188547b600e53ef2407ce8f7f1db41582ff9250bdfe4fd360e81816d533f93170cf46e3e8d89cfe57640a07a6bb101d81
 DIST numad-0.5-334278f.tar.bz2 21007 BLAKE2B f226e90e0ad664b0cccd82c060b21cc8b7c4b086220f6eee1cd6e421b32f0efe2be11e66ce749142315f8207e19e635a718a41e5a8dd3ecfda02a96dfbd62798 SHA512 1b4a577f0713bae1386f2064fcb2dcbfb9453e23e7617f40cfff4e56d02a8c26a48c8d03f1ac7aa36e4ba168824572377f84bc669d1dabdc1820c2cdc4c57911
+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-9999.ebuild 1019 BLAKE2B 2e7177ec9d80dfaa3ce1c08a28a3c21aeef159cfcab830010eccbc0d6528c602ee3bc3d641fdc03530d8c61dae21311a49ec50a183b7ec46752b6183856a5a40 SHA512 1f9fb46f90a8436dcbe80e9a4e9c760488130caae51ab7a65db8de948ed8510ab72a3e530c7ab1fa91243e28067246026477c8566bf5abdd4d88d3884a843154
+EBUILD numad-0.5_p20180531.ebuild 1396 BLAKE2B c34a5244ab2476ca029497807b5df089d772119f2540fbc9cb47c1c6f3a546cae5629fbc3f63ae268fce036344643bd14089434c81c14997764efcdc452ae7f0 SHA512 35a53fdd23b2a75784cb0e132004419bbffbbd94428a0ef6ca9c04093790ff0d5810662b40dd42253e47946897d5560fcdcd8461b96251250ca866f19a4d7914
+EBUILD numad-9999.ebuild 1290 BLAKE2B c5a669b3c7f990ecc53c901c41a748c6e77cabd4b284a08fa7692dac20cc608383b8cbec7a7174fe36c79b8ed35d407ed436634ea1be5896aeeafaeeba869a74 SHA512 0b44f8a664bdb5af054e9ff5712884a6905cd4e6b1bc58869e134c551248920e0924fbd5281cbbacd2dd64c22854583daa1e2e6b2b366181786b43d5a3ec1d90
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-process/numad/files/numad-0.5-fix-sparse-node-ids.patch b/sys-process/numad/files/numad-0.5-fix-sparse-node-ids.patch
new file mode 100644
index 000000000000..d7d438457826
--- /dev/null
+++ b/sys-process/numad/files/numad-0.5-fix-sparse-node-ids.patch
@@ -0,0 +1,53 @@
+From ab79ec5b6389507b4970d68862abb95d0b2b94c9 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Date: Jun 17 2019 10:37:48 +0000
+Subject: fix sparse node ids
+
+
+CPU-ids can be sparse due to disabling a subset of CPUs.
+On ppc64le this even will make the node_ids sparse, this is actually pretty
+common on ppc64 when SMT is disabled.
+
+Numad has the assumption of cpu/node-ids always being linear and due to that
+accesses the 'node' array out of bounds. That triggers crashes like the
+following:
+
+  Thread 1 "numad" received signal SIGSEGV, Segmentation fault.
+  #0 0x00000fb6cd2779f4 in bind_process_and_migrate_memory (p=0xfb6fc1e0f70)
+    at numad.c:998
+  #1 0x00000fb6cd27d148 in manage_loads () at numad.c:2225
+  #2 0x00000fb6cd2734dc in main (argc=<optimized out>, argv=<optimized out>)
+    at numad.c:2654
+
+Instead of directly indexing with node_id we need to detect which array
+element has the matching node_id and use that.
+
+Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+
+---
+
+diff --git a/numad.c b/numad.c
+index a6a7a5d..524bf61 100644
+--- a/numad.c
++++ b/numad.c
+@@ -995,7 +995,18 @@ int bind_process_and_migrate_memory(process_data_p p) {
+     int node_id = 0;
+     while (nodes) {
+         if (ID_IS_IN_LIST(node_id, p->node_list_p)) {
+-            OR_LISTS(cpu_bind_list_p, cpu_bind_list_p, node[node_id].cpu_list_p);
++            int id = -1;
++            for (int node_ix = 0;  (node_ix < num_nodes);  node_ix++) {
++                if (node[node_ix].node_id == node_id) {
++                    id = node_ix;
++                    break;
++                }
++        }
++            if (id == -1) {
++                numad_log(LOG_CRIT, "Node %d is requested, but unknown\n", node_id);
++                exit(EXIT_FAILURE);
++            }
++            OR_LISTS(cpu_bind_list_p, cpu_bind_list_p, node[id].cpu_list_p);
+             nodes -= 1;
+         }
+         node_id += 1;
+
diff --git a/sys-process/numad/numad-0.5_p20180531.ebuild b/sys-process/numad/numad-0.5_p20180531.ebuild
new file mode 100644
index 000000000000..a778299f0ae4
--- /dev/null
+++ b/sys-process/numad/numad-0.5_p20180531.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://pagure.io/numad.git"
+	inherit git-r3
+else
+	# sync with fedora (as numad upstream) and add couple of commis.
+	# at time of writing f37 uses 20150602
+	# git archive --format=tar.gz --prefix="${P}/" -o ${P}.tar.gz ${EGIT_COMMIT}
+	EGIT_COMMIT="d696d6c413c5b47b4bbae79e29ea132e52095af3"
+	SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
+	KEYWORDS="~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86"
+fi
+
+DESCRIPTION="The NUMA daemon that manages application locality"
+HOMEPAGE="http://fedoraproject.org/wiki/Features/numad"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+CONFIG_CHECK="~NUMA ~CPUSETS"
+
+PATCHES=(
+	# https://pagure.io/numad/pull-request/3
+	"${FILESDIR}/${PN}-0.5-fix-sparse-node-ids.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() {
+	emake OPT_CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake prefix="${ED}"/usr install
+
+	newinitd "${FILESDIR}"/numad.initd numad
+	newconfd "${FILESDIR}"/numad.confd numad
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/numad.logrotated numad
+
+	systemd_dounit numad.service
+}
diff --git a/sys-process/numad/numad-9999.ebuild b/sys-process/numad/numad-9999.ebuild
index 07607707eb3c..fffe3f4192c1 100644
--- a/sys-process/numad/numad-9999.ebuild
+++ b/sys-process/numad/numad-9999.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit linux-info systemd toolchain-funcs
+inherit flag-o-matic linux-info systemd toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://pagure.io/numad.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
-	SRC_URI="mirror://gentoo/numad-${PV}-${EGIT_COMMIT:0:7}.tar.bz2"
+	# sync with fedora (as numad upstream) and add couple of commis.
+	# at time of writing f37 uses 20150602
+	# git archive --format=tar.gz --prefix="${P}/" -o ${P}.tar.gz ${EGIT_COMMIT}
+	EGIT_COMMIT="d696d6c413c5b47b4bbae79e29ea132e52095af3"
+	SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
 	KEYWORDS="~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
 fi
 
 DESCRIPTION="The NUMA daemon that manages application locality"
@@ -23,13 +25,17 @@ SLOT="0"
 
 CONFIG_CHECK="~NUMA ~CPUSETS"
 
-src_prepare() {
-	default
-	tc-export CC
+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() {
-	emake CFLAGS="${CFLAGS} -std=gnu99"
+	emake OPT_CFLAGS="${CFLAGS}"
 }
 
 src_install() {
@@ -41,7 +47,5 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/numad.logrotated numad
 
-	insinto /etc
-	doins numad.conf
 	systemd_dounit numad.service
 }