diff options
| -rw-r--r-- | network/tor/rc.tor | 3 | ||||
| -rw-r--r-- | network/tor/tor.SlackBuild | 41 | ||||
| -rw-r--r-- | network/tor/tor.info | 8 |
3 files changed, 23 insertions, 29 deletions
diff --git a/network/tor/rc.tor b/network/tor/rc.tor index 5c2d99eb0a..d7ef906aae 100644 --- a/network/tor/rc.tor +++ b/network/tor/rc.tor @@ -1,4 +1,5 @@ -#!/bin/bash + +#!/bin/sh PIDFILE="/var/lib/tor/tor.pid" diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild index 8be9c6471c..576351449f 100644 --- a/network/tor/tor.SlackBuild +++ b/network/tor/tor.SlackBuild @@ -3,13 +3,14 @@ # Slackware build script for tor # Written by Erik Hanson erik@slackbuilds.org -# Modified by the SlackBuilds.org project +set -eu PRGNAM=tor -VERSION=0.1.2.14 +VERSION=0.2.0.32 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -19,14 +20,16 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -35,30 +38,20 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - || exit 1 + --mandir=/usr/man -make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 +make +make install-strip DESTDIR=$PKG -if [ -d $PKG/usr/man ]; then -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) -fi +gzip -9 $PKG/usr/man/man?/*.? -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS LICENSE README doc/* $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/spec +cp -a AUTHORS ChangeLog INSTALL LICENSE README ReleaseNotes \ + $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/spec/*txt $PKG/usr/doc/$PRGNAM-$VERSION/spec +cp -a doc/website $PKG/usr/doc/$PRGNAM-$VERSION/html cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Remove doc/ cruft -( cd $PKG/usr/doc - find . -name Makefile* -exec rm {} \; - find . -name *.1 -exec rm {} \; - find . -name *.in -exec rm {} \; -) - mkdir -p $PKG/install $PKG/etc/rc.d cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/network/tor/tor.info b/network/tor/tor.info index 2a61c8956f..eace537475 100644 --- a/network/tor/tor.info +++ b/network/tor/tor.info @@ -1,8 +1,8 @@ PRGNAM="tor" -VERSION="0.1.2.14" +VERSION="0.2.0.32" HOMEPAGE="http://tor.eff.org/" -DOWNLOAD="http://tor.eff.org/dist/tor-0.1.2.14.tar.gz" -MD5SUM="dc93a52f9c12ec7fe73b3905a28f09ec" +DOWNLOAD="http://www.torproject.org/dist/tor-0.2.0.32.tar.gz" +MD5SUM="fd55489f7ad1ef53c0b0dac857696fc9" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" -APPROVED="rworkman" +APPROVED="dsomero"
\ No newline at end of file |