network/netcat-openbsd: Updated for version 1.217-1.

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

3 files changed, 16 insertions, 18 deletions

diff --git a/network/netcat-openbsd/README b/network/netcat-openbsd/README
index 2301321b0f..09b5adca4e 100644
--- a/network/netcat-openbsd/README
+++ b/network/netcat-openbsd/README
@@ -7,9 +7,9 @@ time, it is a feature-rich network debugging and exploration tool, since
 it can create almost any kind of connection you would need and has
 several interesting built-in capabilities.
 
-This package contains the OpenBSD rewrite of netcat, including support
-for IPv6, proxies, and Unix sockets.  The installed binary is named
-"nc.openbsd" and the manpage is as well.
+This package contains the OpenBSD rewrite of netcat, with Debian and
+other patches, including support for IPv6, proxies, and Unix sockets.
+The installed binary is named "nc.openbsd" and the manpage is as well.
 
 BTW, this package conflicts with the netcat in slackware as it creates a
 symbolic link /usr/bin/nc (to let libvirt stuff work correctly), so
diff --git a/network/netcat-openbsd/netcat-openbsd.SlackBuild b/network/netcat-openbsd/netcat-openbsd.SlackBuild
index 22fa49b298..c36b771854 100644
--- a/network/netcat-openbsd/netcat-openbsd.SlackBuild
+++ b/network/netcat-openbsd/netcat-openbsd.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for netcat-openbsd
 #
+# Copyright 2020 Duncan Roe, Melbourne, Australia
 # Copyright 2020 Donald Cooley, South Haven, Indiana USA
 # Copyright 2010, 2014 Slax-Dude <jmfl {at} sapo [dot] pt>
 # All rights reserved.
@@ -24,12 +25,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=netcat-openbsd
-VERSION=${VERSION:-1.206}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.217_1}
+SRCVER=$(echo $VERSION | tr _ -)
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-DEBVER=1
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -69,9 +69,9 @@ rm -rf $PKG
 
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM\_$VERSION.orig.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -79,10 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Apply Debian patches
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-make CFLAGS="$SLKCFLAGS -DDEBIAN_VERSION=\"\\\"$DEBVER\\\"\""
+make CFLAGS="$SLKCFLAGS -DNETCAT_VERSION=\"\\\"$VERSION\\\"\""
 
 mkdir -p $PKG/usr/bin/ $PKG/usr/man/man1/
 install -s -m 0755 nc $PKG/usr/bin/nc.openbsd
@@ -91,6 +88,7 @@ gzip -9c nc.1 > $PKG/usr/man/man1/nc.openbsd.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a changelog copyright README* $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/netcat-openbsd/netcat-openbsd.info b/network/netcat-openbsd/netcat-openbsd.info
index 5a4a2accd9..9e6928ecd8 100644
--- a/network/netcat-openbsd/netcat-openbsd.info
+++ b/network/netcat-openbsd/netcat-openbsd.info
@@ -1,8 +1,8 @@
 PRGNAM="netcat-openbsd"
-VERSION="1.206"
-HOMEPAGE="https://packages.debian.org/bullseye/netcat-openbsd"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.206.orig.tar.gz"
-MD5SUM="e6639c7931e057282bd1404b6f9fa063"
+VERSION="1.217_1"
+HOMEPAGE="https://github.com/duncan-roe/netcat-openbsd"
+DOWNLOAD="https://github.com/duncan-roe/netcat-openbsd/archive/1.217-1/netcat-openbsd-1.217-1.tar.gz"
+MD5SUM="8babccac46097ae5b746ffa00c01ac0f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% libbsd"