gentoo auto-resync : 14:01:2024 - 07:13:52

5 files changed, 165 insertions, 0 deletions

diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 183eb578770c..fc5c45d8cc66 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,7 +1,12 @@
+AUX atop-2.10.0-ldflags.patch 897 BLAKE2B 23e574eccaa4112067f820742f8e110240b6afeaccbec142a7136eabbe72312f78d5216524e1b2608301c3834c4005ca6f77740ff1ae03141863804b5dfed9a3 SHA512 67aa591f824dfe736f0f1bee8c842f2e84a7389ec4589a798b6279bd8563b9bb93e7c6c3fd03d3711a920c97d9312b86988766eb3a2a4f01044b5e52786f1729
+AUX atop-2.10.0-respect-PKG_CONFIG.patch 812 BLAKE2B eb47efa3889f60e384af33b5665d99400bfcc3310b1038879837f45215e0e28eb03fea8ec93ba37dda51fbe4710bfd4bd5c0d6dff7fe695ea95ab5a4dbbbf9b6 SHA512 42cddd3d94fec2908e8dd13280ccbefd055e0456bd87e4f47e1460c44ee3908949c593b92b61922069a86d1b35d2279963739a294534800e84329e8862f7ef7f
+AUX atop-2.10.0-respect-opt.patch 664 BLAKE2B 2b8c691ac67f370d827047bff1220139fd443a65b78d38c2a502ddca28783a43abe4df14943443d94d9b83b08e3ebd128c9edc8583a5c5ef6e24bea6c77d2123 SHA512 9dd5d0425b5220a1838785b93b65f6dab5b9db5b4457de649f39db9320661005f02428f470a9b5328fe513a9ceae08a0aca45fd115daf818611bda628419dd3d
 AUX atop-2.6.0-build.patch 911 BLAKE2B d67b53d297d2e05ce098eca6e2f99ee2314652755d01671a72bc2501913419461bbafd7f054a58ff62dc90434960cdcbb335e397e6c7316670aca902fcd504d7 SHA512 9798131103ed5d34210a00d0e7fc82f4a50bd5a2c6bc12dc67d6a34192a0bb8bcc38777311d5a6562af9434766b26ad9fc2c4452a8da1b28316a816c3316761d
 AUX atop-2.9.0-netatop-makefile.patch 897 BLAKE2B f1f05008e329ea4b96a6b43336fa5df5356c011f6b5eaf3080766e4314040f0629f58f86e9957f095897079f7490fc954ea1ae2556cf8dd7e948497ccdb4d0b4 SHA512 2bd5988ed31af5a528e351ea58a072a06d7d297c7f89591a8b530e507fc342e2aa762c6344cdd8380affeda1e29bb071aee54e4b20379d5a11e21c797ab8fa80
 AUX netatop.rc 330 BLAKE2B 8da0bdd3ea55cdc0ff9b54d7fd499f6582eb6571a859da8e2e0eefd7b5c47b9c6aac9be5565bd61e8fb03168482cab65e5ecbaf702d56c8e940bfb4c4e38f12f SHA512 e61c8133041da7961088faa90b244ab44cebc07583b3feffa5854b2751fc6bdd1cd8964c30ab9acde653d70f4280738fe9f77f7eaf29d939757dc0b51151f289
+DIST atop-2.10.0.tar.gz 296569 BLAKE2B 8c6e56978cb32e4e80c7344f631d6fd3dd034ff785e6b2db1b80556aaea30a0feeb413704128150ba0d7b1b4eaeb6cb5699a1b2661060ac53c10f7025997418e SHA512 22e39799aa7c090c68d8ac2f02646fb9586122bdb83de9d90bc3119bd290c557faa0489cdc8640fc4fd1f1155c231b1d70dae1b22dc6102ba0327fdd4b5f7029
 DIST atop-2.9.0.tar.gz 282412 BLAKE2B 8531eee3bffabfb3cacdb6bea4c4a1b7ea56da878154a86edd80fb20ddffc5f56248d06c679bd8933c203a0174e97515cfce633a2387bf465399d4203ca857c2 SHA512 f055466c076491a54fc45a482209fd3de60013e7b76af46b65dffe82d220fbd96eb11d5f199aa27e2f7a8754fe3c6509c44bf0dbd6e3099d8f5710944e01cb38
 DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68
