network/2ping: Fix wireshark plugin, README.

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

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

2 files changed, 17 insertions, 19 deletions

diff --git a/network/2ping/2ping.SlackBuild b/network/2ping/2ping.SlackBuild
index 6607e3576a0d..5436ce4fdd72 100644
--- a/network/2ping/2ping.SlackBuild
+++ b/network/2ping/2ping.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20241012 bkw: BUILD=3
+# - always include wireshark stuff.
+# - update the optional deps in README (python3- prefixes).
 # 20220331 bkw: BUILD=2, add SlackBuild to doc dir.
 # 20210911 bkw: update for v4.5.1.
 # 20200805 bkw: update for v4.5.
@@ -20,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=2ping
 VERSION=${VERSION:-4.5.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -63,13 +66,12 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 
 python3 setup.py install --root=$PKG
 
-# Include wireshark stuff, if we have a wireshark that can use it (built
-# with lua52). The lua script is for decoding, the .pcap file is a sample
-# packet capture (belongs in doc dir).
-if [ -x /usr/bin/wireshark ] && ldd /usr/bin/wireshark | fgrep -q lua5.2; then
-  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/wireshark/plugins
-  cp -a wireshark/*.lua $PKG/usr/lib$LIBDIRSUFFIX/wireshark/plugins
-fi
+# 20241012 bkw: always include the wireshark stuff. our wireshark uses
+# lua53 only now, and 2ping.lua works fine with it. If someone doesn't
+# have wireshark installed, *shrug*, this wates a few KB of disk
+# space, no harm done.
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/wireshark/plugins
+cp -a wireshark/*.lua $PKG/usr/lib$LIBDIRSUFFIX/wireshark/plugins
 
 mkdir -p $PKG/usr/man/man1
 gzip -9c < doc/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
diff --git a/network/2ping/README b/network/2ping/README
index f47b5705c107..4a27c5c122e1 100644
--- a/network/2ping/README
+++ b/network/2ping/README
@@ -5,8 +5,11 @@ TCP SYN, SYN/ACK, ACK) and after-the-fact state comparison between a
 2ping listener and a 2ping client to determine which direction packet
 loss occurs.
 
+The package includes a wireshark plugin for decoding the 2ping
+protocol.
+
 If you would like to quickly test 2ping against a remote listener
-without setting one of your own up, there are several public test
+without setting up your own, there are several public test
 listeners available. Try test.2ping.net, cromulent.colobox.com, or
 linode-london.mirrors.finnix.org.
 
@@ -21,13 +24,6 @@ su nobody -s /bin/sh -c \
 Optional dependencies: Certain command line options to 2ping require
 additional packages.
 
-- dnspython: --srv option.
-- netifaces: --all-interfaces option.
-- python3-pycrypto: --encrypt option.
-
-The package can include a wireshark plugin for decoding the 2ping
-protocol. This requires your wireshark to have been compiled with lua52
-(not lua, which is version 5.1). See the README for network/wireshark
-for details. If you're not sure about your wireshark's lua version, try
-"ldd /usr/bin/wireshark|grep lua". This will show either liblua.so.5.1
-or liblua.so.5.2.
+- python3-dnspython: --srv option.
+- python3-netifaces: --all-interfaces option.
+- python3-pycrypto:  --encrypt option.