From ec3ec90337997af4331999df0d9bc13c79aca20e Mon Sep 17 00:00:00 2001
From: Dave Woodfall <dave@slackbuilds.org>
Date: Tue, 12 May 2020 03:42:43 +0100
Subject: [PATCH] system/goaccess: Updated for version 1.3.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/goaccess/README              | 19 ++++++++++---------
 system/goaccess/goaccess.SlackBuild | 21 +++++++++------------
 system/goaccess/goaccess.info       |  8 ++++----
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/system/goaccess/README b/system/goaccess/README
index 563151d147..a21acc4c4a 100644
--- a/system/goaccess/README
+++ b/system/goaccess/README
@@ -1,28 +1,29 @@
-Goaccess is an open source real-time Apache log analyzer and
+Goaccess is an open source real-time Apache log analyser and
 interactive viewer that runs in a terminal in *nix systems.
 It provides fast and valuable HTTP statistics for system
-administrators that require a visual server report on the fly.
+administrators that require a visual server report on the
+fly.
 
 Optional:
 
-GeoIP:
-
-Goaccess now supports two types of GeoIP - legacy and mmdb.
+Goaccess supports two types of GeoIP - legacy and mmdb.
 
 If you want to add GeoIP support, pass either option to the
 slackbuild:
 
 GEOIP=legacy ./goaccess.SlackBuild
-GEOIP=mmdb ./goaccess.SlackBuild
+(Requires GeoIP)
 
-At the moment, mmdb is not on slackbuilds.org.
+GEOIP=mmdb ./goaccess.SlackBuild
+(Requires libmaxminddb)
 
 TokyoCabinet:
 
-Goaccess supports Tokyo Cabinet and Tokyo Cabinet's on-disk B+ Tree
-database.
+Goaccess supports Tokyo Cabinet and Tokyo Cabinet's on-disk
+B+ Tree database.
 
 The options are:
 
 TCB=memhash ./goaccess.SlackBuild
 TCB=btree ./goaccess.SlackBuild
+(Both require tokyocabinet)
diff --git a/system/goaccess/goaccess.SlackBuild b/system/goaccess/goaccess.SlackBuild
index 58d71e0b97..2e83305eba 100644
--- a/system/goaccess/goaccess.SlackBuild
+++ b/system/goaccess/goaccess.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for goaccess
 
-# Copyright David Woodfall <dave@slackbuilds.org>
+# Copyright Dave Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=goaccess
-VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,13 +54,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ -n "$GEOIP" ]; then
-    geoip="--enable-geoip=$GEOIP"
-fi
-
-if [ -n "$TCB" ]; then
-    tcb="--enable-tcb=$TCB"
-fi
+geoip="--enable-geoip=${GEOIP:-no}"
+tcb="--enable-tcb=${TCB:-no}"
 
 set -e
 
@@ -103,10 +98,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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/goaccess.conf $PKG/etc/goaccess.conf.new
+install -D -m644 config/goaccess.conf $PKG/etc/goaccess.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/goaccess/goaccess.info b/system/goaccess/goaccess.info
index dd15d67ac4..c655ce38ef 100644
--- a/system/goaccess/goaccess.info
+++ b/system/goaccess/goaccess.info
@@ -1,10 +1,10 @@
 PRGNAM="goaccess"
-VERSION="1.2"
+VERSION="1.3"
 HOMEPAGE="http://goaccess.prosoftcorp.com"
-DOWNLOAD="http://tar.goaccess.io/goaccess-1.2.tar.gz"
-MD5SUM="00f41cf1fb72cfc459984c0fb087333d"
+DOWNLOAD="http://tar.goaccess.io/goaccess-1.3.tar.gz"
+MD5SUM="5209c5d4e9e04b5b3e7f13134c5e146c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="Dave Woodfall"
 EMAIL="dave@slackbuilds.org"