From fb4d506bfd6f120a5ef887f5f7ed79ae336e40a0 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Mon, 16 Oct 2017 07:11:15 +0700
Subject: network/tinyproxy: Updated for version 1.8.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/tinyproxy/slack-desc           |  2 +-
 network/tinyproxy/tinyproxy.SlackBuild | 31 ++++++++++++++-----------------
 network/tinyproxy/tinyproxy.info       |  8 ++++----
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/network/tinyproxy/slack-desc b/network/tinyproxy/slack-desc
index e54a2fdb58..b3bec79622 100644
--- a/network/tinyproxy/slack-desc
+++ b/network/tinyproxy/slack-desc
@@ -15,5 +15,5 @@ tinyproxy: but the system resources required to run a more demanding HTTP proxy
 tinyproxy: are unavailable.
 tinyproxy: tinyproxy is fully compatible with all existing web browsers
 tinyproxy:
-tinyproxy: Homepage: https://www.banu.com/tinyproxy/
+tinyproxy: Homepage: https://github.com/tinyproxy/tinyproxy
 tinyproxy:
diff --git a/network/tinyproxy/tinyproxy.SlackBuild b/network/tinyproxy/tinyproxy.SlackBuild
index d47f6d2e4f..bde1315e0e 100644
--- a/network/tinyproxy/tinyproxy.SlackBuild
+++ b/network/tinyproxy/tinyproxy.SlackBuild
@@ -6,13 +6,13 @@
 # Public domain.
 
 PRGNAM=tinyproxy
-VERSION=${VERSION:-1.8.3}
+VERSION=${VERSION:-1.8.4}
 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
@@ -23,8 +23,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"
@@ -43,14 +43,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 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 {} \;
+ \( -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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -65,19 +65,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-filter \
   --enable-upstream \
   --enable-reverse \
-  --enable-transparent-proxy \
+  --enable-transparent \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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
 
 mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
 sed -i -e "s,/usr/share,&/$PRGNAM,g" \
@@ -85,8 +83,7 @@ sed -i -e "s,/usr/share,&/$PRGNAM,g" \
   $PKG/etc/tinyproxy.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-AUTHORS COPYING ChangeLog NEWS README TODO docs/*.txt \
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO docs/*.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
diff --git a/network/tinyproxy/tinyproxy.info b/network/tinyproxy/tinyproxy.info
index c35549d1be..9ed376cc94 100644
--- a/network/tinyproxy/tinyproxy.info
+++ b/network/tinyproxy/tinyproxy.info
@@ -1,8 +1,8 @@
 PRGNAM="tinyproxy"
-VERSION="1.8.3"
-HOMEPAGE="https://www.banu.com/tinyproxy/"
-DOWNLOAD="https://www.banu.com/pub/tinyproxy/1.8/tinyproxy-1.8.3.tar.bz2"
-MD5SUM="292ac51da8ad6ae883d4ebf56908400d"
+VERSION="1.8.4"
+HOMEPAGE="https://tinyproxy.github.io/"
+DOWNLOAD="https://github.com/tinyproxy/tinyproxy/releases/download/1.8.4/tinyproxy-1.8.4.tar.xz"
+MD5SUM="b181e8c78cb31c2bc16b61fcf2425190"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3