summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja[at]gmail[dot]com>2010-05-13 00:38:39 +0200
committerErik Hanson <erik@slackbuilds.org>2010-05-13 00:38:39 +0200
commit129a97d8ac99e31746a209ecbda7726b67959fae (patch)
tree79d4adfbeb0f7f64d20e38d129fe95f3f4737f31
parent353e8e538df83a2b06fe61729340d46d4245f82d (diff)
downloadslackbuilds-129a97d8ac99e31746a209ecbda7726b67959fae.tar.gz
network/vidalia: Updated for version 0.1.15
-rw-r--r--network/vidalia/README13
-rw-r--r--network/vidalia/README.SBo9
-rw-r--r--network/vidalia/doinst.sh6
-rw-r--r--network/vidalia/slack-desc5
-rw-r--r--network/vidalia/vidalia.SlackBuild28
-rw-r--r--network/vidalia/vidalia.info10
6 files changed, 42 insertions, 29 deletions
diff --git a/network/vidalia/README b/network/vidalia/README
index 92cd8a0da1..4af9ba4ba8 100644
--- a/network/vidalia/README
+++ b/network/vidalia/README
@@ -1,9 +1,10 @@
-Vidalia is a GUI for the Tor software. Using Vidalia, you can start and stop
-the Tor software, view its status at a glance, and monitor bandwidth usage.
-Vidalia also makes it easy to contribute to the Tor network by helping you
-set up and manage your own relay.
+Vidalia is a GUI for the Tor software. Using Vidalia,
+you can start and stop the Tor software, view its status
+at a glance, and monitor bandwidth usage. Vidalia also
+makes it easy to contribute to the Tor network by helping
+you set up and manage your own relay.
-This requires qt4 and tor (both available at SlackBuilds.org).
+Vidalia requires tor.
See README.SBo (which is also installed with the package documentation)
-for some configuration hints.
+for some configuration hints
diff --git a/network/vidalia/README.SBo b/network/vidalia/README.SBo
index 65a432b73e..0ae5cabbbe 100644
--- a/network/vidalia/README.SBo
+++ b/network/vidalia/README.SBo
@@ -1,18 +1,17 @@
vidalia README.SBo
Once vidalia is installed then edit the ~/.vidalia/torrc file.
-Add the following to torrc or use the torrc file from /etc/tor/torrc.
+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
# Force Tor to consider whether to build a new circuit every NUM seconds.
NewCircuitPeriod 15
-# Set How many entry guards we should we keep at a time.
+# Set How many entry guards we should we keep at a time
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
+and use the FoxyProxy's Tor Wizard. For extra anonimity in Firefox then try
Torbutton extension and Privoxy.
diff --git a/network/vidalia/doinst.sh b/network/vidalia/doinst.sh
index 4e8ba7071d..1f8ff67ded 100644
--- a/network/vidalia/doinst.sh
+++ b/network/vidalia/doinst.sh
@@ -2,3 +2,9 @@ if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
+
diff --git a/network/vidalia/slack-desc b/network/vidalia/slack-desc
index d584eb377d..58a35ae83c 100644
--- a/network/vidalia/slack-desc
+++ b/network/vidalia/slack-desc
@@ -14,7 +14,4 @@ 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:
-vidalia:
-
+vidalia: \ No newline at end of file
diff --git a/network/vidalia/vidalia.SlackBuild b/network/vidalia/vidalia.SlackBuild
index fdf599d3ee..c2584d8825 100644
--- a/network/vidalia/vidalia.SlackBuild
+++ b/network/vidalia/vidalia.SlackBuild
@@ -5,7 +5,7 @@
# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
PRGNAM=vidalia
-VERSION=${VERSION:-0.1.13}
+VERSION=${VERSION:-0.1.15}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -42,12 +42,20 @@ find . \
-exec chmod 644 {} \;
mkdir build && cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release ..
- make
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DCMAKE_SKIP_RPATH:BOOL=YES \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_BUILD_TYPE=Release ..
+
+ # Remove -O3 flag.
+ for i in $(find . -name "flags.make"); do
+ sed -i 's|-O3 ||g' $i
+ done
+
+ make VERBOSE=1
make install DESTDIR=$PKG
cd -
@@ -64,14 +72,14 @@ gzip -9c doc/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
CHANGELOG CREDITS HACKING INSTALL LICENSE* README doc/TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/vidalia/vidalia.info b/network/vidalia/vidalia.info
index e40b3761e0..25a85484d8 100644
--- a/network/vidalia/vidalia.info
+++ b/network/vidalia/vidalia.info
@@ -1,8 +1,10 @@
PRGNAM="vidalia"
-VERSION="0.1.13"
+VERSION="0.1.15"
HOMEPAGE="http://vidalia-project.net/"
-DOWNLOAD="http://www.torproject.org/vidalia/dist/vidalia-0.1.13.tar.gz"
-MD5SUM="b0fcd0a9c30b1ed545981fa7d8ac7d71"
+DOWNLOAD="http://archive.torproject.org/tor-package-archive/vidalia/vidalia-0.1.15.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="005afad126dc6142d7748ec185d9fafe"
+MD5SUM_x86_64=""
MAINTAINER="Larry Hajali"
EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"