+EBUILD atop-2.10.0-r1.ebuild 2578 BLAKE2B fea771838408ba6742c144163b94f10b7aa8da0136e23243eb2b1397423bfcd4777bafe63cf1ccfd0f4245736c0618c34659147d79417161a84a71f1e3c91648 SHA512 68a48a96e4ceaef577e34613807fef41b3f93e940c5bb62bf1f7c2c3d61e2dd16e0a5db728f2bd75489b4462d061221186ee7b2ddad4068b770d3e1955ecd74f
 EBUILD atop-2.9.0-r1.ebuild 2418 BLAKE2B a3da757b84814e21d1d28a50a60b764aab5d2f80131cf73f0a28e4b801893ced689400610a3cb4a5e122cf666e39fdb20cad674f867d5048dd4fc73594d7ac2a SHA512 f907cbacafb923eda3df4a128fa6b0c59589e5f1c497447cd447f0ba2bd5263fb72f7e1febbbe62fbf0d8d84db14ee6e6c16c9b52cd2463c148c7f373a154965
 MISC metadata.xml 438 BLAKE2B 39c4d236c004f4b9856dd64ee810c64f41ec5097c259d2ee51d2e3c01b75d04aeb49d19f25bbb6aba131d4fc31fae9b2f4d3706cb1358ccdc95a4caca9967ca8 SHA512 7dfb13251330c915a8e8373f4f4a58113a5dac2a036e79d9ec9bc72c76ed7756f6706cb01c65b0f77458818485383199747fde1cd935b855e1c08c6f02e3c274
