network/vidalia: Updated for version 0.2.12.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

5 files changed, 37 insertions, 18 deletions

diff --git a/network/vidalia/README b/network/vidalia/README
index 1d29f96f7f627..66dbc22a9a890 100644
--- a/network/vidalia/README
+++ b/network/vidalia/README
@@ -4,6 +4,9 @@ Vidalia also makes it easy to contribute to the Tor network by helping you
 set up and manage your own relay.
 
 See README.SBo (which is also installed with the package docs) for some 
-configuration hints.
+configuration hints, and how to make use of MaxMind's GeoIP database.
 
-Vidalia requires tor.
+If you don't plan to use MaxMind's GeoIP database, pass GEOIP=no to the
+script.
+
+Vidalia requires tor (and GeoIP).
diff --git a/network/vidalia/README.SBo b/network/vidalia/README.SBo
index 0ae5cabbbeff8..73d7a6d58a2b2 100644
--- a/network/vidalia/README.SBo
+++ b/network/vidalia/README.SBo
@@ -3,7 +3,8 @@ vidalia README.SBo
 Once vidalia is installed then edit the ~/.vidalia/torrc file.
 Add the following to torrc or use a the torrc file from /etc/tor/torrc.
 
-# Set the Tor Circuit Build time to find faster tor servers, increments of seconds
+# Set the Tor Circuit Build time to find faster tor servers, increments
+# of seconds
 CircuitBuildTimeout 2
 # connections while Tor is not in use.
 KeepalivePeriod 60
@@ -13,5 +14,14 @@ NewCircuitPeriod 15
 NumEntryGuards 8
 
 To use vidalia and tor with Firefox then add the FoxyProxy extension
-and use the FoxyProxy's Tor Wizard.  For extra anonimity in Firefox then try
-Torbutton extension and Privoxy.
+and use the FoxyProxy's Tor Wizard.  For extra anonimity in Firefox then
+try Torbutton extension and Privoxy.
+
+As of version 0.2.10 vidalia supports the local GeoIP database from
+MaxMind. If the package hasn't been built with GEOIP=no, edit your
+vidalia.conf to enable using the database via the
+"UseLocalGeoIpDatabase" and "LocalGeoIpDatabase" options. For example:
+
+[General]
+UseLocalGeoIpDatabase=true
+LocalGeoIpDatabase=/var/lib/GeoIP/GeoIP.dat
diff --git a/network/vidalia/slack-desc b/network/vidalia/slack-desc
index 7d35aac98bfe5..ccd4c1ae1ae5d 100644
--- a/network/vidalia/slack-desc
+++ b/network/vidalia/slack-desc
@@ -7,13 +7,13 @@
 
        |-----handy-ruler------------------------------------------------------|
 vidalia: vidalia (Gui frontend for tor)
-vidalia: 
+vidalia:
 vidalia: Using Vidalia, you can start and stop the Tor software, view its
 vidalia: status at a glance, and monitor bandwidth usage. Vidalia also makes
 vidalia: it easy to contribute to the Tor network by helping you set up and
 vidalia: manage your own relay.
-vidalia: 
-vidalia: Homepage: http://vidalia-project.net/
+vidalia:
+vidalia: Homepage: https://www.torproject.org/projects/vidalia.html.en
 vidalia:
 vidalia:
 vidalia:
diff --git a/network/vidalia/vidalia.SlackBuild b/network/vidalia/vidalia.SlackBuild
index 75366c3cbc37a..d32e341a06f00 100644
--- a/network/vidalia/vidalia.SlackBuild
+++ b/network/vidalia/vidalia.SlackBuild
@@ -3,19 +3,18 @@
 # Slackware build script for vidalia
 
 # Originally written by Larry Hajali <larryhaja[at]gmail[dot]com>
-# Maintained by markus reichelt <slackbuilds@mareichelt.de> 0xCCEEF115
+# Adapted and now maintained by
+# markus reichelt <slackbuilds@mareichelt.de> 0xCCEEF115
 
 PRGNAM=vidalia
-VERSION=${VERSION:-0.2.10}
+VERSION=${VERSION:-0.2.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -54,10 +53,17 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ "$GEOIP" = "no" ]; then
+   GEOIP=""
+else
+   GEOIP="-DUSE_GEOIP=1 \
+          -DGEOIP_INCLUDE_DIR=/usr/include/"
+fi
+
 mkdir build && cd build
   cmake \
+    $GEOIP \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_SKIP_RPATH:BOOL=YES \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/network/vidalia/vidalia.info b/network/vidalia/vidalia.info
index 00f5d7323fdd3..c62ce901a6ed6 100644
--- a/network/vidalia/vidalia.info
+++ b/network/vidalia/vidalia.info
@@ -1,10 +1,10 @@
 PRGNAM="vidalia"
-VERSION="0.2.10"
-HOMEPAGE="http://vidalia-project.net/"
-DOWNLOAD="http://archive.torproject.org/tor-package-archive/vidalia/vidalia-0.2.10.tar.gz"
-MD5SUM="ae5a46cc362e2db54f8751ccc9becaba"
+VERSION="0.2.12"
+HOMEPAGE="https://www.torproject.org/projects/vidalia.html.en"
+DOWNLOAD="https://archive.torproject.org/tor-package-archive/vidalia/vidalia-0.2.12.tar.gz"
+MD5SUM="f1e108af87676980ff821c36ce8d87e2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="markus reichelt"
 EMAIL="slackbuilds@mareichelt.de"
-APPROVED="Erik Hanson"
+APPROVED="Erik Hanson,Niels Horn"