iotop: Update to version 1.22 coming from new repository

- Existing iotop is version 0.6 from 2013. In that original repository there have been 42
   commits since then up to 2022-03-07 but without any version release.
- In 2020 a new repository was started, based on the original iotop but converted to only
   C code with no python. This is being updated on a regular basis with version releases.
   This version was released in July 10th 2022. There have been n21 releases since this
   repository was started.
- Built and tested this version of iotop and it gave a screen with very similar look to
   the original version. The new version has the ability to scroll all the entries whereas
   the original one required the window to be made larger to show more entries.
- The new version also has a column showing a graphical view of the amount of traffic as
   well as the actual numbers.
- Overall this looks to match what vthe original iotop did, plus with a few extras and is
   being regularly maintained with new releases.
- Updated rootfile
- This version of iotop is automatically placed in /usr/sbin as the original used to be.
- New repository is at https://github.com/Tomas-M/iotop
- Changelog can be seen at the above repository. It is too large to include here with
   21 version updates.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>

diff --git a/config/rootfiles/packages/iotop b/config/rootfiles/packages/iotop
index 356541e226b6be5cbc0c23c061abbe7541af2d4e..bd751347acdba6d6fead8262a698804808dbf75c 100644 (file)
--- a/config/rootfiles/packages/iotop
+++ b/config/rootfiles/packages/iotop
@@ -1,2 +1,2 @@
 usr/sbin/iotop
-usr/lib/python3.10/site-packages/iotop-0.6-py3.10.egg
+#usr/share/man/man8/iotop.8

diff --git a/lfs/iotop b/lfs/iotop
index dd9deb2e4c22b4f8d4412c5357120da5c3b0ab3f..1dc44eaefd15e1be08b3d56000d9f26484e6a9fa 100644 (file)
--- a/lfs/iotop
+++ b/lfs/iotop
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,16 +26,16 @@ include Config
 
 SUMMARY    = Top Like UI to Show Per-Process I/O Going on
 
-VER        = 0.6
+VER        = 1.22
 
 THISAPP    = iotop-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = iotop
-PAK_VER    = 4
+PAK_VER    = 5
 DEPS       =
 
 SERVICES   =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = eb2293f3beb196efafb04f7254a241d5a904cf4bd97673f774dfc0db1e77156e49d28c4eda289beb814965fd55acd8adbc2749c1fbb1791a29020255110b2b2f
+$(DL_FILE)_BLAKE2 = 59ceff92600f6f9ff080d02ea10a796a2b6f05ccbb663ac2eed9a7d5c7f6a44de329307bc45605b3415804ef3b2d0699afdaeb1c22604276ce15fc606304ef70
 
 install : $(TARGET)
 
@@ -80,13 +80,8 @@ $(subst %,%_BLAKE2,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iotop-0.6-replace-itervalues-with-values-in-setup.py.patch
-       cd $(DIR_APP) && python3 setup.py install
-       
-       # iotop with python-3.10.8 is placing iotop in /usr/bin
-       # move iotop from /usr/bin to /usr/sbin
-       cd $(DIR_APP) && mv -v /usr/bin/iotop /usr/sbin
-       
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)