diff --git a/sys-process/atop/atop-2.10.0-r1.ebuild b/sys-process/atop/atop-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..143deae1f3b8
--- /dev/null
+++ b/sys-process/atop/atop-2.10.0-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check on bumps of atop
+# https://www.atoptool.nl/downloadnetatop.php
+NETATOP_VER=3.1
+
+# Controls 'netatop' kernel module
+MODULES_OPTIONAL_IUSE="modules"
+NETATOP_P=netatop-${NETATOP_VER}
+NETATOP_S="${WORKDIR}"/${NETATOP_P}
+
+inherit linux-mod-r1 systemd toolchain-funcs
+
+DESCRIPTION="Resource-specific view of processes"
+HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
+SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
+
+# Module is GPL-2 as well
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/glib
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	>=sys-process/acct-6.6.4-r1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-build.patch
+	"${FILESDIR}"/${PN}-2.10.0-ldflags.patch
+	"${FILESDIR}"/${PN}-2.10.0-respect-PKG_CONFIG.patch
+	"${FILESDIR}"/${PN}-2.10.0-respect-opt.patch
+)
+
+pkg_pretend() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~BSD_PROCESS_ACCT"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use modules ; then
+		cd "${WORKDIR}"/${NETATOP_P} || die
+		eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch
+		cd "${S}" || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	# bug #191926
+	sed -i 's: root : :' atop.cronsysv || die
+
+	# Prefixify
+	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
+}
+
+src_compile() {
+	default
+
+	local modlist=( "netatop=:../${NETATOP_P}/module::netatop.ko" )
+	linux-mod-r1_src_compile
+
+	if use modules ; then
+		# netatop's Makefile tries to build the kernel module for us
+		# so let's just replicate parts of it here.
+		emake -C "${NETATOP_S}"/daemon all
+	fi
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	if use modules ; then
+		dosbin "${NETATOP_S}"/daemon/netatopd
+		doman "${NETATOP_S}"/man/*
+
+		systemd_dounit "${NETATOP_S}"/netatop.service
+
+		# TODO: Release after 2.8.0 may contain this, check!
+		newinitd "${FILESDIR}"/netatop.rc netatop
+	fi
+
+	emake DESTDIR="${D}" genericinstall
+
+	# useless -${PV} copies ?
+	rm "${ED}"/usr/bin/atop*-${PV} || die
+
+	newinitd atop.rc.openrc ${PN}
+	newinitd atopacct.rc.openrc atopacct
+
+	systemd_dounit "${S}"/${PN}.service
+	systemd_dounit "${S}"/atopacct.service
+
+	dodoc atop.cronsysv AUTHORS README
+
+	exeinto /usr/share/${PN}
+	doexe ${PN}.daily
+
+	insinto /etc/default
+	newins ${PN}{.default,}
+
+	keepdir /var/log/${PN}
+}
diff --git a/sys-process/atop/files/atop-2.10.0-ldflags.patch b/sys-process/atop/files/atop-2.10.0-ldflags.patch
new file mode 100644
index 000000000000..5b2924ef3864
--- /dev/null
+++ b/sys-process/atop/files/atop-2.10.0-ldflags.patch
@@ -0,0 +1,20 @@
+https://github.com/Atoptool/atop/pull/289
+
+From 8411f81a202c9c39aebcc637ef94cc3d454cbaaf Mon Sep 17 00:00:00 2001
+From: Marc 'Zugschlus' Haber <mh+github@zugschlus.de>
+Date: Sat, 6 Jan 2024 07:03:53 +0100
+Subject: [PATCH] set LDFLAGS with +=, not overwriting existing variable
+
+this allows the Debian build process to set hardening flags
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@ PMPATH2  = /usr/lib64/pm-utils/sleep.d
+ PMPATHD  = /usr/lib/systemd/system-sleep
+ 
+ CFLAGS  += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
+-LDFLAGS  = $(shell pkg-config --libs glib-2.0)
++LDFLAGS += $(shell pkg-config --libs glib-2.0)
+ OBJMOD0  = version.o
+ OBJMOD1  = various.o  deviate.o   procdbase.o
+ OBJMOD2  = acctproc.o photoproc.o photosyst.o  rawlog.o ifprop.o parseable.o
+
diff --git a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
new file mode 100644
index 000000000000..483506043490
--- /dev/null
+++ b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -20,8 +20,9 @@ PMPATH1  = /usr/lib/pm-utils/sleep.d
+ PMPATH2  = /usr/lib64/pm-utils/sleep.d
+ PMPATHD  = /usr/lib/systemd/system-sleep
+ 
+-CFLAGS  += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
+-LDFLAGS += $(shell pkg-config --libs glib-2.0)
++PKG_CONFIG ?= pkg-config
++CFLAGS  += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
++LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0)
+ OBJMOD0  = version.o
+ OBJMOD1  = various.o  deviate.o   procdbase.o
+ OBJMOD2  = acctproc.o photoproc.o photosyst.o  rawlog.o ifprop.o parseable.o
diff --git a/sys-process/atop/files/atop-2.10.0-respect-opt.patch b/sys-process/atop/files/atop-2.10.0-respect-opt.patch
new file mode 100644
index 000000000000..5a55e6f2f835
--- /dev/null
+++ b/sys-process/atop/files/atop-2.10.0-respect-opt.patch
@@ -0,0 +1,12 @@
+Don't force -O2.
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@ PMPATH2  = /usr/lib64/pm-utils/sleep.d
+ PMPATHD  = /usr/lib/systemd/system-sleep
+ 
+ PKG_CONFIG ?= pkg-config
+-CFLAGS  += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
++CFLAGS  += -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0)  -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT   # -DHTTPSTATS
+ LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0)
+ OBJMOD0  = version.o
+ OBJMOD1  = various.o  deviate.o   procdbase.o