[gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     e6c9f5e84a2bc5e7b70f3a1618fecde5fd7b84f5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 04:39:27 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 04:39:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=e6c9f5e8

net-misc/tor: cleaned out $FILESDIR

(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-misc/tor/Manifest                           |   13 ++----
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch |   28 -----------
 net-misc/tor/files/tor.conf                     |    3 -
 net-misc/tor/files/tor.initd-r4                 |   57 -----------------------
 net-misc/tor/files/torrc                        |    5 --
 net-misc/tor/files/torrc.sample-0.1.2.6.patch   |   30 ------------
 6 files changed, 4 insertions(+), 132 deletions(-)

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 0edaced..b681ef5 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,17 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
-AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
-AUX tor.initd-r4 1566 RMD160 410611175c20425f48d340216ef680650bf6fa3d SHA1 dbdfd68db76871be8606d1196c0c2a7ba257aac0 SHA256 095334e62ee28d3346f84831015dc9c45f7224d8a6f3588974de7b26352e2824
-AUX torrc 119 RMD160 3b7ec5a87893d371b2659bb49ac77cf3deff0f38 SHA1 c573f42578261ccc7b223261d5083cdff5afe095 SHA256 97a80a09bb3d615b93947f0d1a9c1883ef340860e89b879f2247d61b1c2476f0
-AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 MISC ChangeLog 34372 RMD160 11aaa4dbd583897de1f340e6951341b5e48e3fb1 SHA1 e14eae16b8fc3d5e84b7f97379864ebbe889dfd5 SHA256 21cae52b2a4a3145ba4a8e686d3f355d2cb314bc9c21d7d32a2b428c954321ce
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2OjmoACgkQl5yvQNBFVTXPWwCeP72/b7kUZKmlqX8nqktl3TxX
-8ycAnRrvD4F1uSbEB2dlip1aRNecH5si
-=1HMv
+iEYEAREIAAYFAk2Ov38ACgkQl5yvQNBFVTUR/wCeONEx6MPatL1dSEU1A0LqhDZB
+UUAAniFVVjpkfOy5oe6LUCOPHg3f9Efp
+=cNxY
 -----END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor-0.2.1.19-logrotate.patch b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
deleted file mode 100644
index 3eadcaa..0000000
--- a/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-* Change log dir from /var/lib/log to /var/log (#281439, Martin von Gagern)
-* Change user and group name from _tor to tor (#281439, Martin von Gagern)
-* Avoid error if tor is not running (#178975, Gustavo Felisberto)
-
-References:
-http://bugs.gentoo.org/281439
-http://bugs.gentoo.org/178975
-
---- tor-0.2.1.19/contrib/tor.logrotate.in
-+++ tor-0.2.1.19/contrib/tor.logrotate.in
-@@ -1,4 +1,4 @@
--@LOCALSTATEDIR@/log/tor/*log {
-+/var/log/tor/*.log {
- 	daily
- 	rotate 5
- 	compress
-@@ -6,9 +6,9 @@
- 	missingok
- 	notifempty
- 	# you may need to change the username/groupname below
--	create 0640 _tor _tor
-+	create 0640 tor tor
- 	sharedscripts
- 	postrotate
--		/etc/init.d/tor reload > /dev/null
-+		/etc/init.d/tor reload > /dev/null || true
- 	endscript
- }

diff --git a/net-misc/tor/files/tor.conf b/net-misc/tor/files/tor.conf
deleted file mode 100644
index 4e4c639..0000000
--- a/net-misc/tor/files/tor.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-tor           hard    nofile          30000
-tor           soft    nofile          30000
-

diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4
deleted file mode 100644
index c95ef19..0000000
--- a/net-misc/tor/files/tor.initd-r4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.5 2009/09/07 11:23:31 fauli Exp $
-
-opts="${opts} checkconfig reload"
-PIDFILE=/var/run/tor/tor.pid
-CONFFILE=/etc/tor/torrc
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f ${CONFFILE} ] ; then
-                eerror "You need to setup ${CONFFILE} first"
-                eerror "Example is in ${CONFFILE}.sample"
-                return 1
-	fi
-
-	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1
-	if [ $? -eq 0 ] ; then
-		einfo "Tor configuration (${CONFFILE}) is valid."
-		return 0
-	else
-		eerror "Tor configuration (${CONFFILE}) not valid."
-		/usr/bin/tor --verify-config -f ${CONFFILE}
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-        ebegin "Starting Tor"
-        HOME=/var/lib/tor
-	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Tor"
-	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
-        eend $?
-}
-
-reload() {
-	if [ ! -f ${PIDFILE} ]; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading Tor configuration"
-	start-stop-daemon --stop --oknodo --signal HUP --pidfile ${PIDFILE}
-	eend $?
-}

diff --git a/net-misc/tor/files/torrc b/net-misc/tor/files/torrc
deleted file mode 100644
index 640fea1..0000000
--- a/net-misc/tor/files/torrc
+++ /dev/null
@@ -1,5 +0,0 @@
-User tor
-Group tor
-PIDFile /var/run/tor/tor.pid
-Log notice file /var/log/tor/tor.log
-DataDirectory   /var/lib/tor/data

diff --git a/net-misc/tor/files/torrc.sample-0.1.2.6.patch b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
deleted file mode 100644
index 7317552..0000000
--- a/net-misc/tor/files/torrc.sample-0.1.2.6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/config/torrc.sample.in.orig	2007-01-27 23:41:23.000000000 +0000
-+++ src/config/torrc.sample.in	2007-01-27 23:43:47.000000000 +0000
-@@ -18,6 +18,11 @@
- ## With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
- ## /Library/Tor/torrc
- 
-+## Default username and group the server will run as
-+User tor
-+Group tor
-+
-+PIDFile /var/run/tor/tor.pid
- 
- ## Replace this with "SocksPort 0" if you plan to run Tor only as a
- ## server, and not make any local application connections yourself.
-@@ -46,6 +51,7 @@
- #Log notice syslog
- ## To send all messages to stderr:
- #Log debug stderr
-+Log notice file /var/log/tor/tor.log
- 
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line. This is ignored on Windows;
-@@ -55,6 +61,7 @@
- ## The directory for keeping all the keys/etc. By default, we store
- ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
- #DataDirectory @LOCALSTATEDIR@/lib/tor
-+DataDirectory   /var/lib/tor/data
- 
- ## The port on which Tor will listen for local connections from Tor
- ## controller applications, as documented in control-spec.txt.