network/tor: Updated for version 0.2.2.33.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

5 files changed, 30 insertions, 15 deletions

diff --git a/network/tor/doinst.sh b/network/tor/doinst.sh
index 741db0277f..58bece12c8 100644
--- a/network/tor/doinst.sh
+++ b/network/tor/doinst.sh
@@ -10,6 +10,7 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
+
 preserve_perms() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -25,3 +26,4 @@ preserve_perms etc/rc.d/rc.tor.new
 config etc/tor/tor-tsocks.conf.new
 config etc/tor/torrc.new
 config etc/logrotate.d/tor.new
+
diff --git a/network/tor/logrotate.tor b/network/tor/logrotate.tor
index 4311d5f2df..7b1f8d6d8b 100644
--- a/network/tor/logrotate.tor
+++ b/network/tor/logrotate.tor
@@ -11,3 +11,4 @@
     /etc/rc.d/rc.tor reload > /dev/null
   endscript
 }
+
diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild
index 09ccf26c69..94d8beaada 100644
--- a/network/tor/tor.SlackBuild
+++ b/network/tor/tor.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tor
-VERSION=0.2.2.32
+VERSION=0.2.2.33
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -97,7 +97,6 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-tor-user=$TOR_USER \
   --with-tor-group=$TOR_GROUP \
   --build=$ARCH-slackware-linux
@@ -118,7 +117,7 @@ mv $PKG/etc/tor/tor-tsocks.conf $PKG/etc/tor/tor-tsocks.conf.new
 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
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/spec
 cp -a ChangeLog INSTALL LICENSE README ReleaseNotes \
       $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/tor/tor.info b/network/tor/tor.info
index 1a45db7591..dd9d604322 100644
--- a/network/tor/tor.info
+++ b/network/tor/tor.info
@@ -1,10 +1,10 @@
 PRGNAM="tor"
-VERSION="0.2.2.32"
+VERSION="0.2.2.33"
 HOMEPAGE="https://www.torproject.org/"
-DOWNLOAD="https://www.torproject.org/dist/tor-0.2.2.32.tar.gz"
-MD5SUM="6d70db8da9513453d520168e017a272c"
+DOWNLOAD="https://www.torproject.org/dist/tor-0.2.2.33.tar.gz"
+MD5SUM="ea99aba49694bb982d2fccc57a70d58e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
-APPROVED="rworkman"
+APPROVED="rworkman,Erik Hanson"
diff --git a/network/tor/torrc b/network/tor/torrc
index 577d169a3c..83d5bf22b4 100644
--- a/network/tor/torrc
+++ b/network/tor/torrc
@@ -1,5 +1,5 @@
 ## Configuration file for a typical Tor user
-## Last updated 12 April 2009 for Tor 0.2.1.14-rc.
+## Last updated 16 July 2009 for Tor 0.2.2.1-alpha.
 ## (May or may not work for much older or much newer versions of Tor.)
 ##
 ## Lines that begin with "## " try to explain what's going on. Lines
@@ -35,10 +35,9 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
 ## We advise using "notice" in most cases, since anything more verbose
 ## may provide sensitive information to an attacker who obtains the logs.
 ##
+
 ## Send all messages of level 'notice' or higher to /var/log/tor/tor.log
 Log notice file /var/log/tor/tor.log
-## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
-#Log notice file /var/log/tor/notices.log
 ## Send every possible message to /var/log/tor/debug.log
 #Log debug file /var/log/tor/debug.log
 ## Use the system log instead of Tor's logfiles
@@ -107,9 +106,22 @@ PidFile /var/run/tor/tor.pid
 
 ## Define these to limit how much relayed traffic you will allow. Your
 ## own traffic is still unthrottled. Note that RelayBandwidthRate must
-## be at least 20 KBytes.
-#RelayBandwidthRate 100 KBytes  # Throttle traffic to 100KB/s (800Kbps)
-#RelayBandwidthBurst 200 KBytes # But allow bursts up to 200KB/s (1600Kbps)
+## be at least 20 KB.
+#RelayBandwidthRate 100 KB  # Throttle traffic to 100KB/s (800Kbps)
+#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps)
+
+## Use these to restrict the maximum traffic per day, week, or month.
+## Note that this threshold applies to sent _and_ to received bytes,
+## not to their sum: Setting "4 GB" may allow up to 8 GB
+## total before hibernating.
+##
+## Set a maximum of 4 gigabytes each way per period.
+#AccountingMax 4 GB
+## Each period starts daily at midnight (AccountingMax is per day)
+#AccountingStart day 00:00
+## Each period starts on the 3rd of the month at 15:00 (AccountingMax
+## is per month)
+#AccountingStart month 3 15:00
 
 ## Contact info to be published in the directory, so we can contact you
 ## if your relay is misconfigured or something else goes wrong. Google
@@ -128,8 +140,9 @@ PidFile /var/run/tor/tor.pid
 #DirListenAddress 0.0.0.0:9091
 ## Uncomment to return an arbitrary blob of html on your DirPort. Now you
 ## can explain what Tor is if anybody wonders why your IP address is
-## contacting them. See contrib/tor-exit-notice.html for a sample.
-#DirPortFrontPage /etc/tor/exit-notice.html
+## contacting them. See contrib/tor-exit-notice.html in Tor's source
+## distribution for a sample.
+#DirPortFrontPage /etc/tor/tor-exit-notice.html
 
 ## Uncomment this if you run more than one Tor relay, and add the identity
 ## key fingerprint of each Tor relay you control, even if they're on