gentoo auto-resync : 16:12:2022 - 09:35:57

6 files changed, 128 insertions, 1 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 9283967a76b0..0b6bafb3c56c 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/tiptop/Manifest b/sys-process/tiptop/Manifest
index 202fb3ac07a9..3adf857bef3d 100644
--- a/sys-process/tiptop/Manifest
+++ b/sys-process/tiptop/Manifest
@@ -1,5 +1,9 @@
+AUX tiptop-2.3.1-advise-user-to-run-as-root-when-paranoid_level-3.patch 1279 BLAKE2B ad00bece50714f4af2cfa5251574b60cb43018d26c6b01ef615c96c0004f562e3a913ca3b58ced826f49f9bba965a2d4054d86ecd3d992474a85474d2c607d1a SHA512 53def96cd9555e437571fb73721f627f4d76d4307a9fa770e5efa4ed42c849b9cb4473221115c5325b44dde1291fa0a30a66731f069a5dc98c73150d4c2a41b3
+AUX tiptop-2.3.1-implicit-function-declaration.patch 883 BLAKE2B 6c23656bedb4321fc0efcea40079ec2ea74157e7725b5360a069dd5c42e6eca05a2883957c85d92191a81938f5b05c5fc99bed84cc6842f7fbd7c06adf22c2ca SHA512 42e328e5b2e93d6a6e1110c0cb54581a3d481b3113939c46c6b586d17dcc9fe0a68cdc0c80d665d9e8ae00ba625a10c51f8b112933aa1ee40f3c348523263232
 AUX tiptop-2.3.1-tinfo.patch 428 BLAKE2B d055899343b616e8c487be4285c86659f4912cd817c58639c206af365981440c3c6daefebc086409bcbdf294b5db60d477a9994be29eda89245c10d4e0916dfa SHA512 c22e2129deb1f41531ac515a4ded03f8d2afd9c12eb6fbb132758c239d3107443b80ac1f8318dd273ec701afd7ef247e914d7fa3fcd5e908ef5951ae31d953c2
 DIST tiptop-2.3.1.tar.gz 100993 BLAKE2B fd05d9d59fda2e81c194dedabb7d9d94220e790a8118048ebc3edd84706471a8892a918e02ebc7436c3c75e7a98c5c3ab98e11d614ced304ac81fdf8ce1951ed SHA512 73d275bc3957583524c872b401cf4fa773de7b4e7b7177f1787851f43e7c4aeefd953eb50b2dbce3babfc7a1c46707370ba4ad06998260177994b2eafb91395b
