[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
commit: 2217cdf56cb81085933c4c373178c154f58f8c72
Author: Sam James gentoo org>
AuthorDate: Mon Aug 12 17:51:33 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 12 17:52:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2217cdf5
sys-process/atop: fix patches for 2.10.0
Closes: https://bugs.gentoo.org/937830
Signed-off-by: Sam James gentoo.org>
sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch | 4 ++--
sys-process/atop/files/atop-2.10.0-respect-opt.patch| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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
index edfa88c7a889..483506043490 100644
--- 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
@@ -7,8 +7,8 @@
-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)
++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
index 2acb4ec53f51..5a55e6f2f835 100644
--- a/sys-process/atop/files/atop-2.10.0-respect-opt.patch
+++ b/sys-process/atop/files/atop-2.10.0-respect-opt.patch
@@ -5,8 +5,8 @@ Don't force -O2.
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
+-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
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
commit: 9447f32d8725376b2d3f3865717e7302bc50d3cd
Author: Sam James gentoo org>
AuthorDate: Sun Aug 11 21:01:27 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 11 21:14:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9447f32d
sys-process/atop: tweak PKG_CONFIG patch
This matches the upstream version more closely.
Signed-off-by: Sam James gentoo.org>
sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch | 4 ++--
sys-process/atop/files/atop-2.10.0-respect-opt.patch| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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
index 483506043490..edfa88c7a889 100644
--- 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
@@ -7,8 +7,8 @@
-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)
++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
index 5a55e6f2f835..2acb4ec53f51 100644
--- a/sys-process/atop/files/atop-2.10.0-respect-opt.patch
+++ b/sys-process/atop/files/atop-2.10.0-respect-opt.patch
@@ -5,8 +5,8 @@ Don't force -O2.
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
+-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
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
commit: d24bc32440ff3efadf9f424e5a8106e820b97639
Author: Sam James gentoo org>
AuthorDate: Sun Jan 14 03:28:07 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 14 03:28:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d24bc324
sys-process/atop: respect LDFLAGS, PKG_CONFIG, opt
Signed-off-by: Sam James gentoo.org>
sys-process/atop/atop-2.10.0.ebuild | 5 -
sys-process/atop/files/atop-2.10.0-ldflags.patch | 20
.../atop/files/atop-2.10.0-respect-PKG_CONFIG.patch | 14 ++
sys-process/atop/files/atop-2.10.0-respect-opt.patch | 12
4 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/sys-process/atop/atop-2.10.0.ebuild
b/sys-process/atop/atop-2.10.0.ebuild
index 9bd1a191304c..01c0dfa1ff44 100644
--- a/sys-process/atop/atop-2.10.0.ebuild
+++ b/sys-process/atop/atop-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -34,6 +34,9 @@ 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() {
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 ..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
+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 ..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 ..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
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
commit: c178370cc41fd7194e0289592538df9a15103cb7
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri Dec 29 14:22:56 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Dec 31 02:36:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c178370c
sys-process/atop: remove unused files
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34541
Signed-off-by: Conrad Kostecki gentoo.org>
sys-process/atop/files/atop.rc-r2 | 8 ---
sys-process/atop/files/atop.service | 11 -
sys-process/atop/files/atopacct.rc | 40 -
sys-process/atop/files/atopacct.service | 14
4 files changed, 73 deletions(-)
diff --git a/sys-process/atop/files/atop.rc-r2
b/sys-process/atop/files/atop.rc-r2
deleted file mode 100644
index ce66821dbdd5..
--- a/sys-process/atop/files/atop.rc-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Resource-specific view of processes"
-pidfile="/var/run/atop.pid"
-command="/usr/share/atop/atop.daily"
-command_background="true"
diff --git a/sys-process/atop/files/atop.service
b/sys-process/atop/files/atop.service
deleted file mode 100644
index 09295b9acd12..
--- a/sys-process/atop/files/atop.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Atop advanced performance monitor
-Documentation=man:atop(1)
-
-[Service]
-Type=simple
-ExecStart=/etc/atop/atop.daily
-KillSignal=SIGUSR2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-process/atop/files/atopacct.rc
b/sys-process/atop/files/atopacct.rc
deleted file mode 100644
index c68ca3e6b3a8..
--- a/sys-process/atop/files/atopacct.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Resource-specific view of processes"
-command="/usr/sbin/atopacctd"
-lockfile="/var/lock/subsys/atopacctd"
-
-start_pre() {
- # Check if process accounting already in use via psacct
-for PACCTFILE in /var/account/pacct /var/log/pacct ; do
-if [ -f "${PACCTFILE}" ] ; then
-BEFORSIZE=$(stat -c %s "${PACCTFILE}")
-AFTERSIZE=$(stat -c %s "${PACCTFILE}")
-
-# verify if accounting file grows, so is in use
-if [ ${BEFORSIZE} -lt ${AFTERSIZE} ] ; then
- ewarn "Process accounting already used by
psacct!"
- return 1
- fi
- fi
- done
-
- checkpath -d -q ${lockfile%/*} || return 1
-}
-
-start() {
- ebegin "Starting atopacctd"
- start-stop-daemon --start --exec ${command}
- touch ${lockfile}
- eend $?
-}
-
-stop() {
- ebegin "Stopping atopacctd"
- start-stop-daemon --stop --exec ${command}
- rm ${lockfile}
- eend $?
-}
-
diff --git a/sys-process/atop/files/atopacct.service
b/sys-process/atop/files/atopacct.service
deleted file mode 100644
index 1f51ec41916a..
--- a/sys-process/atop/files/atopacct.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Atop process accounting daemon
-Documentation=man:atopacctd(8)
-Conflicts=psacct.service
-After=syslog.target
-Before=atop.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/atopacctd.pid
-ExecStart=/usr/sbin/atopacctd
-
-[Install]
-WantedBy=multi-user.target
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
commit: 32e961ecc79187715d376d6e3fbcfcca404b2760
Author: Sam James gentoo org>
AuthorDate: Thu Dec 28 04:19:27 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 28 04:19:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e961ec
sys-process/atop: drop 2.7.1-r1, 2.8.1
Signed-off-by: Sam James gentoo.org>
sys-process/atop/Manifest | 2 -
sys-process/atop/atop-2.7.1-r1.ebuild | 111
sys-process/atop/atop-2.8.1.ebuild | 114 -
.../atop/files/atop-2.7.0-netatop-makefile.patch | 42
4 files changed, 269 deletions(-)
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 9f24cc1ea35e..9aea42ae1dd6 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,4 +1,2 @@
-DIST atop-2.7.1.tar.gz 248809 BLAKE2B
2cf1a68a7b24d76340295d9bde03a5602e9049a860468217771c696fe4b9062f2155aeefa2e3e810984780f82de6bf922bf7d6b02c7fd19194162dc70b015b81
SHA512
18f30c67d6f86b9270599317eed846c63d19e8ba6ea85bad8ec3d5ffb0489f17c75c8d8b3a14054bd14e89ed40d39e5d37bce834c7422087e6d8b86c99273a72
-DIST atop-2.8.1.tar.gz 264182 BLAKE2B
1764090d760cc8d75d193a06a269eaa4ba997e8e5f064525d23f2005b92bb1b3f0903f2b1476f437db6a0dc698575e95b34e0fc9112d2ff6d06d3133ea78
SHA512
d748f374fb66d7ce33cebc5ce6899c3c0cc79dc394cb835466b21c7a4ec7c17cba255a3b04b36136c8c24c33ced0e5bd68f151ac804f6176547399e457976aaf
DIST atop-2.9.0.tar.gz 282412 BLAKE2B
8531eee3bffabfb3cacdb6bea4c4a1b7ea56da878154a86edd80fb20ddffc5f56248d06c679bd8933c203a0174e97515cfce633a2387bf465399d4203ca857c2
SHA512
f055466c076491a54fc45a482209fd3de60013e7b76af46b65dffe82d220fbd96eb11d5f199aa27e2f7a8754fe3c6509c44bf0dbd6e3099d8f5710944e01cb38
DIST netatop-3.1.tar.gz 22812 BLAKE2B
1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61fe6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996
SHA512
b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68
diff --git a/sys-process/atop/atop-2.7.1-r1.ebuild
b/sys-process/atop/atop-2.7.1-r1.ebuild
deleted file mode 100644
index ee9f7f4ca974..
--- a/sys-process/atop/atop-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Check on bumps of atop
-# https://www.atoptool.nl/downloadnetatop.php
-NETATOP_VER=3.1
-
-# Controls 'netatop' kernel module
-MODULES_OPTIONAL_USE="modules"
-NETATOP_P=net${PN}-${NETATOP_VER}
-NETATOP_S="${WORKDIR}"/${NETATOP_P}
-
-inherit linux-info linux-mod 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="sys-libs/ncurses:0=
- >=sys-process/acct-6.6.4-r1
- modules? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.0-build.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 -p1 "${FILESDIR}"/${PN}-2.7.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_configure() {
- default
-
- BUILD_TARGETS="netatop.ko"
- MODULE_NAMES="netatop(:${NETATOP_S}/module)"
-}
-
-src_compile() {
- default
-
- linux-mod_src_compile
-}
-
-src_install() {
- linux-mod_src_install
-
- 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
-
- dosbin "${NETATOP_S}"/daemon/netatopd
- doman "${NETATOP_S}"/man/*
-
- systemd_dounit "${NETATOP_S}"/netatop.service
-
- newinitd "${FILESDIR}"/netatop.rc netatop
- fi
-
- emake DESTDIR="${D}" genericinstall
-
- # useless -${PV} copies ?
- rm "${ED}"/usr/bin/atop*-${PV} || die
-
- newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
- newinitd "${FILESDIR}"/atopacct.rc atopacct
-
- systemd_dounit "${S}"/${PN}.service
- systemd_dounit "${S}"/atopacc
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
commit: 6880f68b7869d8226f29af44195de878f1771c57
Author: Sam James gentoo org>
AuthorDate: Tue May 30 04:11:32 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue May 30 04:15:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6880f68b
sys-process/atop: port to linux-mod-r1
...and revbump for zlib dep.
Signed-off-by: Sam James gentoo.org>
.../{atop-2.9.0.ebuild => atop-2.9.0-r1.ebuild}| 32 -
.../atop/files/atop-2.9.0-netatop-makefile.patch | 42 ++
2 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/sys-process/atop/atop-2.9.0.ebuild
b/sys-process/atop/atop-2.9.0-r1.ebuild
similarity index 84%
rename from sys-process/atop/atop-2.9.0.ebuild
rename to sys-process/atop/atop-2.9.0-r1.ebuild
index 948c12e87582..9bd1a191304c 100644
--- a/sys-process/atop/atop-2.9.0.ebuild
+++ b/sys-process/atop/atop-2.9.0-r1.ebuild
@@ -8,11 +8,11 @@ EAPI=8
NETATOP_VER=3.1
# Controls 'netatop' kernel module
-MODULES_OPTIONAL_USE="modules"
-NETATOP_P=net${PN}-${NETATOP_VER}
+MODULES_OPTIONAL_IUSE="modules"
+NETATOP_P=netatop-${NETATOP_VER}
NETATOP_S="${WORKDIR}"/${NETATOP_P}
-inherit linux-info linux-mod systemd toolchain-funcs
+inherit linux-mod-r1 systemd toolchain-funcs
DESCRIPTION="Resource-specific view of processes"
HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop";
@@ -26,8 +26,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64
~riscv ~x86 ~amd64-l
RDEPEND="
sys-libs/ncurses:=
+ sys-libs/zlib
>=sys-process/acct-6.6.4-r1
- modules? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
@@ -48,7 +48,7 @@ src_prepare() {
if use modules ; then
cd "${WORKDIR}"/${NETATOP_P} || die
- eapply -p1 "${FILESDIR}"/${PN}-2.7.0-netatop-makefile.patch
+ eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch
cd "${S}" || die
fi
@@ -57,31 +57,27 @@ src_prepare() {
# bug #191926
sed -i 's: root : :' atop.cronsysv || die
- # prefixify
+ # Prefixify
sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
}
-src_configure() {
- default
-
- BUILD_TARGETS="netatop.ko"
- MODULE_NAMES="netatop(:${NETATOP_S}/module)"
-}
-
src_compile() {
default
- linux-mod_src_compile
-}
-
-src_install() {
- linux-mod_src_install
+ 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/*
diff --git a/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch
b/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch
new file mode 100644
index ..30710369fd46
--- /dev/null
+++ b/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch
@@ -0,0 +1,42 @@
+--- a/daemon/Makefile
b/daemon/Makefile
+@@ -6,7 +6,7 @@
+ all: netatopd
+
+ netatopd: netatopd.o Makefile
+- $(CC) netatopd.o -o netatopd -lz
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) netatopd.o -o netatopd
-lz
+
+ clean:
+ rm -f *.o netatopd
+--- a/Makefile
b/Makefile
+@@ -1,7 +1,7 @@
+ all:
+ ./mkversion
+- cd module; make
+- cd daemon; make
++ $(MAKE) -C module
++ $(MAKE) -C daemon
+
+ install: module/netatop.ko daemon/netatopd
+ install -d /lib/modules/`uname -r`/extra
+@@ -14,5 +14,5 @@
+ install man/netatopd.8 -t /usr/share/man/man8
+
+ clean:
+- cd module; make clean
+- cd daemon; make clean
++ $(MAKE) -C module clean
++ $(MAKE) -C daemon clean
+--- a/module/Makefile
b/module/Makefile
+@@ -7,7 +7,7 @@
+
+ $(MYMODULE).ko: $(MYMODULE).c
+ echo start the make
+- make -C $(KERNDIR) M=$(THISDIR) modules
++ $(MAKE) -C $(KERNDIR) M=$(THISDIR) modules
+
+ clean:
+ rm -f *.o *.ko
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
commit: 505802aa5de5dd0531dba4a8229d03664d02785b Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Mar 12 18:45:05 2022 + Commit: David Seifert gentoo org> CommitDate: Sat Mar 12 18:45:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505802aa sys-process/atop: remove unused file Closes: https://github.com/gentoo/gentoo/pull/24378 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: David Seifert gentoo.org> sys-process/atop/files/atop.service-r1 | 11 --- 1 file changed, 11 deletions(-) diff --git a/sys-process/atop/files/atop.service-r1 b/sys-process/atop/files/atop.service-r1 deleted file mode 100644 index ba1575ba835e.. --- a/sys-process/atop/files/atop.service-r1 +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Atop advanced performance monitor -Documentation=man:atop(1) - -[Service] -Type=simple -ExecStart=/usr/share/atop/atop.daily -KillSignal=SIGUSR2 - -[Install] -WantedBy=multi-user.target
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
commit: 99ec9b75466adf3fb65143554bd0bd461e73b837
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Dec 25 13:25:08 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Dec 25 13:29:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ec9b75
sys-process/atop: bump to v2.6.0
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-process/atop/Manifest | 1 +
sys-process/atop/atop-2.6.0.ebuild| 68 +++
sys-process/atop/files/atop-2.6.0-build.patch | 27 +++
3 files changed, 96 insertions(+)
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 8c799a1f8b9..12f173f52a4 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -4,3 +4,4 @@ DIST atop-2.3.0-version_h.patch 748 BLAKE2B
95aa0e819d35498436ddb2554f457e9bf74a
DIST atop-2.3.0.tar.gz 190560 BLAKE2B
4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93
SHA512
8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
DIST atop-2.4.0.tar.gz 230066 BLAKE2B
75070f0a87f9745f0e018ef5aac7e71060acea77e2043d43594a492875126945ef4c5bfe15f69b300ce6ac25c38f54360ba761ad7fc510016a91b71dc3377957
SHA512
8872626db447b2b7265fa257bc78795c3a5bc2f0dfffae94d01df4090de75feeb092e5a33421877aa12563dde3df18734b5db947c828cec6949284fbeb9dbc8d
DIST atop-2.5.0.tar.gz 233835 BLAKE2B
e40ae26cb1f8ddecbf6ea8f8f83d09bf9d62003a54e0679d5eefdf7c6fdaaff1940ba5f097fc1fc181ddb6aedcb8e1482feeb451cce5905b98c929c786db147d
SHA512
8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489
+DIST atop-2.6.0.tar.gz 242323 BLAKE2B
8cf39c4b18994de26188ad5e19e282bc3ef7693eeff4853386f6b254d1115dbd2308eaa4c6e7620e6081d44037e6ce01356ad72ba25bcf4b1c3e7674768e5c24
SHA512
46cbc1c67ee6683be8dca79bf68d85962a119469ddce4947519cf4fe178b14d54b69451cfaa2b5c0a3f8c9bf8769de619aa5a7768eae34422688c7fc26fe0a58
diff --git a/sys-process/atop/atop-2.6.0.ebuild
b/sys-process/atop/atop-2.6.0.ebuild
new file mode 100644
index 000..a5c018ec8bc
--- /dev/null
+++ b/sys-process/atop/atop-2.6.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux"
+IUSE=""
+
+RDEPEND="
+ sys-libs/ncurses:0=
+ >=sys-process/acct-6.6.4-r1
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.6.0-build.patch
+)
+
+pkg_pretend() {
+ if use kernel_linux ; then
+ CONFIG_CHECK="~BSD_PROCESS_ACCT"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ default
+ tc-export CC PKG_CONFIG
+ sed -i 's: root : :' atop.cronsysv || die #191926
+ # prefixify
+ sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" genericinstall
+
+ # useless -${PV} copies ?
+ rm "${ED}"/usr/bin/atop*-${PV} || die
+
+ newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
+ newinitd "${FILESDIR}"/atopacct.rc atopacct
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_dounit "${FILESDIR}"/atopacct.service
+
+ dodoc atop.cronsysv AUTHOR 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.6.0-build.patch
b/sys-process/atop/files/atop-2.6.0-build.patch
new file mode 100644
index 000..b675a16ee36
--- /dev/null
+++ b/sys-process/atop/files/atop-2.6.0-build.patch
@@ -0,0 +1,27 @@
+--- a/Makefile
b/Makefile
+@@ -33,19 +33,19 @@ VERS = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]*
//' -e 's/ .*//')
+ all: atop atopsar atopacctd atopconvert atopcat
+
+ atop: atop.o$(ALLMODS) Makefile
+- $(CC) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt
$(LDFLAGS)
++ $(CC) $(CFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG}
--libs ncurses) -lz -lm -lrt $(LDFLAGS)
+
+ atopsar: atop
+ ln -sf atop atopsar
+
+ atopacctd:atopacctd.o netlink.o
+- $(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
++ $(CC) $(CFLAGS) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
+
+ atopconvert: atopconvert.o
+-
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
commit: 54974377b44222662668f819bedb25f581e7224c
Author: Lars Wendler gentoo org>
AuthorDate: Mon Nov 4 10:01:15 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Nov 4 10:04:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54974377
sys-process/atop: Bump to version 2.5.0
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler gentoo.org>
sys-process/atop/Manifest | 1 +
sys-process/atop/atop-2.5.0.ebuild | 69 ++
.../atop/files/atop-2.5.0-install_fix.patch| 31 ++
3 files changed, 101 insertions(+)
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index d65dc64336b..8c799a1f8b9 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -3,3 +3,4 @@ DIST atop-2.3.0-version_c.patch 1537 BLAKE2B
eda9f0aa427e39ef12aa1584e6277de0057
DIST atop-2.3.0-version_h.patch 748 BLAKE2B
95aa0e819d35498436ddb2554f457e9bf74a70395f077d8f0625b52469d3f4a1f5793afc061aa1f7105fbea6223bb19bbcb999be4231b761523eb28cb5243542
SHA512
79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d
DIST atop-2.3.0.tar.gz 190560 BLAKE2B
4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93
SHA512
8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
DIST atop-2.4.0.tar.gz 230066 BLAKE2B
75070f0a87f9745f0e018ef5aac7e71060acea77e2043d43594a492875126945ef4c5bfe15f69b300ce6ac25c38f54360ba761ad7fc510016a91b71dc3377957
SHA512
8872626db447b2b7265fa257bc78795c3a5bc2f0dfffae94d01df4090de75feeb092e5a33421877aa12563dde3df18734b5db947c828cec6949284fbeb9dbc8d
+DIST atop-2.5.0.tar.gz 233835 BLAKE2B
e40ae26cb1f8ddecbf6ea8f8f83d09bf9d62003a54e0679d5eefdf7c6fdaaff1940ba5f097fc1fc181ddb6aedcb8e1482feeb451cce5905b98c929c786db147d
SHA512
8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489
diff --git a/sys-process/atop/atop-2.5.0.ebuild
b/sys-process/atop/atop-2.5.0.ebuild
new file mode 100644
index 000..001ca080dea
--- /dev/null
+++ b/sys-process/atop/atop-2.5.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux"
+IUSE=""
+
+RDEPEND="
+ sys-libs/ncurses:0=
+ >=sys-process/acct-6.6.4-r1
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.0-build.patch
+ "${FILESDIR}"/${PN}-2.5.0-install_fix.patch
+
+ # taken from upstream.
+)
+
+pkg_pretend() {
+ if use kernel_linux ; then
+ CONFIG_CHECK="~BSD_PROCESS_ACCT"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ default
+ tc-export CC PKG_CONFIG
+ sed -i 's: root : :' atop.cronsysv || die #191926
+ # prefixify
+ sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" genericinstall
+
+ # useless -${PV} copies ?
+ rm "${ED}"/usr/bin/atop*-${PV} || die
+
+ newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
+ newinitd "${FILESDIR}"/atopacct.rc atopacct
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_dounit "${FILESDIR}"/atopacct.service
+
+ dodoc atop.cronsysv AUTHOR README ${PN}.daily
+ docompress -x /usr/share/doc/${PF}/${PN}.daily
+
+ insinto /etc/default
+ newins ${PN}{.default,}
+
+ keepdir /var/log/${PN}
+}
diff --git a/sys-process/atop/files/atop-2.5.0-install_fix.patch
b/sys-process/atop/files/atop-2.5.0-install_fix.patch
new file mode 100644
index 000..b46e88c76f3
--- /dev/null
+++ b/sys-process/atop/files/atop-2.5.0-install_fix.patch
@@ -0,0 +1,31 @@
+From 485a453d2ae5700874a57dffc297030254b5ae7c Mon Sep 17 00:00:00 2001
+From: BlackEagle
+Date: Mon, 4 Nov 2019 09:00:54 +0100
+Subject: [PATCH] DEFPATH not created so touch fails
+
+```
+touch /build/atop/pkg/atop/etc/default/atop
+touch: cannot touch '/build/atop/pkg/atop/etc/default/atop': No such file or
directory
+```
+
+Add DEFPATH mkdir in genericinstall to make sure the folder
+`$(DESTDIR)/etc/default` exits
+
+Signed-off-by: BlackEagle
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 929b0d7..a662fd6 100644
+--- a/Makefile
b/Makefile
+@
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
commit: f248a174a3305abf4ef827c115d969ae3c342d77
Author: Lars Wendler gentoo org>
AuthorDate: Mon Jan 14 12:13:12 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jan 14 12:13:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f248a174
sys-process/atop: Bump to version 2.4.0
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
sys-process/atop/Manifest | 1 +
sys-process/atop/atop-2.4.0.ebuild| 56 +++
sys-process/atop/files/atop-2.4.0-build.patch | 22 +++
3 files changed, 79 insertions(+)
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index fb2b2381f0a..d65dc64336b 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -2,3 +2,4 @@ DIST atop-2.3.0-netatop_h.patch 3279 BLAKE2B
ac663d50c4474d28bbc1c6b70a2f439ccf7
DIST atop-2.3.0-version_c.patch 1537 BLAKE2B
eda9f0aa427e39ef12aa1584e6277de00577dff81a85085b8b12478a7631cb1739196a91feb684c2b9bdc0bd879493d1bb3a5dca8062da650cda78ae7744e934
SHA512
48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373
DIST atop-2.3.0-version_h.patch 748 BLAKE2B
95aa0e819d35498436ddb2554f457e9bf74a70395f077d8f0625b52469d3f4a1f5793afc061aa1f7105fbea6223bb19bbcb999be4231b761523eb28cb5243542
SHA512
79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d
DIST atop-2.3.0.tar.gz 190560 BLAKE2B
4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93
SHA512
8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
+DIST atop-2.4.0.tar.gz 230066 BLAKE2B
75070f0a87f9745f0e018ef5aac7e71060acea77e2043d43594a492875126945ef4c5bfe15f69b300ce6ac25c38f54360ba761ad7fc510016a91b71dc3377957
SHA512
8872626db447b2b7265fa257bc78795c3a5bc2f0dfffae94d01df4090de75feeb092e5a33421877aa12563dde3df18734b5db947c828cec6949284fbeb9dbc8d
diff --git a/sys-process/atop/atop-2.4.0.ebuild
b/sys-process/atop/atop-2.4.0.ebuild
new file mode 100644
index 000..8af7b18c2d7
--- /dev/null
+++ b/sys-process/atop/atop-2.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux"
+IUSE=""
+
+RDEPEND="
+ sys-libs/ncurses:0=
+ >=sys-process/acct-6.6.4-r1
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.0-build.patch
+
+ # taken from upstream.
+)
+
+pkg_pretend() {
+ if use kernel_linux ; then
+ CONFIG_CHECK="~BSD_PROCESS_ACCT"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ default
+ tc-export CC PKG_CONFIG
+ sed -i 's: root : :' atop.cronsysv || die #191926
+ # prefixify
+ sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" genericinstall
+ # useless -${PV} copies ?
+ rm "${ED%/}"/usr/bin/atop*-${PV} || die
+ newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
+ newinitd "${FILESDIR}"/atopacct.rc atopacct
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_dounit "${FILESDIR}"/atopacct.service
+ dodoc atop.cronsysv AUTHOR README
+}
diff --git a/sys-process/atop/files/atop-2.4.0-build.patch
b/sys-process/atop/files/atop-2.4.0-build.patch
new file mode 100644
index 000..73fd4169129
--- /dev/null
+++ b/sys-process/atop/files/atop-2.4.0-build.patch
@@ -0,0 +1,22 @@
+--- atop-2.4.0/Makefile
atop-2.4.0/Makefile
+@@ -33,16 +33,16 @@
+
+ atop: atop.o$(ALLMODS) Makefile
+ $(CC) -c version.c
+- $(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt
$(LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) atop.o $(ALLMODS) -o atop $(shell
${PKG_CONFIG} --libs ncurses) -lz -lm -lrt
+
+ atopsar: atop
+ ln -sf atop atopsar
+
+ atopacctd:atopacctd.o netlink.o
+- $(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) atopacctd.o netlink.o -o atopacctd
+
+ atopconvert: atopconvert.o
+- $(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) atopconvert.o -o atopconvert -lz
+
+ netlink.o:netlink.c
+ $(CC) -I. -Wall -c netlink.c
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
commit: cd1af859907aa7049c21a589c07ccca7c5ae31ff
Author: Harri Nieminen gmail com>
AuthorDate: Sun Dec 3 07:52:15 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Dec 12 15:10:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd1af859
sys-process/atop: Remove old
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6408
sys-process/atop/Manifest| 2 --
sys-process/atop/atop-1.27_p3.ebuild | 42 ---
sys-process/atop/atop-2.2.ebuild | 49 ---
sys-process/atop/atop-2.3.0.ebuild | 64
sys-process/atop/files/atop.rc | 15 -
sys-process/atop/files/atop.rc-r1| 8 -
6 files changed, 180 deletions(-)
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index d65838aa545..fb2b2381f0a 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,5 +1,3 @@
-DIST atop-1.27-3.tar.gz 159521 BLAKE2B
a12291386d13064019f0c6ffab3f7e198d82a3a295444f35756320dec74884ae46ca712828a7a3bfecf763c90c71ea6bfcd82c9bae3fc8371cf5533532bedd16
SHA512
59100b61ff14ff49d8daf815abdbf5e9f905767fe8532b0043f3a63acc4d37975201879a93634f6e77edd307e8b6e7d0bf1a3caff1a3cdce8240e92e46023003
-DIST atop-2.2-3.tar.gz 194168 BLAKE2B
7734c486fb83b1d4c00cccef35f01de0ae19442c6c49c65ff251c3abca1cee2af540cb1f8755eb8e039b4786aef6353c2b5b720f5a357d0932a8d632d87e1515
SHA512
34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915
DIST atop-2.3.0-netatop_h.patch 3279 BLAKE2B
ac663d50c4474d28bbc1c6b70a2f439ccf7f6e0d8c759e6240736fc44bea788fc76eea18769422bf391079945515a12615bae3139ca758d03b4687653a1d5cd1
SHA512
9b84adf3e740eca5e42199bb3e9e65e08ffb07f60e7c02d04b73cfe4b63a4f563991a797def5826ba10a32c78d2363ebe9b4e41d12cf9e7118e3eb82d259c31b
DIST atop-2.3.0-version_c.patch 1537 BLAKE2B
eda9f0aa427e39ef12aa1584e6277de00577dff81a85085b8b12478a7631cb1739196a91feb684c2b9bdc0bd879493d1bb3a5dca8062da650cda78ae7744e934
SHA512
48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373
DIST atop-2.3.0-version_h.patch 748 BLAKE2B
95aa0e819d35498436ddb2554f457e9bf74a70395f077d8f0625b52469d3f4a1f5793afc061aa1f7105fbea6223bb19bbcb999be4231b761523eb28cb5243542
SHA512
79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d
diff --git a/sys-process/atop/atop-1.27_p3.ebuild
b/sys-process/atop/atop-1.27_p3.ebuild
deleted file mode 100644
index 7e615c59c18..000
--- a/sys-process/atop/atop-1.27_p3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-MY_PV=${PV//_p/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Resource-specific view of processes"
-HOMEPAGE="https://www.atoptool.nl/";
-SRC_URI="https://www.atoptool.nl/download/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="sys-process/acct"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -i \
- -e '/^CFLAGS/s: = -O : += :' \
- -e '/^LDFLAGS/s: = : += :' \
- -e 's:\:$(CC):' \
- Makefile
- tc-export CC
- cp "${FILESDIR}"/atop.rc atop.init
- chmod a+rx atop.init
- sed -i 's: root : :' atop.cron #191926
-}
-
-src_install() {
- emake DESTDIR="${D}" INIPATH=/etc/init.d install || die
- # useless -${PV} copies ?
- rm -f "${D}"/usr/bin/atop*-${PV}
- dodoc README "${D}"/etc/cron.d/*
- rm -r "${D}"/etc/cron.d || die
-}
diff --git a/sys-process/atop/atop-2.2.ebuild b/sys-process/atop/atop-2.2.ebuild
deleted file mode 100644
index 2c3035fb4f8..000
--- a/sys-process/atop/atop-2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs systemd
-
-MY_PV=${PV//_p/-}
-MY_P=${PN}-${MY_PV}-3
-
-DESCRIPTION="Resource-specific view of processes"
-HOMEPAGE="https://www.atoptool.nl/";
-SRC_URI="https://www.atoptool.nl/download/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux"
-IUSE=""
-
-RDEPEND="
- sys-libs/ncurses
- sys-process/acct
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.2-build.patch
- epatch "${FILESDIR}"/${PN}-2.2-sysmacros.patch #580372
- tc-export CC PKG_CONFIG
- sed -i 's: root : :' atop.cronsysv || die #191926
- # prefixify
- sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile
-}
-
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
commit: 364a9e317ce981f01c28e374a55aac8ee960fe84
Author: Lars Wendler gentoo org>
AuthorDate: Wed Aug 2 12:53:00 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Aug 2 12:56:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364a9e31
sys-process/atop: Bump to version 2.3.0
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sys-process/atop/Manifest | 4 +++
sys-process/atop/atop-2.3.0.ebuild | 63 ++
sys-process/atop/files/atop.rc-r2 | 8 +
3 files changed, 75 insertions(+)
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index dedcd00a971..6503a777da6 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -2,3 +2,7 @@ DIST atop-1.27-3.tar.gz 159521 SHA256
bce36e0b50f0e03995d86d25dbc9ab4a289f6755ce
DIST atop-2.0.2.tar.gz 166887 SHA256
a620dbe0de7c7ee004949b201bed27559a8dd6cbdee651c7a3e15fc584723409 SHA512
c02b1c2ebf5c49fb0ad17bbcf0b86af8e5623c8d0b6ba8b1096d9b592cbb358e011933142cdebc90f619221785e859aaa009a338f3682d8bfa4340a50b308471
WHIRLPOOL
1f650210c7f0d79545ad268d5482f950d080aaff51a6045fa710ffc4c359f786cf27ebf88a1dfca87a402b63f8ea9dc7d0542e1949096744a30ca3620708e575
DIST atop-2.1-1.tar.gz 181301 SHA256
39a2d4febc338dd4147904b1496d1aa9513da0d22ad0602b66023452bdc7989f SHA512
89b33c9a299213faa42c8ee4393c9588c0dbe7940f8709a617d51d6202525a7e7385299242c8c032d573dea9fa631e705d8edfb4685414d35169b773e1290613
WHIRLPOOL
9f02afd797d25a28e873c25f6f03a2607628d60a7ef493b034a63707bc4b5fcd7d4d2d2f2c18b69312f19c5104639176e4816ebfd7282d53dd819786e45280d5
DIST atop-2.2-3.tar.gz 194168 SHA256
c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d SHA512
34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915
WHIRLPOOL
2798ebaf5affc9d929a0b5663c1caa6d64a52e00d20f496373f34e48c592fe168c8c20c9df3c309a3057f9eb7baa3409f2cbfbedf110adb9fef51d0774d8d3e2
+DIST atop-2.3.0-netatop_h.patch 3279 SHA256
e7d39b71c3eb6b94e358358267caca063a6e1c9e00dacdeaab1cfc9ca3ceff2e SHA512
9b84adf3e740eca5e42199bb3e9e65e08ffb07f60e7c02d04b73cfe4b63a4f563991a797def5826ba10a32c78d2363ebe9b4e41d12cf9e7118e3eb82d259c31b
WHIRLPOOL
8246ba30bb4268b7b3df25d8d8727c145d6aa8889f93ef0b0a3e07a63122eb25c31552e970ac92c3a3c3bf12b1b57e9d698cd50aa07ff8f8f5d8851131866e18
+DIST atop-2.3.0-version_c.patch 1537 SHA256
ea8620eee1557ddd932edcca0d696be4549d7b7b2c9417ff263d822155cb8d0a SHA512
48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373
WHIRLPOOL
3c8bbbce2a7fc947a7f4eddfe7160d35a5d765d3f0a4680098d157d7c4030881cde6fe236ef321a17294db1a21e0a8c5b992b030b8514ef921eaaccb5a3c115d
+DIST atop-2.3.0-version_h.patch 748 SHA256
c0acbb67080ab66f243c4c56f57030f51851ca816cc2f3945c775c90a347e2a8 SHA512
79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d
WHIRLPOOL
51f325f5a72d090c017487f783a4882ff8e82d4b25dd5ea48c7f1c5b8332acb1e03ef1fa7a1aca77d15d74772bc5979fbde1b83397814cceadd5848c3b698a09
+DIST atop-2.3.0.tar.gz 190560 SHA256
9af5d8ea1f1d2b1ff6e85dd666d294e213b7c39c66d8a7a796665061cdbf6c01 SHA512
8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
WHIRLPOOL
a0cb664edee0fb7750993db6885880f3eae25e079358a26cd0bab7ec0a45d1a18e6601e59e78e610b97bf0aacbb923463bcee2935a3b913af53e48d84d508cdc
diff --git a/sys-process/atop/atop-2.3.0.ebuild
b/sys-process/atop/atop-2.3.0.ebuild
new file mode 100644
index 000..373ca36e8d6
--- /dev/null
+++ b/sys-process/atop/atop-2.3.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod 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"
+
+# Tarballs lacks version.{c,h} files
+SRC_URI+="
https://github.com/Atoptool/atop/commit/42e86fcc42ce60f8c92f3c7d5f3a6ccde47c0b33.patch
-> ${PN}-2.3.0-version_h.patch"
+SRC_URI+="
https://github.com/Atoptool/atop/commit/a8d850d06efc8d70a19f55ec93fe83df51e99077.patch
-> ${PN}-2.3.0-version_c.patch"
+SRC_URI+="
https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd672631b6033c36c1.patch
-> ${PN}-2.3.0-netatop_h.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux"
+IUSE=""
+
+RDEPEND="
+ sys-libs/ncurses:0=
+ sys-process/acct
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2-build.patch
+ "${FILESDIR}"/${PN}-2.2-sysmacros.patch #580372
+
+ # taken from upstream.
+ "${DISTDIR}"/${P}-version
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/
commit: a1d059a3a560a5c93d3b9f6fe38d9789bf37b99c
Author: Lars Wendler gentoo org>
AuthorDate: Wed Aug 2 12:55:16 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Aug 2 12:56:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d059a3
sys-process/atop: Fixed init script for atop-2.2 (bug #553246).
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sys-process/atop/files/atop.rc-r1 | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/sys-process/atop/files/atop.rc-r1
b/sys-process/atop/files/atop.rc-r1
index e4d894e7328..c5172283a21 100644
--- a/sys-process/atop/files/atop.rc-r1
+++ b/sys-process/atop/files/atop.rc-r1
@@ -1,14 +1,8 @@
#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
description="Resource-specific view of processes"
pidfile="/var/run/atop.pid"
-command="/usr/bin/atop"
-
-start() {
- ebegin "Starting atop"
- start-stop-daemon --start --pidfile ${pidfile} \
- --exec /etc/atop/atop.daily
- eend $?
-}
+command="/etc/atop/atop.daily"
+command_background="true"
[gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/
commit: e473cee2e988c7ad21053f32211ef824585ca427
Author: Denis Romanchuk gmail com>
AuthorDate: Fri Nov 13 01:41:34 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Nov 13 01:47:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e473cee2
sys-process/atop: systemd support
https://bugs.gentoo.org/show_bug.cgi?id=553310
Package-Manager: portage-2.2.20.1
sys-process/atop/atop-2.2.ebuild| 4 +++-
sys-process/atop/files/atop.service | 11 +++
sys-process/atop/files/atopacct.service | 14 ++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/sys-process/atop/atop-2.2.ebuild b/sys-process/atop/atop-2.2.ebuild
index baa583b..7283c20 100644
--- a/sys-process/atop/atop-2.2.ebuild
+++ b/sys-process/atop/atop-2.2.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs systemd
MY_PV=${PV//_p/-}
MY_P=${PN}-${MY_PV}-3
@@ -43,5 +43,7 @@ src_install() {
rm -f "${ED}"/usr/bin/atop*-${MY_PV}
newinitd "${FILESDIR}"/${PN}.rc-r1 ${PN}
newinitd "${FILESDIR}"/atopacct.rc atopacct
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_dounit "${FILESDIR}"/atopacct.service
dodoc atop.cronsysv AUTHOR ChangeLog README
}
diff --git a/sys-process/atop/files/atop.service
b/sys-process/atop/files/atop.service
new file mode 100644
index 000..09295b9
--- /dev/null
+++ b/sys-process/atop/files/atop.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Atop advanced performance monitor
+Documentation=man:atop(1)
+
+[Service]
+Type=simple
+ExecStart=/etc/atop/atop.daily
+KillSignal=SIGUSR2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-process/atop/files/atopacct.service
b/sys-process/atop/files/atopacct.service
new file mode 100644
index 000..1f51ec4
--- /dev/null
+++ b/sys-process/atop/files/atopacct.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Atop process accounting daemon
+Documentation=man:atopacctd(8)
+Conflicts=psacct.service
+After=syslog.target
+Before=atop.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/atopacctd.pid
+ExecStart=/usr/sbin/atopacctd
+
+[Install]
+WantedBy=multi-user.target
