network/ipv6calc: Updated for version 2.2.0.

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

3 files changed, 25 insertions, 12 deletions

diff --git a/network/ipv6calc/README b/network/ipv6calc/README
index 66599f47b4..4d2658ce8c 100644
--- a/network/ipv6calc/README
+++ b/network/ipv6calc/README
@@ -11,6 +11,7 @@ support for these:
 
   IP2LOCATION=yes  Enable IP2Location support (requires ip2location-c)
   GEOIP=yes        Enable GeoIP support (requires GeoIP)
+  GEOIP2=yes       Enable GeoIP2 support (requires libmaxminddb)
   EXTERNAL=yes     Enable external db support
 
 where each build option is passed to the slackbuild. Example of
diff --git a/network/ipv6calc/ipv6calc.SlackBuild b/network/ipv6calc/ipv6calc.SlackBuild
index a9ea0bf1d5..31fe671993 100644
--- a/network/ipv6calc/ipv6calc.SlackBuild
+++ b/network/ipv6calc/ipv6calc.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2012, 2013  Chris Abela, Malta
 # Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# Copyright 2018  Jason Graham, MD <jgraha8@gmail.com>
+# Copyright 2018-2019  Jason Graham, MD <jgraham@compukix.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ipv6calc
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,10 +71,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-unset ENABLE_IP2LOCATION
-unset ENABLE_GEOIP
-unset ENABLE_EXTERNAL
-unset ENABLE_MOD_IPV6CALC
+ENABLE_IP2LOCATION="--disable-ip2location"
+ENABLE_GEOIP="--disable-geoip"
+ENABLE_GEOIP2="--disable-geoip2"
+ENABLE_EXTERNAL="--disable-external"
+ENABLE_MOD_IPV6CALC="--disable-mod_ipv6calc"
 
 if [ "$IP2LOCATION" = "yes" ]; then
     ENABLE_IP2LOCATION="--enable-ip2location  --with-ip2location-db=/usr/share/IP2Loc"
@@ -84,6 +85,10 @@ if [ "$GEOIP" = "yes" ]; then
     ENABLE_GEOIP="--enable-geoip --with-geoip-db=/usr/share/GeoIP"
 fi
 
+if [ "$GEOIP2" = "yes" ]; then
+    ENABLE_GEOIP2="--enable-mmdb --with-geoip-db=/usr/share/GeoIP"
+fi
+
 if [ "$EXTERNAL" = "yes" ]; then
     ENABLE_EXTERNAL="--enable-external"
 fi
@@ -102,7 +107,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  $ENABLE_IP2LOCATION $ENABLE_GEOIP $ENABLE_EXTERNAL $ENABLE_MOD_IPV6CALC
+  --disable-dbip \
+  --disable-dbip2 \
+  $ENABLE_IP2LOCATION $ENABLE_GEOIP $ENABLE_GEOIP2 $ENABLE_EXTERNAL $ENABLE_MOD_IPV6CALC
 
 make
 make install DESTDIR=$PKG
@@ -115,7 +122,9 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-   CHANGES COPYING CREDITS ChangeLog LICENSE README TODO USAGE VERSION \
+   CHANGES COPYING CREDITS ChangeLog INSTALLING LICENSE README README.DBIP \
+   README.DBIP2 README.External README.GeoIP README.GeoIP2 README.IP2Location \
+   README.MaxMindDB TODO USAGE VERSION \
    doc/ipv6calc.html \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -125,6 +134,9 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 if [ "$MOD_IPV6CALC" = "yes" ]; then
+    mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/mod_ipv6calc
+    cp -a \
+       mod_ipv6calc/README.mod_ipv6calc $PKG/usr/doc/$PRGNAM-$VERSION/mod_ipv6calc
     # Move the ipv6calc.conf to the proper location
     mkdir -p $PKG/etc/httpd
     mv $PKG/etc/{httpd.d,httpd/extra}
diff --git a/network/ipv6calc/ipv6calc.info b/network/ipv6calc/ipv6calc.info
index 576e679891..8413547d34 100644
--- a/network/ipv6calc/ipv6calc.info
+++ b/network/ipv6calc/ipv6calc.info
@@ -1,10 +1,10 @@
 PRGNAM="ipv6calc"
-VERSION="1.0.0"
+VERSION="2.2.0"
 HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-DOWNLOAD="ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/ipv6calc-1.0.0.tar.gz"
-MD5SUM="6eed2e5b8ca07330e044d809ade3b565"
+DOWNLOAD="https://github.com/pbiering/ipv6calc/archive/2.2.0/ipv6calc-2.2.0.tar.gz"
+MD5SUM="828dad0901f04bbb60f70affaa857e20"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"