summaryrefslogtreecommitdiffstats
path: root/network/tor/tor.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'network/tor/tor.SlackBuild')
-rw-r--r--network/tor/tor.SlackBuild26
1 files changed, 20 insertions, 6 deletions
diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild
index 74df585827..156451c169 100644
--- a/network/tor/tor.SlackBuild
+++ b/network/tor/tor.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Slackware build script for tor
#
@@ -24,11 +24,15 @@
# Updated by Donald Cooley dfc@warpmail.net
# Updated by Fernando Lopez Jr. fernando.lopezjr@gmail.com
+# Updated by Markus Reichelt slackbuilds@mareichelt.de
+
+cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=tor
-VERSION=${VERSION:-0.4.1.6}
+VERSION=${VERSION:-0.4.8.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
# Select tor's default user/group
TOR_USER=${TOR_USER:-tor}
@@ -44,7 +48,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -97,6 +108,7 @@ find -L . \
CFLAGS="$SLKCFLAGS" \
./configure \
+ --disable-module-dirauth \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -115,7 +127,9 @@ mkdir -p $PKG/var/{run,log,lib}/tor
chown $TOR_USER:$TOR_GROUP $PKG/var/{run,log,lib}/tor
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/dist/torctl $PKG/usr/bin/torctl
+# this has been removed in tor-0.4.2.5, uncomment if you need this
+# in earlier Tor versions
+#install -D -m 0755 contrib/dist/torctl $PKG/usr/bin/torctl
install -D -m 0644 $CWD/torrc $PKG/etc/tor/torrc.new
mkdir -p $PKG/etc/logrotate.d
sed -e "s,@USER@,$TOR_USER," -e "s,@GROUP@,$TOR_GROUP," $CWD/logrotate.tor \
@@ -125,7 +139,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/spec
-cp -a ChangeLog INSTALL LICENSE README ReleaseNotes \
+cp -a ChangeLog INSTALL LICENSE README.md ReleaseNotes \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
@@ -135,4 +149,4 @@ 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.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE