system/ioping: Updated for version 1.2.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 20 insertions, 88 deletions

diff --git a/system/ioping/README b/system/ioping/README
index c332250748..1602dc1e5d 100644
--- a/system/ioping/README
+++ b/system/ioping/README
@@ -1,2 +1,4 @@
-An tool to monitor I/O latency in real time.
-It shows disk latency in the same way as ping shows network latency.
+ioping (simple disk I/O latency monitoring tool)
+
+A tool to monitor I/O latency in real time. It shows disk latency in
+the same way as ping shows network latency.
diff --git a/system/ioping/README.SBo b/system/ioping/README.SBo
deleted file mode 100644
index 8ce9199b36..0000000000
--- a/system/ioping/README.SBo
+++ /dev/null
@@ -1,46 +0,0 @@
-Examples
---------
-
-Show disk I/O latency using the default values and the current directory,
-until interrupted:
-
-```
-$ ioping .
-4096 bytes from . (ext4 /dev/sda3): request=1 time=0.2 ms
-4096 bytes from . (ext4 /dev/sda3): request=2 time=0.2 ms
-4096 bytes from . (ext4 /dev/sda3): request=3 time=0.3 ms
-4096 bytes from . (ext4 /dev/sda3): request=4 time=12.7 ms
-4096 bytes from . (ext4 /dev/sda3): request=5 time=0.3 ms
-^C
---- . (ext4 /dev/sda3) ioping statistics ---
-5 requests completed in 4794.0 ms, 364 iops, 1.4 MiB/s
-min/avg/max/mdev = 0.2/2.8/12.7/5.0 ms
-```
-
-Measure disk seek rate (iops, avg)
-
-```
-$ ioping -R /dev/sda
-
---- /dev/sda (device 465.8 GiB) ioping statistics ---
-186 requests completed in 3004.6 ms, 62 iops, 0.2 MiB/s
-min/avg/max/mdev = 6.4/16.0/26.8/4.7 ms
-```
-
-Measure disk sequential speed (MiB/s)
-
-```
-$ ioping -RL /dev/sda
-
---- /dev/sda (device 465.8 GiB) ioping statistics ---
-837 requests completed in 3004.1 ms, 292 iops, 72.9 MiB/s
-min/avg/max/mdev = 2.0/3.4/28.9/2.0 ms
-```
-
-Authors
--------
-
-* Konstantin Khlebnikov <koct9i@gmail.com>
-* Kir Kolyshkin <kir@openvz.org>
-
-Licensed under GPLv3 (or later) <http://www.gnu.org/licenses/gpl-3.0.txt>
diff --git a/system/ioping/ioping-0.9-Makefile.diff b/system/ioping/ioping-0.9-Makefile.diff
deleted file mode 100644
index d1cd233bdc..0000000000
--- a/system/ioping/ioping-0.9-Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2014-10-06 02:05:35.000000000 -0400
-+++ Makefile.new	2016-06-02 13:21:26.326048007 -0400
-@@ -31,7 +31,7 @@
- all: version $(BINS)
- 
- version: $(DISTFILES)
--	test ! -d .git || git describe --tags --dirty=+ | sed 's/^v//;s/-/./g' > $@
-+	echo 0.9 > $@
- 
- clean:
- 	$(RM) -f $(OBJS) $(BINS) $(MANS_F)
diff --git a/system/ioping/ioping.SlackBuild b/system/ioping/ioping.SlackBuild
index f710ebe52d..f63d60d8bd 100644
--- a/system/ioping/ioping.SlackBuild
+++ b/system/ioping/ioping.SlackBuild
@@ -24,25 +24,25 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org, updated for v1.2 as the
+# previous version wouldn't build on Slackware 15.0.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ioping
-VERSION=${VERSION:-0.9}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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
@@ -52,8 +52,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -75,32 +75,19 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+chmod 644 *
 
-# We don't have a git repo so we manually set the version in the Makefile
-patch < $CWD/ioping-0.9-Makefile.diff
+sed -i "s|-g -O2|$SLKCFLAGS -Wl,-s|" Makefile
 
 make install \
-  OPTS="$SLKCFLAGS" \
   PREFIX=/usr \
+  MAN1DIR=/usr/man/man1 \
   DESTDIR=$PKG
 
-strip --strip-unneeded $PKG/usr/bin/ioping
-mkdir -p $PKG/usr/man/man1
-mv $PKG/usr/share/man/man1/ioping.1 $PKG/usr/man/man1
-gzip -9 $PKG/usr/man/man1/ioping.1
-rmdir $PKG/usr/share/man/man1
-rmdir $PKG/usr/share/man
-rmdir $PKG/usr/share
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $TMP/$PRGNAM-$VERSION/changelog > $PKG/usr/doc/$PRGNAM-$VERSION/changelog
-cat $TMP/$PRGNAM-$VERSION/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
-cat $TMP/$PRGNAM-$VERSION/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cp -a LICENSE changelog README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/ioping/ioping.info b/system/ioping/ioping.info
index bd49959504..71656304b3 100644
--- a/system/ioping/ioping.info
+++ b/system/ioping/ioping.info
@@ -1,8 +1,8 @@
 PRGNAM="ioping"
-VERSION="0.9"
+VERSION="1.2"
 HOMEPAGE="https://github.com/koct9i/ioping"
-DOWNLOAD="https://github.com/koct9i/ioping/archive/v0.9/ioping-0.9.tar.gz"
-MD5SUM="8f2a9c03c3b689ed2c62b7ff72b46022"
+DOWNLOAD="https://github.com/koct9i/ioping/archive/v1.2/ioping-1.2.tar.gz"
+MD5SUM="725a974e9be8a78c0f61e06463648e53"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ioping/slack-desc b/system/ioping/slack-desc
index a77271121c..e1d29c4576 100644
--- a/system/ioping/slack-desc
+++ b/system/ioping/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-ioping: ioping (monitor I/O latency in real time)
+ioping: ioping (simple disk I/O latency monitoring tool)
 ioping:
 ioping: A tool to monitor I/O latency in real time. It shows disk latency
 ioping: in the same way as ping shows network latency.