summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/tor/README6
-rw-r--r--network/tor/README.SLACKWARE2
-rw-r--r--network/tor/tor.SlackBuild4
-rw-r--r--network/tor/tor.info6
4 files changed, 11 insertions, 7 deletions
diff --git a/network/tor/README b/network/tor/README
index d73622c719..28a799da09 100644
--- a/network/tor/README
+++ b/network/tor/README
@@ -24,8 +24,10 @@ The following can be used to start/stop tor automatically:
/etc/rc.d/rc.tor stop
fi
-tsocks is an optional run-time dependency if you want to use the "torify"
-shell script.
+torsocks is an optional dependency. See README.SLACKWARE for more
+information.
+nacl is an optional dependency and may provide faster performance on 32-bit
+systems.
Take a look at README.SLACKWARE for important notes and read also very
carefully the essential hints that tor developers give you
diff --git a/network/tor/README.SLACKWARE b/network/tor/README.SLACKWARE
index 8d7de75618..c57309d816 100644
--- a/network/tor/README.SLACKWARE
+++ b/network/tor/README.SLACKWARE
@@ -1,3 +1,5 @@
+The tor-tsocks.conf is no longer distributed or installed.
+The tor project recommends that tsocks users use torsocks instead.
As of tor-0.2.1.30-2 and later, rc.tor init script has been updated to get rid
of hardcoded values present inside torctl command script. To successfully use
the newer script be sure to check changes to both /etc/rc.d/rc.tor.new and
diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild
index 1e89af9525..fa9cdd4306 100644
--- a/network/tor/tor.SlackBuild
+++ b/network/tor/tor.SlackBuild
@@ -25,7 +25,7 @@
# Updated by Donald Cooley dfc@warpmail.net
PRGNAM=tor
-VERSION=${VERSION:-0.2.3.25}
+VERSION=${VERSION:-0.2.4.20}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -103,6 +103,7 @@ CFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--with-tor-user=$TOR_USER \
--with-tor-group=$TOR_GROUP \
+ --enable-openbsd-malloc \
--build=$ARCH-slackware-linux
make
@@ -115,7 +116,6 @@ chmod 0700 $PKG/var/lib/tor
install -D -m 0755 $CWD/rc.tor $PKG/etc/rc.d/rc.tor.new
install -D -m 0755 contrib/torctl $PKG/usr/bin/torctl
install -D -m 0644 $CWD/torrc $PKG/etc/tor/torrc.new
-mv $PKG/etc/tor/tor-tsocks.conf $PKG/etc/tor/tor-tsocks.conf.new
mkdir -p $PKG/etc/logrotate.d
sed -e "s,@USER@,$TOR_USER," -e "s,@GROUP@,$TOR_GROUP," $CWD/logrotate.tor \
> $PKG/etc/logrotate.d/tor.new
diff --git a/network/tor/tor.info b/network/tor/tor.info
index 1a17c891d3..0546e3bff6 100644
--- a/network/tor/tor.info
+++ b/network/tor/tor.info
@@ -1,8 +1,8 @@
PRGNAM="tor"
-VERSION="0.2.3.25"
+VERSION="0.2.4.20"
HOMEPAGE="https://www.torproject.org/"
-DOWNLOAD="https://www.torproject.org/dist/tor-0.2.3.25.tar.gz"
-MD5SUM="a1c364189a9a66ed9daa8e6436489daf"
+DOWNLOAD="https://www.torproject.org/dist/tor-0.2.4.20.tar.gz"
+MD5SUM="a8cd8e3b3a3f6a7770f2c22d280f19b8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="%README%"