From d6ff11b118be5a348207b8476e4714cdc220b3a9 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Mon, 19 Aug 2019 17:58:31 +0200
Subject: [PATCH] network/redir: Updated for version 3.3, changed homepage.

Various cleanups

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 network/redir/README           |  3 +++
 network/redir/redir.SlackBuild | 41 ++++++++++++++++++++--------------
 network/redir/redir.info       |  8 +++----
 network/redir/slack-desc       |  2 +-
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/network/redir/README b/network/redir/README
index 21a66f706f..eb83153b9e 100644
--- a/network/redir/README
+++ b/network/redir/README
@@ -1,3 +1,6 @@
 redir is all you need to redirect traffic across firewalls.
 The functionality of inetd/tcpd and "redir" will allow you to
 do everything you need without screwy telnet/ftp etc gateways.
+
+Have a look at the man page or at /usr/doc/redir-*/README.md
+for usage examples.
diff --git a/network/redir/redir.SlackBuild b/network/redir/redir.SlackBuild
index 74c1345ac0..363cf66cc9 100644
--- a/network/redir/redir.SlackBuild
+++ b/network/redir/redir.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for redir
 
-# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=redir
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,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"
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="CHANGES COPYING README contrib transproxy.txt"
+DOCS="AUTHORS COPYING *.md transproxy.txt"
 
 set -e
 
@@ -65,26 +65,33 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -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 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 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-sed -i "s|^EXTRA_LIBS.*|EXTRA_LIBS = -lnsl|" Makefile
+./autogen.sh 
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
 make
-install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 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/man/man1
-gzip -9c $PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1.gz
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/redir/redir.info b/network/redir/redir.info
index 3280819247..215471b82a 100644
--- a/network/redir/redir.info
+++ b/network/redir/redir.info
@@ -1,8 +1,8 @@
 PRGNAM="redir"
-VERSION="2.2.1"
-HOMEPAGE="http://sammy.net/~sammy/hacks/"
-DOWNLOAD="http://sammy.net/~sammy/hacks/redir-2.2.1.tar.gz"
-MD5SUM="4342fadac30504c86c8db7beefe01995"
+VERSION="3.3"
+HOMEPAGE="https://github.com/troglobit/redir"
+DOWNLOAD="https://github.com/troglobit/redir/archive/v3.3/redir-3.3.tar.gz"
+MD5SUM="cdecd8a0b77bc64911dc882681b8157c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/redir/slack-desc b/network/redir/slack-desc
index b201e42c75..5ed6303ec1 100644
--- a/network/redir/slack-desc
+++ b/network/redir/slack-desc
@@ -12,7 +12,7 @@ redir: redir is all you need to redirect traffic across firewalls.
 redir: The functionality of inetd/tcpd and "redir" will allow you to
 redir: do everything you need without screwy telnet/ftp etc gateways.
 redir:
-redir: homepage: http://sammy.net/~sammy/hacks/
+redir: homepage: https://github.com/troglobit/redir
 redir:
 redir:
 redir: