diff --git a/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch b/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch deleted file mode 100644 index 0dfe4f4301..0000000000 --- a/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aff473ee28903775e1bb35793b9c4c50ee0c7270 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 22 Dec 2020 12:23:33 +0100 -Subject: [PATCH] ifprop.c: fix build with kernel < 4.6 - -Build fails with kernel headers < 4.6 since version 2.6.0 and -https://github.com/Atoptool/atop/commit/08c622ecaa5bb0bb260984ceaddc4730d1b312a7 - -Indeed, ethtool_link_settings and ETHTOOL_GLINKSETTINGS are only -available since -https://github.com/torvalds/linux/commit/3f1ac7a700d039c61d8d8b99f28d605d489a60cf - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/Atoptool/atop/pull/142] ---- - ifprop.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ifprop.c b/ifprop.c -index 60fa3fa..63fce5a 100644 ---- a/ifprop.c -+++ b/ifprop.c -@@ -104,7 +104,9 @@ initifprop(void) - char *cp, linebuf[2048]; - int i=0, sockfd; - -+#ifdef ETHTOOL_GLINKSETTINGS - struct ethtool_link_settings ethlink; // preferred! -+#endif - struct ethtool_cmd ethcmd; // deprecated - - struct ifreq ifreq; -@@ -153,6 +155,7 @@ initifprop(void) - strncpy((void *)&ifreq.ifr_ifrn.ifrn_name, ifprops[i].name, - sizeof ifreq.ifr_ifrn.ifrn_name-1); - -+#ifdef ETHTOOL_GLINKSETTINGS - ethlink.cmd = ETHTOOL_GLINKSETTINGS; - ifreq.ifr_ifru.ifru_data = (void *)ðlink; - -@@ -164,6 +167,7 @@ initifprop(void) - phy_addr = ethlink.phy_address; - } - else -+#endif - { - ethcmd.cmd = ETHTOOL_GSET; - ifreq.ifr_ifru.ifru_data = (void *)ðcmd; --- -2.29.2 - diff --git a/package/atop/0002-photosyst.c-fix-build-on-musl.patch b/package/atop/0002-photosyst.c-fix-build-on-musl.patch deleted file mode 100644 index 8573d59d6b..0000000000 --- a/package/atop/0002-photosyst.c-fix-build-on-musl.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 34996ad1eb6d295382e7737ef34bd362abdd4944 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 19 Jan 2021 22:15:45 +0100 -Subject: [PATCH] photosyst.c: fix build on musl -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Build on musl is broken since version 2.6.0 and -https://github.com/Atoptool/atop/commit/e889c66fbe1d0b7ae38fbcbaa46cea749257f486 -because limits.h is not included: - -photosyst.c: In function ‘lvmmapname’: -photosyst.c:1624:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean ‘AF_MAX’? - char path[PATH_MAX]; - ^~~~~~~~ - AF_MAX - -Signed-off-by: Fabrice Fontaine ---- - photosyst.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/photosyst.c b/photosyst.c -index 3de874b..67ae92f 100644 ---- a/photosyst.c -+++ b/photosyst.c -@@ -165,6 +165,7 @@ - #include - #include - #include -+#include - - #define SCALINGMAXCPU 8 // threshold for scaling info per CPU - --- -2.29.2 - diff --git a/package/atop/atop.hash b/package/atop/atop.hash index 65148b8578..fb2eb1c727 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72 atop-2.6.0.tar.gz +sha256 a606705aaca940a6d44d67c886529a75db98fd88140f743eb0aaebb184c38af7 atop-2.7.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 88f292b6b3..f2a1f1de51 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.6.0 +ATOP_VERSION = 2.7.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING