From fde5c82ec08e8aec67df3e329373b24c8c2f8b86 Mon Sep 17 00:00:00 2001
From: David Woodfall <dave@dawoodfall.net>
Date: Fri, 27 Oct 2017 16:38:59 +0700
Subject: system/goaccess: Updated for version 1.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/goaccess/README              | 31 ++++++++++++++++++++++++++-----
 system/goaccess/goaccess.SlackBuild | 13 +++++++++++--
 system/goaccess/goaccess.info       |  8 ++++----
 system/goaccess/slack-desc          |  2 +-
 4 files changed, 42 insertions(+), 12 deletions(-)

(limited to 'system/goaccess')

diff --git a/system/goaccess/README b/system/goaccess/README
index 2355b7d4181d..563151d147ec 100644
--- a/system/goaccess/README
+++ b/system/goaccess/README
@@ -1,7 +1,28 @@
-goaccess is an open source real-time Apache log analyzer and 
-interactive viewer that runs in a terminal in *nix systems. 
-It provides fast and valuable HTTP statistics for system 
+Goaccess is an open source real-time Apache log analyzer 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.
 
-If you wish to add GeoIP support, please pass the GEOIP=yes
-to the script, GEOIP=yes ./goaccess.SlackBuild
+Optional:
+
+GeoIP:
+
+Goaccess now 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
+
+At the moment, mmdb is not on slackbuilds.org.
+
+TokyoCabinet:
+
+Goaccess supports Tokyo Cabinet and Tokyo Cabinet's on-disk B+ Tree
+database.
+
+The options are:
+
+TCB=memhash ./goaccess.SlackBuild
+TCB=btree ./goaccess.SlackBuild
diff --git a/system/goaccess/goaccess.SlackBuild b/system/goaccess/goaccess.SlackBuild
index c6d7b4c84274..3cae1efd32a0 100644
--- a/system/goaccess/goaccess.SlackBuild
+++ b/system/goaccess/goaccess.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=goaccess
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,7 +54,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-geoip=""    ; [ "${GEOIP:-no}" != "no" ]         && geoip="--enable-geoip"
+if [ -n "$GEOIP" ]; then
+    geoip="--enable-geoip=$GEOIP"
+fi
+
+if [ -n "$TCB" ]; then
+    tcb="--enable-tcb=$TCB"
+fi
 
 set -e
 
@@ -80,9 +86,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --infodir=/usr/info \
+  --with-getline \
+  --with-openssl \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-utf8 \
   $geoip \
+  $tcb \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/system/goaccess/goaccess.info b/system/goaccess/goaccess.info
index 0069ee5d13e1..4be37913ed8d 100644
--- a/system/goaccess/goaccess.info
+++ b/system/goaccess/goaccess.info
@@ -1,8 +1,8 @@
 PRGNAM="goaccess"
-VERSION="0.9.4"
-HOMEPAGE="http://goaccess.prosoftcorp.com/download"
-DOWNLOAD="http://tar.goaccess.io/goaccess-0.9.4.tar.gz"
-MD5SUM="2671796a17d2488f65b657bc39e26de5"
+VERSION="1.2"
+HOMEPAGE="http://goaccess.prosoftcorp.com"
+DOWNLOAD="http://tar.goaccess.io/goaccess-1.2.tar.gz"
+MD5SUM="00f41cf1fb72cfc459984c0fb087333d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/goaccess/slack-desc b/system/goaccess/slack-desc
index 1aa5a8b57161..4cc86b840146 100644
--- a/system/goaccess/slack-desc
+++ b/system/goaccess/slack-desc
@@ -13,7 +13,7 @@ goaccess: interactive viewer that runs in a terminal in *nix systems.
 goaccess: It provides fast and valuable HTTP statistics for system
 goaccess: administrators that require a visual server report on the fly.
 goaccess:
-goaccess: Homepage: http://goaccess.prosoftcorp.com/download
+goaccess: Homepage: http://goaccess.prosoftcorp.com
 goaccess:
 goaccess:
 goaccess:
-- 
cgit v1.2.3