diff options
Diffstat (limited to 'system/atop')
| -rw-r--r-- | system/atop/142.patch | 47 | ||||
| -rw-r--r-- | system/atop/atop.SlackBuild | 7 | ||||
| -rw-r--r-- | system/atop/atop.info | 6 | ||||
| -rw-r--r-- | system/atop/doinst.sh | 2 |
4 files changed, 5 insertions, 57 deletions
diff --git a/system/atop/142.patch b/system/atop/142.patch deleted file mode 100644 index b17fe2d6ca..0000000000 --- a/system/atop/142.patch +++ /dev/null @@ -1,47 +0,0 @@ -From aff473ee28903775e1bb35793b9c4c50ee0c7270 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -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 <fontaine.fabrice@gmail.com> ---- - 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; diff --git a/system/atop/atop.SlackBuild b/system/atop/atop.SlackBuild index 009fe3feeb..2ac95288b4 100644 --- a/system/atop/atop.SlackBuild +++ b/system/atop/atop.SlackBuild @@ -14,7 +14,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=atop -VERSION=${VERSION:-2.7.1} +VERSION=${VERSION:-2.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -27,9 +27,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -68,7 +65,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -make CFLAGS="$SLKCFLAGS" +make # Install the binary sgid utmp in order to allow accounting install -D -o root -g utmp -m 2751 atop $PKG/usr/bin/atop diff --git a/system/atop/atop.info b/system/atop/atop.info index e970cbbde5..31b9bac1b8 100644 --- a/system/atop/atop.info +++ b/system/atop/atop.info @@ -1,8 +1,8 @@ PRGNAM="atop" -VERSION="2.7.1" +VERSION="2.10.0" HOMEPAGE="https://www.atoptool.nl/" -DOWNLOAD="https://www.atoptool.nl/download/atop-2.7.1.tar.gz" -MD5SUM="25b41209435da224e4509dcc12bba328" +DOWNLOAD="https://www.atoptool.nl/download/atop-2.10.0.tar.gz" +MD5SUM="6d14559b59e25d15dbcfa978ed0ec50e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/atop/doinst.sh b/system/atop/doinst.sh index d634387854..32b6609770 100644 --- a/system/atop/doinst.sh +++ b/system/atop/doinst.sh @@ -20,8 +20,6 @@ fi config etc/rc.d/rc.atop.new config etc/logrotate.d/psacct.new -config etc/logrotate.d/psaccs_atop.new -config etc/logrotate.d/psaccu_atop.new touch var/log/atop/daily.log |