6 files changed, 51 insertions, 18 deletions
diff --git a/network/tor/README b/network/tor/README
index 9e88ce90ed..3ec67d2c87 100644
--- a/network/tor/README
+++ b/network/tor/README
@@ -13,15 +13,6 @@ The recommended UID/GID is 220. You can create these like so:
 You can pass another user/group to the script; this is however, less safe:
   TOR_USER=nobody TOR_GROUP=nogroup sh tor.SlackBuild
 
-The following can be used to start/stop tor automatically:
-/etc/rc.d/rc.local
- if [ -x /etc/rc.d/rc.tor ]; then
-   /etc/rc.d/rc.tor start
- fi
-
-/etc/rc.d/rc.local_shutdown
- if [ -x /etc/rc.d/rc.tor ]; then
-   /etc/rc.d/rc.tor stop
- fi
+See README.SLACKWARE for how to start tor on boot.
 
 Tor requires libevent.
diff --git a/network/tor/README.SLACKWARE b/network/tor/README.SLACKWARE
new file mode 100644
index 0000000000..9e88ce90ed
--- /dev/null
+++ b/network/tor/README.SLACKWARE
@@ -0,0 +1,27 @@
+Tor is a toolset for a wide range of organizations and people that want
+to improve their safety and security on the Internet. Using Tor can help
+you anonymize web browsing and publishing, instant messaging, IRC,
+SSH, and other applications that use the TCP protocol. Tor also
+provides a platform on which software developers can build new
+applications with built-in anonymity, safety, and privacy features.
+
+This script requires a 'tor' user/group to exist before running.
+The recommended UID/GID is 220. You can create these like so:
+  groupadd -g 220 tor
+  useradd -u 220 -g 220 -c "The Onion Router" -d /dev/null -s /bin/false tor
+
+You can pass another user/group to the script; this is however, less safe:
+  TOR_USER=nobody TOR_GROUP=nogroup sh tor.SlackBuild
+
+The following can be used to start/stop tor automatically:
+/etc/rc.d/rc.local
+ if [ -x /etc/rc.d/rc.tor ]; then
+   /etc/rc.d/rc.tor start
+ fi
+
+/etc/rc.d/rc.local_shutdown
+ if [ -x /etc/rc.d/rc.tor ]; then
+   /etc/rc.d/rc.tor stop
+ fi
+
+Tor requires libevent.
diff --git a/network/tor/doinst.sh b/network/tor/doinst.sh
index 6e645431c8..58bece12c8 100644
--- a/network/tor/doinst.sh
+++ b/network/tor/doinst.sh
@@ -25,4 +25,5 @@ preserve_perms() {
 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
new file mode 100644
index 0000000000..7b1f8d6d8b
--- /dev/null
+++ b/network/tor/logrotate.tor
@@ -0,0 +1,14 @@
+/var/log/tor/*log {
+  daily
+  rotate 5
+  compress
+  delaycompress
+  missingok
+  notifempty
+  create 0644 tor tor
+  sharedscripts
+  postrotate
+    /etc/rc.d/rc.tor reload > /dev/null
+  endscript
+}
+
diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild
index 26189716ed..1d9a8cc5db 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.1.25
+VERSION=0.2.1.26
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -110,13 +110,12 @@ 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/torctl $PKG/usr/bin/torctl
+install -D -m 0644 $CWD/logrotate.tor $PKG/etc/logrotate.d/tor.new
 mv $PKG/etc/tor/torrc.sample $PKG/etc/tor/torrc.new
 mv $PKG/etc/tor/tor-tsocks.conf $PKG/etc/tor/tor-tsocks.conf.new
 
-( 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
-)
+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 AUTHORS ChangeLog INSTALL LICENSE README ReleaseNotes \
@@ -124,6 +123,7 @@ cp -a AUTHORS ChangeLog INSTALL LICENSE README ReleaseNotes \
 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
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/tor/tor.info b/network/tor/tor.info
index 4ed6854cb7..97193ff24f 100644
--- a/network/tor/tor.info
+++ b/network/tor/tor.info
@@ -1,8 +1,8 @@
 PRGNAM="tor"
-VERSION="0.2.1.25"
+VERSION="0.2.1.26"
 HOMEPAGE="https://www.torproject.org/"
-DOWNLOAD="https://www.torproject.org/dist/tor-0.2.1.25.tar.gz"
-MD5SUM="f58540b3c5835ac4f5de1b02bbddc703"
+DOWNLOAD="https://www.torproject.org/dist/tor-0.2.1.26.tar.gz"
+MD5SUM="f7b30a144e1da41aa43f496bd47ffba7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Marco Bonetti"