+DIST tiptop-2.3.1_p4_p20221211.tar.gz 931179 BLAKE2B bc9bccf2c8146c60200304975cb900b455c5f2c0c410ff010fc785709ed468fe3c01b8ac8f4809a1f067cc67fb7a5a6d33739de1b650f447ebe90a9b21a032ee SHA512 c848513a1ccd8c367aa1edd91cfe6f27245710d6b32ff6e1f81a6694c8e21cb41d53e0bc00a18eadf0877600fa29b1defbd0db6165591a8d34887d11ca1af7f2
 DIST tiptop_2.3.1-4.debian.tar.xz 3716 BLAKE2B 14e5192888b99681f8114fd9abcafb4c2fc00b1923560ea93ba4c714dc1164731cdf16d42d73946413f743fe48b6d27151804f5f6e65cab7afa8834f54c683e1 SHA512 45d34abc16327bc443387c941c0477b2c491510c7cda1da8a7f7a704c8b891ef07c96122be46c501e55e471df5bcfd50919f586a67d8b91b764d3bdefa599872
 EBUILD tiptop-2.3.1_p4.ebuild 687 BLAKE2B 5b0b0420515aa28274d6e8808fee724fab9b217c5cc3a528380da0029e43325fb5ee730874e5fd76f1ae7ced9588b650db0348f3e066e42d1b20553e1b174e09 SHA512 f9d4a4888ef3eed9920c8e408164a8073ded2fea2674fe724b30e709b7262eb1244a802274ef3514323ce49da51539d832083ad1d61631e5a2b69d604978cb7c
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+EBUILD tiptop-2.3.1_p4_p20221211.ebuild 1047 BLAKE2B c98c8b26bbd1363bf588f39fcd1b41c4a8d4fea5f5074faf92c71958672ae9be3f203d75a9deb1e614d305e78d45dedb3223be0e4a77e185ec414667e2930f78 SHA512 71cad6fcbd070a80b3939c40bb92036b575a3f317f444e2645a3daa6a1b7482daf7a82546437557c583ef53ec45fb1fe85cda037fa69f357de23fa015f53ddef
+MISC metadata.xml 261 BLAKE2B 60e67dc8e61e54900f97a35689c25b3e69ba5b53148dd426434a4a5fd4a325118d51614eff9472013a0e7c76b5c49154f60e837a687e934d8489dc9eda75c9d3 SHA512 1ceb2b3998f51e92b18f0ec4a6de545cc22ad2d6648827be29d489087713a13794ce0a418645f74622d1c6a2dd78eea5a190276196aeb3b98b1a54fae5eb2a75
diff --git a/sys-process/tiptop/files/tiptop-2.3.1-advise-user-to-run-as-root-when-paranoid_level-3.patch b/sys-process/tiptop/files/tiptop-2.3.1-advise-user-to-run-as-root-when-paranoid_level-3.patch
new file mode 100644
index 000000000000..4607f4f8bbe5
--- /dev/null
+++ b/sys-process/tiptop/files/tiptop-2.3.1-advise-user-to-run-as-root-when-paranoid_level-3.patch
@@ -0,0 +1,46 @@
+Subject: [PATCH] advice user to run as root when paranoid_level==3
+
+Corresponds with Debian patch 0003_Report_root_needed
+https://sources.debian.org/patches/tiptop/2.3.1-4/0003-Report_root_needed.patch/
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+--- a/src/requisite.c
++++ b/src/requisite.c
+@@ -17,13 +17,34 @@
+ #include "pmc.h"
+ #include "requisite.h"
+ 
++#define PARANOID1 "/proc/sys/kernel/perf_counter_paranoid"
++#define PARANOID2 "/proc/sys/kernel/perf_event_paranoid"
+ 
+ void check()
+ {
+   int fd, cpu, grp, flags, pid;
++  FILE* paranoid;
++  int   paranoia_level = 999;
+   struct utsname os;
+   struct STRUCT_NAME events = {0, };
++  int    n;
+ 
++  paranoid = fopen(PARANOID1, "r");
++  if (!paranoid)
++    paranoid = fopen(PARANOID2, "r");
++
++  if (!paranoid) {
++    fprintf(stderr, "System does not support performance events.\n");
++    fprintf(stderr, "File '/proc/sys/kernel/perf_*_paranoid' is missing.\n");
++    exit(EXIT_FAILURE);
++  }
++  n = fscanf(paranoid, "%d", &paranoia_level);
++  if (n != 1) {
++    fprintf(stderr, "Could not read '/proc/sys/kernel/perf_*_paranoid'.\n");
++    fprintf(stderr, "Trying to proceed anyway...\n");
++  }
++
++  fclose(paranoid);
+   events.disabled = 0;
+   events.exclude_hv = 1;
+   events.exclude_kernel = 1;
+-- 
+2.38.1
+
diff --git a/sys-process/tiptop/files/tiptop-2.3.1-implicit-function-declaration.patch b/sys-process/tiptop/files/tiptop-2.3.1-implicit-function-declaration.patch
new file mode 100644
index 000000000000..b6e3abdd727b
--- /dev/null
+++ b/sys-process/tiptop/files/tiptop-2.3.1-implicit-function-declaration.patch
@@ -0,0 +1,35 @@
+Date: Sun, 11 Dec 2022 22:11:42 +0100
+Subject: [PATCH] Fix build for sys-devel/reflex
+
+When LEX=reflex is used, this compiling calc.lex fails with a
+implicit function declaration error when
+Werror=implicit-function-declaration. (Like with clang16)
+
+Bug: https://bugs.gentoo.org/884361
+PR to upstream this: https://github.com/FeCastle/tiptop/pull/9
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+Clang16 will not allow implicit function declarations by default
+--- a/src/calc.lex
++++ b/src/calc.lex
+@@ -11,6 +11,7 @@
+ %{
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "formula-parser.h"
+ #include "y.tab.h"
+--- a/src/process.h
++++ b/src/process.h
+@@ -95,4 +95,6 @@ void reset_values(const struct process_list* const);
+ 
+ void update_name_cmdline(int pid, int name_only);
+ 
++void handle_error(int retval);
++
+ #endif  /* _PROCESS_H */
+-- 
+2.38.1
+
diff --git a/sys-process/tiptop/metadata.xml b/sys-process/tiptop/metadata.xml
index bef24d2c2337..926fab6a2ab7 100644
--- a/sys-process/tiptop/metadata.xml
+++ b/sys-process/tiptop/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
+    <upstream>
+        <remote-id type="github">FeCastle/tiptop</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/sys-process/tiptop/tiptop-2.3.1_p4_p20221211.ebuild b/sys-process/tiptop/tiptop-2.3.1_p4_p20221211.ebuild
new file mode 100644
index 000000000000..fc0c6c4ba157
--- /dev/null
+++ b/sys-process/tiptop/tiptop-2.3.1_p4_p20221211.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+GIT_COMMIT="529886d445ec32febad14246245372a8f244b3eb"
+
+DESCRIPTION="top for performance counters"
+HOMEPAGE="https://github.com/FeCastle/tiptop"
+SRC_URI="https://github.com/FeCastle/tiptop/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" http://deb.debian.org/debian/pool/main/t/tiptop/tiptop_$(ver_cut 1-3)-$(ver_cut 5).debian.tar.xz"
+S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/papi
+	sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+# drop when patch$ tiptop-2.3.1-implicit-function-declaration.patch is merged upstream
+BDEPEND="app-alternatives/lex"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+	"${FILESDIR}"/${PN}-2.3.1-tinfo.patch #618124
+	"${FILESDIR}"/${PN}-2.3.1-advise-user-to-run-as-root-when-paranoid_level-3.patch
+	"${FILESDIR}"/${PN}-2.3.1-implicit-function-declaration.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf #618124
+}