From 38d0fba9dc4d36847718bdd6d0025317cf037ca6 Mon Sep 17 00:00:00 2001
From: markus reichelt
Date: Thu, 14 Jun 2012 16:21:23 -0500
Subject: network/vidalia: Updated for version 0.2.19.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>
---
 network/vidalia/README.SBo         | 35 ++++++++++++++++++++++++-----------
 network/vidalia/vidalia.SlackBuild |  5 +++--
 network/vidalia/vidalia.info       |  8 ++++----
 3 files changed, 31 insertions(+), 17 deletions(-)

(limited to 'network')

diff --git a/network/vidalia/README.SBo b/network/vidalia/README.SBo
index ebfb504e66..da7355b2f0 100644
--- a/network/vidalia/README.SBo
+++ b/network/vidalia/README.SBo
@@ -1,5 +1,26 @@
 Vidalia README.SBo
 
+Please note that upstream states the following:
+
+"You should simply download Vidalia as part of a Tor software bundle. Users
+ should be using Tor Browser Bundle, not installing Vidalia themselves."
+ -- https://www.torproject.org/projects/vidalia.html.en
+
+Obviously, that only concerns folks that do not know what they are doing.
+
+Also, the development of Torbutton has been discontinued in favour of TBB,
+the Tor-Browser-Bundle. It's strongly recommended to stop using Torbutton.
+
+
+New versions of Vidalia used to be announced at:
+ https://blog.torproject.org/category/tags/vidalia-releases
+ https://www.torproject.org/projects/vidalia.html.en
+but both links lag more often than not.
+
+A better place is to simply check https://www.torproject.org/dist/vidalia/ or
+the mirrors listed at: https://www.torproject.org/getinvolved/mirrors.html.en
+
+
 After installing Vidalia consider editing ~/.vidalia/torrc or
 /etc/tor/torrc accordingly:
 
@@ -13,17 +34,9 @@ NewCircuitPeriod 15
 # Set How many entry guards we should we keep at a time
 NumEntryGuards 8
 
-
-To use Vidalia and Tor with Firefox you can use FoxyProxy or Privoxy.
-
-The development of Torbutton has been discontinued in favour of TBB,
-the Tor-Browser-Bundle. It's strongly recommended to stop using Torbutton.
-
-New versions of Vidalia are announced at
-https://blog.torproject.org/category/tags/vidalia-releases
-
-And there is a mailing list for Vidalia users:
-http://lists.vidalia-project.net/cgi-bin/mailman/listinfo/vidalia-users
+In order to use Vidalia and Tor with Firefox you can use FoxyProxy or
+Privoxy. You can also configure Firefox network settings for a SOCKSv5
+proxy; any other browser that supports SOCKSv5 proxies is ok to use too.
 
 
 As of version 0.2.10 vidalia supports the local GeoIP database from
diff --git a/network/vidalia/vidalia.SlackBuild b/network/vidalia/vidalia.SlackBuild
index ea9998fd3e..2ab5aba68e 100644
--- a/network/vidalia/vidalia.SlackBuild
+++ b/network/vidalia/vidalia.SlackBuild
@@ -7,7 +7,7 @@
 # markus reichelt <slackbuilds@mareichelt.de> 0xCCEEF115
 
 PRGNAM=vidalia
-VERSION=${VERSION:-0.2.17}
+VERSION=${VERSION:-0.2.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,7 +57,8 @@ if [ "$GEOIP" = "no" ]; then
    GEOIP=""
 else
    GEOIP="-DUSE_GEOIP=1 \
-          -DGEOIP_INCLUDE_DIR=/usr/include/"
+          -DGEOIP_INCLUDE_DIR=/usr/include/ \
+          -DGEOIP_LIBRARY_DIR=/usr/lib$LIBDIRSUFFIX/"
 fi
 
 mkdir build && cd build
diff --git a/network/vidalia/vidalia.info b/network/vidalia/vidalia.info
index 784aea3096..bdb2f429d6 100644
--- a/network/vidalia/vidalia.info
+++ b/network/vidalia/vidalia.info
@@ -1,10 +1,10 @@
 PRGNAM="vidalia"
-VERSION="0.2.17"
+VERSION="0.2.19"
 HOMEPAGE="https://www.torproject.org/projects/vidalia.html.en"
-DOWNLOAD="https://archive.torproject.org/tor-package-archive/vidalia/vidalia-0.2.17.tar.gz"
-MD5SUM="dcfd49e7f2ff73702e6007091cbe33d6"
+DOWNLOAD="https://archive.torproject.org/tor-package-archive/vidalia/vidalia-0.2.19.tar.gz"
+MD5SUM="caf92b44ad2932bbc1c40d6405951c39"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="markus reichelt"
 EMAIL="slackbuilds@mareichelt.de"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"
-- 
cgit v1.2.3