commit: 622eaca5cfa12ff8a45fe6e69bc4a954e32aa6e3 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Nov 1 15:53:56 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Nov 1 16:07:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622eaca5
sys-process/atop: drop 2.9.0-r1, 2.10.0-r1 Bug: https://bugs.gentoo.org/931632 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-process/atop/Manifest | 3 - sys-process/atop/atop-2.10.0-r1.ebuild | 122 --------------------- sys-process/atop/atop-2.9.0-r1.ebuild | 118 -------------------- sys-process/atop/files/atop-2.10.0-ldflags.patch | 20 ---- .../files/atop-2.10.0-respect-PKG_CONFIG.patch | 14 --- .../atop/files/atop-2.10.0-respect-opt.patch | 12 -- sys-process/atop/files/atop-2.6.0-build.patch | 27 ----- .../atop/files/atop-2.9.0-netatop-makefile.patch | 42 ------- 8 files changed, 358 deletions(-) diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest index 5df7b243b145..97a527d54a09 100644 --- a/sys-process/atop/Manifest +++ b/sys-process/atop/Manifest @@ -1,5 +1,2 @@ -DIST atop-2.10.0.tar.gz 296569 BLAKE2B 8c6e56978cb32e4e80c7344f631d6fd3dd034ff785e6b2db1b80556aaea30a0feeb413704128150ba0d7b1b4eaeb6cb5699a1b2661060ac53c10f7025997418e SHA512 22e39799aa7c090c68d8ac2f02646fb9586122bdb83de9d90bc3119bd290c557faa0489cdc8640fc4fd1f1155c231b1d70dae1b22dc6102ba0327fdd4b5f7029 DIST atop-2.11.0.tar.gz 322301 BLAKE2B 0084f1c02e835abd69c4810c0ef020d40bd8738064f8b9ae3cb1f24c460507571b87ddf47f12a0b2eefa86f9d0dcce02be8829e157dcc289deaac6d9cd3c7cda SHA512 5cf176e83232a54b69628b165172ed43f7bdfb62c7744ee781da8a262f3e4d70a829dc175320b5042a794a8d31318672477ba870feaaf3e9aa85fd4d6f485356 -DIST atop-2.9.0.tar.gz 282412 BLAKE2B 8531eee3bffabfb3cacdb6bea4c4a1b7ea56da878154a86edd80fb20ddffc5f56248d06c679bd8933c203a0174e97515cfce633a2387bf465399d4203ca857c2 SHA512 f055466c076491a54fc45a482209fd3de60013e7b76af46b65dffe82d220fbd96eb11d5f199aa27e2f7a8754fe3c6509c44bf0dbd6e3099d8f5710944e01cb38 -DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68 DIST netatop-3.2.2.tar.gz 23977 BLAKE2B cf360071e56593251df4249d2c7ec8a1c823c71a4d96e5b7f5d02ab0dc8388eb22d34c4120924c5a5ecc9b4d610a14785e5002bc3b888aa4c66d8c73454a0900 SHA512 59ff6daf56f73578cfc7b48085747d3f2917589203196396dde6036c33da0dbce4b67b58c141545a785beb31ebeb35936d96bb6ff3b6071e95315a32e20d6093 diff --git a/sys-process/atop/atop-2.10.0-r1.ebuild b/sys-process/atop/atop-2.10.0-r1.ebuild deleted file mode 100644 index 5d3ecf36942a..000000000000 --- a/sys-process/atop/atop-2.10.0-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# 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 - - sed \ - -e "s#\`uname -r\`#${KV_FULL}#g" \ - -e "s#\$(shell uname -r)#${KV_FULL}#g" \ - -i {.,daemon,module}/Makefile || die - - grep -rq "uname -r" && die "found uname calls" - - 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/atop-2.9.0-r1.ebuild b/sys-process/atop/atop-2.9.0-r1.ebuild deleted file mode 100644 index 6b72dd2f4521..000000000000 --- a/sys-process/atop/atop-2.9.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# 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=" - 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 -) - -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 - - sed \ - -e "s#\`uname -r\`#${KV_FULL}#g" \ - -e "s#\$(shell uname -r)#${KV_FULL}#g" \ - -i {.,daemon,module}/Makefile || die - - grep -rq "uname -r" && die "found uname calls" - - 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 deleted file mode 100644 index 5b2924ef3864..000000000000 --- a/sys-process/atop/files/atop-2.10.0-ldflags.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/Atoptool/atop/pull/289 - -From 8411f81a202c9c39aebcc637ef94cc3d454cbaaf Mon Sep 17 00:00:00 2001 -From: Marc 'Zugschlus' Haber <[email protected]> -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 deleted file mode 100644 index 483506043490..000000000000 --- a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index 5a55e6f2f835..000000000000 --- a/sys-process/atop/files/atop-2.10.0-respect-opt.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/sys-process/atop/files/atop-2.6.0-build.patch b/sys-process/atop/files/atop-2.6.0-build.patch deleted file mode 100644 index b675a16ee360..000000000000 --- a/sys-process/atop/files/atop-2.6.0-build.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 -- $(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS) -+ $(CC) $(CFLAGS) atopconvert.o -o atopconvert -lz $(LDFLAGS) - - atopcat: atopcat.o -- $(CC) atopcat.o -o atopcat $(LDFLAGS) -+ $(CC) $(CFLAGS) atopcat.o -o atopcat $(LDFLAGS) - - clean: - rm -f *.o atop atopacctd atopconvert atopcat - 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 deleted file mode 100644 index 30710369fd46..000000000000 --- a/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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
