desktop/wmnet: New maintainer, handle gigE.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

5 files changed, 76 insertions, 38 deletions

diff --git a/desktop/wmnet/README b/desktop/wmnet/README
index c1522adf75c0..0843110a18fd 100644
--- a/desktop/wmnet/README
+++ b/desktop/wmnet/README
@@ -1,6 +1,9 @@
-wmnet is Window Maker network monitor dockable application
+wmnet (network bandwidth monitor dockapp for WindowMaker)
 
 wmnet polls network statistics and does a few things with the data it
-gets. It has small blinking lights for the rx and tx of IP packets, a
-digital speedometer of your networks current speed and a bar graph
-like xload plotting your throughput.
+gets. It has small blinking lights for the RX and TX of IP packets,
+a digital speedometer of your network's current speed, and a bar graph
+(like xload) plotting your throughput.
+
+Note: wmnet still works on modern Linux systems, but all the
+documentation about ipfwadm and ipchains is hopelessly outdated.
diff --git a/desktop/wmnet/ludicrous_speed.diff b/desktop/wmnet/ludicrous_speed.diff
new file mode 100644
index 000000000000..345d389d13c1
--- /dev/null
+++ b/desktop/wmnet/ludicrous_speed.diff
@@ -0,0 +1,25 @@
+diff -Naur wmnet-1.06/wmnet.c wmnet-1.06.patched/wmnet.c
+--- wmnet-1.06/wmnet.c	2000-05-04 21:01:14.000000000 -0400
++++ wmnet-1.06.patched/wmnet.c	2023-01-30 15:53:12.218189907 -0500
+@@ -660,11 +660,18 @@
+ 		snprintf(astring, 10, "%2.1fk/s", rate);
+ 	else if (rate >= 100. && rate < 1000.)
+ 		snprintf(astring, 10, "%dk/s", (unsigned int)rate);
+-	else if (rate > 1000. && rate < 10000.)
++	else if (rate >= 1000. && rate < 10000.)
+ 		snprintf(astring, 10, "%1.2fM/s", (rate / 1000.));
+-	else if (rate > 10000. && rate < 100000.)
++	else if (rate >= 10000. && rate < 100000.)
+ 		snprintf(astring, 10, "%2.1fM/s", (rate / 1000.));
+-	else sprintf(astring, "XXXX");
++	else if (rate >= 100000. && rate < 1000000.)
++		snprintf(astring, 10, "%dM/s", (unsigned int)(rate / 1000.));
++	else if (rate >= 1000000. && rate < 10000000.)
++		snprintf(astring, 10, "%1.2fG/s", (rate / 1000000.));
++	else if (rate >= 10000000. && rate < 100000000.)
++		snprintf(astring, 10, "%2.1fG/s", (rate / 1000000.));
++	else /* >= 100000000., won't happen any time soon */
++		snprintf(astring, 10, "%3.0fG/s", (rate / 1000000.));
+ 
+ 	XSetForeground(dpy, graphics_context, color);
+ 	XSetClipRectangles(dpy, graphics_context, 0, 0, &cliprect, 1, Unsorted);
diff --git a/desktop/wmnet/slack-desc b/desktop/wmnet/slack-desc
index 35a0e71f017a..088dd5358fc9 100644
--- a/desktop/wmnet/slack-desc
+++ b/desktop/wmnet/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-wmnet: wmnet (Window Maker network monitor dockable application)
+wmnet: wmnet (network bandwidth monitor dockapp for WindowMaker)
 wmnet:
 wmnet: wmnet polls network statistics and does a few things with the data it
-wmnet: gets. It has small blinking lights for the rx and tx of IP packets, a
-wmnet: digital speedometer of your networks current speed and a bar graph
-wmnet: like xload plotting your throughput.
+wmnet: gets. It has small blinking lights for the RX and TX of IP packets,
+wmnet: a digital speedometer of your network's current speed, and a bar graph
+wmnet: (like xload) plotting your throughput.
 wmnet:
 wmnet:
 wmnet:
diff --git a/desktop/wmnet/wmnet.SlackBuild b/desktop/wmnet/wmnet.SlackBuild
index 78b5c0f2b348..a4d86dc4e0cc 100644
--- a/desktop/wmnet/wmnet.SlackBuild
+++ b/desktop/wmnet/wmnet.SlackBuild
@@ -1,15 +1,25 @@
 #!/bin/bash
 
 # Slackware build script for wmnet
-# Written by Cezary M. Kruk (c.kruk@bigfoot.com)
-
+# Written by Cezary M. Kruk (email removed)
 # Modified by the SlackBuilds.org project.
+# Modified and now maintained by B. Watson (urchlay@slackware.uk).
+
+# Original author didn't include a license. Modified version released
+# under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230204 bkw: BUILD=2.
+# - take over maintenance.
+# - add patch to support >100MB/s.
+# - fix README and slack-desc.
+# - remove support for archaic ipchains, ipfwadm, ppp.
+# - simplify build.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wmnet
 VERSION=${VERSION:-1.06}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -21,9 +31,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
@@ -56,30 +63,33 @@ 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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20230204 bkw: This patch allows wmnet to correctly display rates
+# up to 999 terabytes/sec. Some day it too will be obsolete... I
+# considered changing the lowercase "b" (for bytes) to a capital B, to
+# match modern usage... but at the tiny font size wmnet uses, B looks
+# too much like the number 8.
+patch -p1 < $CWD/ludicrous_speed.diff
+
+# 20230204 bkw: Disable archaic methods of getting network status.
+# ipchains went away in Linux 2.6 (2003), ipfwadm has been gone since
+# Linux 2.2 (1999). Also, the PPP method is no longer needed, even if
+# someone's still using PPP in 2023 (generic "devstats" driver handles
+# it fine). Doing this makes the executable ~10% smaller.
+sed -i '/#define *USE_\(LINUX_PPP\|IPFWADM\|IPCHAINS\)/s,.*,/* & */,' config.h
 
 xmkmf
-mkdir -p $PKG/usr/man/man1
-
-make \
-  CFLAGS="$SLKCFLAGS" \
-  INCDIR="-I/usr/include/X11" \
-  LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
-make install DESTDIR=$PKG
-
-# Copying manual to the correct location
-gzip -9c wmnet.man > $PKG/usr/man/man1/wmnet.1.gz
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+make CFLAGS="$SLKCFLAGS"
+strip $PRGNAM
+make install install.man INSTMANFLAGS="-m 0644" DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a Changelog README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/wmnet/wmnet.info b/desktop/wmnet/wmnet.info
index 4f8b6ff4ec77..2a511c73b006 100644
--- a/desktop/wmnet/wmnet.info
+++ b/desktop/wmnet/wmnet.info
@@ -6,5 +6,5 @@ MD5SUM="64e74c37c0cb5fd4fb81cfb0f5c4a264"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Cezary M. Kruk"
-EMAIL="c.kruk@bigfoot.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"