public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-02-09 23:29 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-02-09 23:29 UTC (permalink / raw
  To: gentoo-commits

commit:     946fd32f60a4aa075c6bff3378e49c259a3cc956
Author:     Anthony G. Basile <basile <AT> opensource <DOT> dyc <DOT> edu>
AuthorDate: Wed Feb  9 23:28:57 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 23:28:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=946fd32f

Added /etc/torrc so that tor starts out of the box.

(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)

---
 net-misc/tor/ChangeLog                          |    9 +++
 net-misc/tor/Manifest                           |    9 ++-
 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 ++++++++
 net-misc/tor/tor-0.2.1.29-r1.ebuild             |   82 +++++++++++++++++++++++
 8 files changed, 222 insertions(+), 1 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 9fc9e24..18bf7c7 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/01/07 23:54:09 fauli Exp $
 
+*tor-0.2.1.29-r1 (09 Feb 2011)
+
+  09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
+  +tor-0.2.1.29-r1.ebuild, +files/tor.conf, +files/tor.initd-r4,
+  +files/torrc:
+  Added /etc/torrc so that tor starts out of the box.
+  See: http://bugs.sabayon.org/show_bug.cgi?id=2135
+
   17 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
   -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
   -tor-0.2.2.21_alpha.ebuild, -files/tor.conf, -files/tor.initd-r4:

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 8871bd8..268a2dc 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,2 +1,9 @@
-MISC ChangeLog 33308 RMD160 28bcf3279a12c9a1e9682992d6ec3b9967ba4849 SHA1 faf53e25b801465f6cb0b743724fc8e290987b3f SHA256 6c7adcaab6559f17bdbde7223548438e4ac2675da1b6316494606d1f39bd191b
+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
+DIST tor-0.2.1.29.tar.gz 2521399 RMD160 2587fc9162852434a395ec796ebdcee1972d9aa9 SHA1 cd534b99c91070504f4e70008ab8940a816b5bc6 SHA256 070d314effd6c08f8b5a8a1ebb4f5c3af644d48a9e38e9cba34fd3f2e981ec64
+EBUILD tor-0.2.1.29-r1.ebuild 2557 RMD160 79ec269b4a7956f477ed64a1debf30a20b0784e1 SHA1 3bdc5983c2c8c53ed4ba8ac46a6b507985767ad4 SHA256 524a622c6b636e0284d29deabdb8b8e9deac6602659466744ec051a04cf8ce51
+MISC ChangeLog 33657 RMD160 ce2baf60eed66b47c2f201d86cf8a409b8da0c71 SHA1 f22157e4c62c51a192e410d351ea8cab5fd4d59f SHA256 a4c077d16fdd9799045748a1c55af4fc453749aad5ee46933f32a491020b8c7a
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142

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
new file mode 100644
index 0000000..3eadcaa
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
@@ -0,0 +1,28 @@
+* 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
new file mode 100644
index 0000000..4e4c639
--- /dev/null
+++ b/net-misc/tor/files/tor.conf
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..c95ef19
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -0,0 +1,57 @@
+#!/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
new file mode 100644
index 0000000..640fea1
--- /dev/null
+++ b/net-misc/tor/files/torrc
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..7317552
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -0,0 +1,30 @@
+--- 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.

diff --git a/net-misc/tor/tor-0.2.1.29-r1.ebuild b/net-misc/tor/tor-0.2.1.29-r1.ebuild
new file mode 100644
index 0000000..efc07c7
--- /dev/null
+++ b/net-misc/tor/tor-0.2.1.29-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.29.ebuild,v 1.6 2011/01/24 21:12:49 armin76 Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+MY_PV=${PV/_/-}
+SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+	# Normally tor uses a bundled libevent fragment to provide
+	# asynchronous DNS requests.  This is generally a bad idea, but at
+	# the moment the official libevent does not have the 0x20 hack, so
+	# anonymity is higher with the bundled variant.  Remove patch as
+	# soon as upstream has installed the autoconf option to use
+	# system's libevent.  This hasn't happened, so we
+	# have to live with the bundled libevent for this release, as the
+	# current version in tree won't suffice for tor to build
+	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
+	# for upstream's report
+	# Let's revisit this when libevent-2* is unmasked
+	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	insinto /etc/tor
+	newins "${FILESDIR}"/torrc
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+
+	# allow the tor user more open files to avoid errors, see bug 251171
+	insinto /etc/security/limits.d/
+	doins "${FILESDIR}"/tor.conf
+}
+
+pkg_postinst() {
+	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	elog "To have privoxy and tor working together you must add:"
+	elog "forward-socks4a / localhost:9050 ."
+	elog "(notice the . at the end of the line)"
+	elog "to /etc/privoxy/config"
+}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-02-09 23:55 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-02-09 23:55 UTC (permalink / raw
  To: gentoo-commits

commit:     6fd442453f27911d3ded639159151c0bf267230b
Author:     Anthony G. Basile <basile <AT> opensource <DOT> dyc <DOT> edu>
AuthorDate: Wed Feb  9 23:28:57 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 23:55:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6fd44245

net-misc/tor: Added /etc/torrc so that tor starts out of the box.

---
 net-misc/tor/ChangeLog                          |    9 +++
 net-misc/tor/Manifest                           |    9 ++-
 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 ++++++++
 net-misc/tor/tor-0.2.1.29-r1.ebuild             |   82 +++++++++++++++++++++++
 8 files changed, 222 insertions(+), 1 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 9fc9e24..18bf7c7 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/01/07 23:54:09 fauli Exp $
 
+*tor-0.2.1.29-r1 (09 Feb 2011)
+
+  09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
+  +tor-0.2.1.29-r1.ebuild, +files/tor.conf, +files/tor.initd-r4,
+  +files/torrc:
+  Added /etc/torrc so that tor starts out of the box.
+  See: http://bugs.sabayon.org/show_bug.cgi?id=2135
+
   17 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
   -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
   -tor-0.2.2.21_alpha.ebuild, -files/tor.conf, -files/tor.initd-r4:

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 8871bd8..268a2dc 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,2 +1,9 @@
-MISC ChangeLog 33308 RMD160 28bcf3279a12c9a1e9682992d6ec3b9967ba4849 SHA1 faf53e25b801465f6cb0b743724fc8e290987b3f SHA256 6c7adcaab6559f17bdbde7223548438e4ac2675da1b6316494606d1f39bd191b
+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
+DIST tor-0.2.1.29.tar.gz 2521399 RMD160 2587fc9162852434a395ec796ebdcee1972d9aa9 SHA1 cd534b99c91070504f4e70008ab8940a816b5bc6 SHA256 070d314effd6c08f8b5a8a1ebb4f5c3af644d48a9e38e9cba34fd3f2e981ec64
+EBUILD tor-0.2.1.29-r1.ebuild 2557 RMD160 79ec269b4a7956f477ed64a1debf30a20b0784e1 SHA1 3bdc5983c2c8c53ed4ba8ac46a6b507985767ad4 SHA256 524a622c6b636e0284d29deabdb8b8e9deac6602659466744ec051a04cf8ce51
+MISC ChangeLog 33657 RMD160 ce2baf60eed66b47c2f201d86cf8a409b8da0c71 SHA1 f22157e4c62c51a192e410d351ea8cab5fd4d59f SHA256 a4c077d16fdd9799045748a1c55af4fc453749aad5ee46933f32a491020b8c7a
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142

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
new file mode 100644
index 0000000..3eadcaa
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
@@ -0,0 +1,28 @@
+* 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
new file mode 100644
index 0000000..4e4c639
--- /dev/null
+++ b/net-misc/tor/files/tor.conf
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..c95ef19
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -0,0 +1,57 @@
+#!/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
new file mode 100644
index 0000000..640fea1
--- /dev/null
+++ b/net-misc/tor/files/torrc
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..7317552
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -0,0 +1,30 @@
+--- 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.

diff --git a/net-misc/tor/tor-0.2.1.29-r1.ebuild b/net-misc/tor/tor-0.2.1.29-r1.ebuild
new file mode 100644
index 0000000..efc07c7
--- /dev/null
+++ b/net-misc/tor/tor-0.2.1.29-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.29.ebuild,v 1.6 2011/01/24 21:12:49 armin76 Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+MY_PV=${PV/_/-}
+SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+	# Normally tor uses a bundled libevent fragment to provide
+	# asynchronous DNS requests.  This is generally a bad idea, but at
+	# the moment the official libevent does not have the 0x20 hack, so
+	# anonymity is higher with the bundled variant.  Remove patch as
+	# soon as upstream has installed the autoconf option to use
+	# system's libevent.  This hasn't happened, so we
+	# have to live with the bundled libevent for this release, as the
+	# current version in tree won't suffice for tor to build
+	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
+	# for upstream's report
+	# Let's revisit this when libevent-2* is unmasked
+	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	insinto /etc/tor
+	newins "${FILESDIR}"/torrc
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+
+	# allow the tor user more open files to avoid errors, see bug 251171
+	insinto /etc/security/limits.d/
+	doins "${FILESDIR}"/tor.conf
+}
+
+pkg_postinst() {
+	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	elog "To have privoxy and tor working together you must add:"
+	elog "forward-socks4a / localhost:9050 ."
+	elog "(notice the . at the end of the line)"
+	elog "to /etc/privoxy/config"
+}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-02-10  0:02 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-02-10  0:02 UTC (permalink / raw
  To: gentoo-commits

commit:     0549374e344213f6f8d70c8c2fc6a1593d0b99a0
Author:     Anthony G. Basile <basile <AT> opensource <DOT> dyc <DOT> edu>
AuthorDate: Thu Feb 10 00:01:58 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 00:01:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=0549374e

net-misc/tor: moved to the tree

(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)

---
 net-misc/tor/ChangeLog                          |    6 ++
 net-misc/tor/Manifest                           |    9 +--
 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 --------
 net-misc/tor/tor-0.2.1.29-r1.ebuild             |   87 -----------------------
 8 files changed, 7 insertions(+), 218 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index bbd1547..d1f2c38 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/01/07 23:54:09 fauli Exp $
 
+  10 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
+  -tor-0.2.1.29-r1.ebuild, -files/tor.conf, -files/tor.initd-r4,
+  -files/torrc:
+  Moved to the tree.
+
   09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
   tor-0.2.1.29-r1.ebuild:
   Fixed pkg_postinst() message.

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 5b1a9bb..07dc985 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,9 +1,2 @@
-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
-DIST tor-0.2.1.29.tar.gz 2521399 RMD160 2587fc9162852434a395ec796ebdcee1972d9aa9 SHA1 cd534b99c91070504f4e70008ab8940a816b5bc6 SHA256 070d314effd6c08f8b5a8a1ebb4f5c3af644d48a9e38e9cba34fd3f2e981ec64
-EBUILD tor-0.2.1.29-r1.ebuild 2671 RMD160 e6b289a66b855cea8b18a888f1190e6e1a65c1e1 SHA1 eb0943be1c443455d11685a8efdded1318df5fdb SHA256 57a8ba1afab0681ed948165720eaf4107b1c112c575aae3f4fd618bb0e6b3e4f
-MISC ChangeLog 33771 RMD160 6ce73c54cdfad784f502116603dfe652ea4fb7a0 SHA1 4a3be85a0c3c413c66ea3000c4868105ccf7bcef SHA256 7a32da00c42f8325a017b8124b838678e630b0faf42ec9ce5c242b99c93d5c59
+MISC ChangeLog 34003 RMD160 2b3395100dba60c23e674a23f9ca9e99fc8fa765 SHA1 920c47031bdc31c0bb00a5cdb75cafb2285bffb1 SHA256 f60e358137bfd287748d04e9d9a1ea8aaa27b1191c01ae1699bfb9d465f3830d
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142

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.

diff --git a/net-misc/tor/tor-0.2.1.29-r1.ebuild b/net-misc/tor/tor-0.2.1.29-r1.ebuild
deleted file mode 100644
index c63644e..0000000
--- a/net-misc/tor/tor-0.2.1.29-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.29.ebuild,v 1.6 2011/01/24 21:12:49 armin76 Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
-RDEPEND="${DEPEND}
-	net-proxy/tsocks[tordns]"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
-	# Normally tor uses a bundled libevent fragment to provide
-	# asynchronous DNS requests.  This is generally a bad idea, but at
-	# the moment the official libevent does not have the 0x20 hack, so
-	# anonymity is higher with the bundled variant.  Remove patch as
-	# soon as upstream has installed the autoconf option to use
-	# system's libevent.  This hasn't happened, so we
-	# have to live with the bundled libevent for this release, as the
-	# current version in tree won't suffice for tor to build
-	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
-	# for upstream's report
-	# Let's revisit this when libevent-2* is unmasked
-	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/*.txt
-
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-
-	insinto /etc/tor/
-	doins "${FILESDIR}"/torrc
-
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-
-	# allow the tor user more open files to avoid errors, see bug 251171
-	insinto /etc/security/limits.d/
-	doins "${FILESDIR}"/tor.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-03-25  0:14 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-03-25  0:14 UTC (permalink / raw
  To: gentoo-commits

commit:     de06f3caca836e3f2b41845b5e03ac491f45a645
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 00:14:15 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:14:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=de06f3ca

net-misc/tor: Added patch against configure.in to completely respect CFLAGS

(Portage version: 2.1.9.42/git/Linux x86_64, unsigned Manifest commit)

---
 net-misc/tor/ChangeLog                             |    9 ++
 net-misc/tor/Manifest                              |   10 ++-
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 +++++++
 .../files/tor-0.2.2.23_alpha-respect-CFLAGS.patch  |   22 +++++
 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 +++++++
 net-misc/tor/tor-0.2.2.23_alpha-r1.ebuild          |   84 ++++++++++++++++++++
 9 files changed, 247 insertions(+), 1 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index d1f2c38..13339b6 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/01/07 23:54:09 fauli Exp $
 
+*tor-0.2.2.23_alpha-r1 (25 Mar 2011)
+
+  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
+  +tor-0.2.2.23_alpha-r1.ebuild,
+  +files/tor-0.2.2.23_alpha-respect-CFLAGS.patch, +files/tor.conf,
+  +files/tor.initd-r4, +files/torrc:
+  Added patch against configure.in to completely respect CFLAGS
+
   10 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
   -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
   -tor-0.2.1.29-r1.ebuild, -files/tor.conf, -files/tor.initd-r4,

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 07dc985..52a9212 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,2 +1,10 @@
-MISC ChangeLog 34003 RMD160 2b3395100dba60c23e674a23f9ca9e99fc8fa765 SHA1 920c47031bdc31c0bb00a5cdb75cafb2285bffb1 SHA256 f60e358137bfd287748d04e9d9a1ea8aaa27b1191c01ae1699bfb9d465f3830d
+AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
+AUX tor-0.2.2.23_alpha-respect-CFLAGS.patch 981 RMD160 3143afbb42e96aea50dd694ca4f89eefad6779b3 SHA1 c1ef8d7888b5961bfcda7369d3a59d868c9731f8 SHA256 fc754324ff535bbe7e0e09b4a016b726d3dcfd3bb7d7004a3b527012a272fe02
+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
+DIST tor-0.2.2.23-alpha.tar.gz 2569327 RMD160 e61dcf8a32bc1a3d21140742e31750b4a4607dd6 SHA1 f6e044d429046f46000592c8c574b42d19c45bc0 SHA256 a61ed183903757a67e8f48cb6a81629726998426ba2c2121d68fdb692c2b01a6
+EBUILD tor-0.2.2.23_alpha-r1.ebuild 2371 RMD160 e3d2ea6adf9aed60ba9d6dbee06c03f8ca83f04a SHA1 16efb68a02bc56a883c05f2f343c5ffa7b989513 SHA256 d798753846c31a9605d0cc7bac5501444f08b9e7375c9ba833c4767080583634
+MISC ChangeLog 34372 RMD160 11aaa4dbd583897de1f340e6951341b5e48e3fb1 SHA1 e14eae16b8fc3d5e84b7f97379864ebbe889dfd5 SHA256 21cae52b2a4a3145ba4a8e686d3f355d2cb314bc9c21d7d32a2b428c954321ce
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142

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
new file mode 100644
index 0000000..3eadcaa
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
@@ -0,0 +1,28 @@
+* 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-0.2.2.23_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
new file mode 100644
index 0000000..0ca78a8
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
@@ -0,0 +1,22 @@
+diff -Naur tor-0.2.2.23-alpha.orig/configure.in tor-0.2.2.23-alpha/configure.in
+--- tor-0.2.2.23-alpha.orig/configure.in	2011-03-08 18:38:16.000000000 -0500
++++ tor-0.2.2.23-alpha/configure.in	2011-03-24 19:09:33.000000000 -0400
+@@ -9,6 +9,9 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -945,6 +948,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor.conf b/net-misc/tor/files/tor.conf
new file mode 100644
index 0000000..4e4c639
--- /dev/null
+++ b/net-misc/tor/files/tor.conf
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..c95ef19
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -0,0 +1,57 @@
+#!/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
new file mode 100644
index 0000000..640fea1
--- /dev/null
+++ b/net-misc/tor/files/torrc
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..7317552
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -0,0 +1,30 @@
+--- 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.

diff --git a/net-misc/tor/tor-0.2.2.23_alpha-r1.ebuild b/net-misc/tor/tor-0.2.2.23_alpha-r1.ebuild
new file mode 100644
index 0000000..6984555
--- /dev/null
+++ b/net-misc/tor/tor-0.2.2.23_alpha-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.23_alpha.ebuild,v 1.1 2011/03/11 04:11:27 blueness Exp $
+
+EAPI=3
+
+inherit autotools eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.2.23_alpha-respect-CFLAGS.patch
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	# Upstream isn't sure of *all* flags user provided CFLAGS
+	# will break tor, but do recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+	econf --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	insinto /etc/tor/
+	doins "${FILESDIR}"/torrc
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+
+	# allow the tor user more open files to avoid errors, see bug 251171
+	insinto /etc/security/limits.d/
+	doins "${FILESDIR}"/tor.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-03-27  4:01 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-03-27  4:01 UTC (permalink / raw
  To: gentoo-commits

commit:     8c3ff08a612e6f3a7919e50959935e561df6dc94
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 01:10:02 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 01:10:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=8c3ff08a

net-misc/tor: moved to the tree

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

---
 net-misc/tor/Manifest                              |   13 +++-
 .../files/tor-0.2.2.23_alpha-respect-CFLAGS.patch  |   22 -----
 net-misc/tor/tor-0.2.2.23_alpha-r1.ebuild          |   84 --------------------
 3 files changed, 10 insertions(+), 109 deletions(-)

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 52a9212..0edaced 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
-AUX tor-0.2.2.23_alpha-respect-CFLAGS.patch 981 RMD160 3143afbb42e96aea50dd694ca4f89eefad6779b3 SHA1 c1ef8d7888b5961bfcda7369d3a59d868c9731f8 SHA256 fc754324ff535bbe7e0e09b4a016b726d3dcfd3bb7d7004a3b527012a272fe02
 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
-DIST tor-0.2.2.23-alpha.tar.gz 2569327 RMD160 e61dcf8a32bc1a3d21140742e31750b4a4607dd6 SHA1 f6e044d429046f46000592c8c574b42d19c45bc0 SHA256 a61ed183903757a67e8f48cb6a81629726998426ba2c2121d68fdb692c2b01a6
-EBUILD tor-0.2.2.23_alpha-r1.ebuild 2371 RMD160 e3d2ea6adf9aed60ba9d6dbee06c03f8ca83f04a SHA1 16efb68a02bc56a883c05f2f343c5ffa7b989513 SHA256 d798753846c31a9605d0cc7bac5501444f08b9e7375c9ba833c4767080583634
 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
+-----END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
deleted file mode 100644
index 0ca78a8..0000000
--- a/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur tor-0.2.2.23-alpha.orig/configure.in tor-0.2.2.23-alpha/configure.in
---- tor-0.2.2.23-alpha.orig/configure.in	2011-03-08 18:38:16.000000000 -0500
-+++ tor-0.2.2.23-alpha/configure.in	2011-03-24 19:09:33.000000000 -0400
-@@ -9,6 +9,9 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -945,6 +948,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

diff --git a/net-misc/tor/tor-0.2.2.23_alpha-r1.ebuild b/net-misc/tor/tor-0.2.2.23_alpha-r1.ebuild
deleted file mode 100644
index 6984555..0000000
--- a/net-misc/tor/tor-0.2.2.23_alpha-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.23_alpha.ebuild,v 1.1 2011/03/11 04:11:27 blueness Exp $
-
-EAPI=3
-
-inherit autotools eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0"
-# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
-RDEPEND="${DEPEND}
-	net-proxy/tsocks[tordns]"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.2.23_alpha-respect-CFLAGS.patch
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	# Upstream isn't sure of *all* flags user provided CFLAGS
-	# will break tor, but do recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/*.txt
-
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-
-	insinto /etc/tor/
-	doins "${FILESDIR}"/torrc
-
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-
-	# allow the tor user more open files to avoid errors, see bug 251171
-	insinto /etc/security/limits.d/
-	doins "${FILESDIR}"/tor.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-03-27  4:39 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-03-27  4:39 UTC (permalink / raw
  To: gentoo-commits

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.



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-04-05 11:57 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-04-05 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     339be0d8e3aa3cfc0b8df3ad35024b226a55629e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 11:56:59 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 11:56:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=339be0d8

net-misc/tor: staging to backport respect-CFLAGS fix from tor-0.2.2.23_alpha

---
 net-misc/tor/Manifest                              |   18 ++---
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 +++++++
 .../files/tor-0.2.2.23_alpha-respect-CFLAGS.patch  |   38 +++++++++
 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 +++++++
 net-misc/tor/tor-0.2.1.30-r1.ebuild                |   86 ++++++++++++++++++++
 8 files changed, 255 insertions(+), 10 deletions(-)

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index b681ef5..b08b535 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
+AUX tor-0.2.2.23_alpha-respect-CFLAGS.patch 1460 RMD160 8a4245ab8132454e1ae1b12bbc241c8718854515 SHA1 bf8f56d78b4572caceaa5043f299c3255471e70a SHA256 7d8ed0359f108a32cdeb3c2b613cbaae6469124e07a0033a035e4b1670023782
+AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
+AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
+AUX torrc 119 RMD160 3b7ec5a87893d371b2659bb49ac77cf3deff0f38 SHA1 c573f42578261ccc7b223261d5083cdff5afe095 SHA256 97a80a09bb3d615b93947f0d1a9c1883ef340860e89b879f2247d61b1c2476f0
+AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
+DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
+EBUILD tor-0.2.1.30-r1.ebuild 2652 RMD160 706d604d7e3bec644ce886118c84c90292e51826 SHA1 692d4fb5227c0a321188d96b103ae85f44ab618b SHA256 45b1a91f94a958f9578f2672e533a86483157a0cccc212558061a1d7e56fd648
 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)
-
-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
new file mode 100644
index 0000000..3eadcaa
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
@@ -0,0 +1,28 @@
+* 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-0.2.2.23_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
new file mode 100644
index 0000000..a762e2f
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
@@ -0,0 +1,38 @@
+diff -Naur tor-0.2.2.23-alpha.orig/configure.in tor-0.2.2.23-alpha/configure.in
+--- tor-0.2.2.23-alpha.orig/configure.in	2011-03-08 18:38:16.000000000 -0500
++++ tor-0.2.2.23-alpha/configure.in	2011-03-27 19:53:55.000000000 -0400
+@@ -9,6 +9,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -865,12 +870,11 @@
+ # Set CFLAGS _after_ all the above checks, since our warnings are stricter
+ # than autoconf's macros like.
+ if test "$GCC" = yes; then
+-  CFLAGS="$CFLAGS -Wall -g -O2"
++  CFLAGS="$CFLAGS -Wall"
+   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
+   # accident waiting to happen.
+   CFLAGS="$CFLAGS -fno-strict-aliasing"
+ else
+-  CFLAGS="$CFLAGS -g -O"
+   enable_gcc_warnings=no
+   enable_gcc_warnings_advisory=no
+ fi
+@@ -945,6 +949,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor.conf b/net-misc/tor/files/tor.conf
new file mode 100644
index 0000000..4e4c639
--- /dev/null
+++ b/net-misc/tor/files/tor.conf
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..24d8a9a
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2005 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
new file mode 100644
index 0000000..640fea1
--- /dev/null
+++ b/net-misc/tor/files/torrc
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..7317552
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -0,0 +1,30 @@
+--- 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.

diff --git a/net-misc/tor/tor-0.2.1.30-r1.ebuild b/net-misc/tor/tor-0.2.1.30-r1.ebuild
new file mode 100644
index 0000000..8b0e4be
--- /dev/null
+++ b/net-misc/tor/tor-0.2.1.30-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.30.ebuild,v 1.5 2011/04/02 15:42:33 armin76 Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+MY_PV=${PV/_/-}
+SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+	# Normally tor uses a bundled libevent fragment to provide
+	# asynchronous DNS requests.  This is generally a bad idea, but at
+	# the moment the official libevent does not have the 0x20 hack, so
+	# anonymity is higher with the bundled variant.  Remove patch as
+	# soon as upstream has installed the autoconf option to use
+	# system's libevent.  This hasn't happened, so we
+	# have to live with the bundled libevent for this release, as the
+	# current version in tree won't suffice for tor to build
+	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
+	# for upstream's report
+	# Let's revisit this when libevent-2* is unmasked
+	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO}
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	insinto /etc/tor/
+	doins "${FILESDIR}"/torrc
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+
+	# allow the tor user more open files to avoid errors, see bug 251171
+	insinto /etc/security/limits.d/
+	doins "${FILESDIR}"/tor.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-04-09 17:39 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-04-09 17:39 UTC (permalink / raw
  To: gentoo-commits

commit:     b85167014d9adf1abababfaf19fcc3c5c4f4f7ec
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 17:39:27 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 17:39:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=b8516701

net-misc/tor: backport of tor-0.2.2.23_alpha-respect-CFLAGS.patch

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

---
 net-misc/tor/ChangeLog                             |    4 ++
 net-misc/tor/Manifest                              |   15 +++++++-
 .../tor/files/tor-0.2.1.30-respect-CFLAGS.patch    |   38 ++++++++++++++++++++
 net-misc/tor/tor-0.2.1.30-r1.ebuild                |   11 +++++-
 4 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 13339b6..c8e1f9a 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/01/07 23:54:09 fauli Exp $
 
+  09 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch:
+  backport of tor-0.2.2.23_alpha-respect-CFLAGS.patch
+
 *tor-0.2.2.23_alpha-r1 (25 Mar 2011)
 
   25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index b08b535..17ea9a6 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
+AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
 AUX tor-0.2.2.23_alpha-respect-CFLAGS.patch 1460 RMD160 8a4245ab8132454e1ae1b12bbc241c8718854515 SHA1 bf8f56d78b4572caceaa5043f299c3255471e70a SHA256 7d8ed0359f108a32cdeb3c2b613cbaae6469124e07a0033a035e4b1670023782
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
 AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
 AUX torrc 119 RMD160 3b7ec5a87893d371b2659bb49ac77cf3deff0f38 SHA1 c573f42578261ccc7b223261d5083cdff5afe095 SHA256 97a80a09bb3d615b93947f0d1a9c1883ef340860e89b879f2247d61b1c2476f0
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
-EBUILD tor-0.2.1.30-r1.ebuild 2652 RMD160 706d604d7e3bec644ce886118c84c90292e51826 SHA1 692d4fb5227c0a321188d96b103ae85f44ab618b SHA256 45b1a91f94a958f9578f2672e533a86483157a0cccc212558061a1d7e56fd648
-MISC ChangeLog 34372 RMD160 11aaa4dbd583897de1f340e6951341b5e48e3fb1 SHA1 e14eae16b8fc3d5e84b7f97379864ebbe889dfd5 SHA256 21cae52b2a4a3145ba4a8e686d3f355d2cb314bc9c21d7d32a2b428c954321ce
+EBUILD tor-0.2.1.30-r1.ebuild 3029 RMD160 cc28e282f1de5dcb23ed029d9a7b5ce526e52fda SHA1 ec56c04558cdca878e8b77021511c1efacd22392 SHA256 dc3d018672dfbaad0f01e13f3354621104755f69a20d6f765d414ca223c45dd9
+MISC ChangeLog 34550 RMD160 bbbea3c98f158d36813848197096d3f6c19e889f SHA1 daba92e0acf4abdee906a276f7c51930a71befff SHA256 31f71719889693f087173a9cfe5aedd414d13fd9a8ad279c279c0d1810598006
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk2gmc8ACgkQl5yvQNBFVTWv1ACfZUaKMD08Q1aEqarROicE+R7H
+wtcAnjduE8HyvMwHAHxC/3P4vdUoJ+qS
+=uq//
+-----END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
new file mode 100644
index 0000000..3776756
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
@@ -0,0 +1,38 @@
+diff -Naur tor-0.2.1.30.orig/configure.in tor-0.2.1.30/configure.in
+--- tor-0.2.1.30.orig/configure.in	2011-02-23 03:25:39.000000000 -0500
++++ tor-0.2.1.30/configure.in	2011-04-09 13:25:40.000000000 -0400
+@@ -10,6 +10,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -784,12 +789,11 @@
+ # Set CFLAGS _after_ all the above checks, since our warnings are stricter
+ # than autoconf's macros like.
+ if test "$GCC" = yes; then
+-  CFLAGS="$CFLAGS -Wall -g -O2"
++  CFLAGS="$CFLAGS -Wall"
+   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
+   # accident waiting to happen.
+   CFLAGS="$CFLAGS -fno-strict-aliasing"
+ else
+-  CFLAGS="$CFLAGS -g -O"
+   enable_gcc_warnings=no
+   enable_gcc_warnings_advisory=no
+ fi
+@@ -865,6 +869,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/tor-0.2.1.30-r1.ebuild b/net-misc/tor/tor-0.2.1.30-r1.ebuild
index 8b0e4be..f17799b 100644
--- a/net-misc/tor/tor-0.2.1.30-r1.ebuild
+++ b/net-misc/tor/tor-0.2.1.30-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Anonymizing overlay network for TCP"
 HOMEPAGE="http://www.torproject.org/"
@@ -31,6 +31,11 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
 	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.1.30-respect-CFLAGS.patch
+	eautoreconf || die "eautoreconf failed"
+
 	# Normally tor uses a bundled libevent fragment to provide
 	# asynchronous DNS requests.  This is generally a bad idea, but at
 	# the moment the official libevent does not have the 0x20 hack, so
@@ -46,6 +51,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
 	econf $(use_enable debug)
 }
 



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-04-11  0:48 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-04-11  0:48 UTC (permalink / raw
  To: gentoo-commits

commit:     249e3fcbc8d769864a863f922b02d1ebac269448
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 23:37:51 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 23:37:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=249e3fcb

net-misc/tor: moved to tree

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

---
 net-misc/tor/ChangeLog                             |    7 ++
 net-misc/tor/Manifest                              |   17 +---
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 ------
 .../tor/files/tor-0.2.1.30-respect-CFLAGS.patch    |   38 --------
 .../files/tor-0.2.2.23_alpha-respect-CFLAGS.patch  |   38 --------
 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 ------
 net-misc/tor/tor-0.2.1.30-r1.ebuild                |   95 --------------------
 10 files changed, 11 insertions(+), 307 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index c8e1f9a..0c85b95 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/01/07 23:54:09 fauli Exp $
 
+  10 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
+  -tor-0.2.1.30-r1.ebuild, -files/tor-0.2.1.30-respect-CFLAGS.patch,
+  -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch, -files/tor.conf,
+  -files/tor.initd-r4, -files/torrc:
+  moved to tree
+
   09 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
   tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch:
   backport of tor-0.2.2.23_alpha-respect-CFLAGS.patch

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 17ea9a6..92e9924 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,21 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
-AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
-AUX tor-0.2.2.23_alpha-respect-CFLAGS.patch 1460 RMD160 8a4245ab8132454e1ae1b12bbc241c8718854515 SHA1 bf8f56d78b4572caceaa5043f299c3255471e70a SHA256 7d8ed0359f108a32cdeb3c2b613cbaae6469124e07a0033a035e4b1670023782
-AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
-AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
-AUX torrc 119 RMD160 3b7ec5a87893d371b2659bb49ac77cf3deff0f38 SHA1 c573f42578261ccc7b223261d5083cdff5afe095 SHA256 97a80a09bb3d615b93947f0d1a9c1883ef340860e89b879f2247d61b1c2476f0
-AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
-EBUILD tor-0.2.1.30-r1.ebuild 3029 RMD160 cc28e282f1de5dcb23ed029d9a7b5ce526e52fda SHA1 ec56c04558cdca878e8b77021511c1efacd22392 SHA256 dc3d018672dfbaad0f01e13f3354621104755f69a20d6f765d414ca223c45dd9
-MISC ChangeLog 34550 RMD160 bbbea3c98f158d36813848197096d3f6c19e889f SHA1 daba92e0acf4abdee906a276f7c51930a71befff SHA256 31f71719889693f087173a9cfe5aedd414d13fd9a8ad279c279c0d1810598006
+MISC ChangeLog 34869 RMD160 6b5dc8287af2bfa76b6ec0b26ef8b592b7eaabae SHA1 47352d11c17e157fbdb674fd1f05936d810fadcf SHA256 507ce911d4a7a0aa104dd87086b520755e0cb8a38aa1e1f18276e4314734685d
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk2gmc8ACgkQl5yvQNBFVTWv1ACfZUaKMD08Q1aEqarROicE+R7H
-wtcAnjduE8HyvMwHAHxC/3P4vdUoJ+qS
-=uq//
+iEYEAREIAAYFAk2iP08ACgkQl5yvQNBFVTUiRQCfUuZsaCT/MhqW5Ehw2UcAKW/L
+UlMAoKEmWh5fqLxlF3oSbSoq5zrBb3MY
+=eCvZ
 -----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-0.2.1.30-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
deleted file mode 100644
index 3776756..0000000
--- a/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur tor-0.2.1.30.orig/configure.in tor-0.2.1.30/configure.in
---- tor-0.2.1.30.orig/configure.in	2011-02-23 03:25:39.000000000 -0500
-+++ tor-0.2.1.30/configure.in	2011-04-09 13:25:40.000000000 -0400
-@@ -10,6 +10,11 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+CFLAGS=
-+LDFLAGS=
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -784,12 +789,11 @@
- # Set CFLAGS _after_ all the above checks, since our warnings are stricter
- # than autoconf's macros like.
- if test "$GCC" = yes; then
--  CFLAGS="$CFLAGS -Wall -g -O2"
-+  CFLAGS="$CFLAGS -Wall"
-   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
-   # accident waiting to happen.
-   CFLAGS="$CFLAGS -fno-strict-aliasing"
- else
--  CFLAGS="$CFLAGS -g -O"
-   enable_gcc_warnings=no
-   enable_gcc_warnings_advisory=no
- fi
-@@ -865,6 +869,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

diff --git a/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
deleted file mode 100644
index a762e2f..0000000
--- a/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur tor-0.2.2.23-alpha.orig/configure.in tor-0.2.2.23-alpha/configure.in
---- tor-0.2.2.23-alpha.orig/configure.in	2011-03-08 18:38:16.000000000 -0500
-+++ tor-0.2.2.23-alpha/configure.in	2011-03-27 19:53:55.000000000 -0400
-@@ -9,6 +9,11 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+CFLAGS=
-+LDFLAGS=
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -865,12 +870,11 @@
- # Set CFLAGS _after_ all the above checks, since our warnings are stricter
- # than autoconf's macros like.
- if test "$GCC" = yes; then
--  CFLAGS="$CFLAGS -Wall -g -O2"
-+  CFLAGS="$CFLAGS -Wall"
-   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
-   # accident waiting to happen.
-   CFLAGS="$CFLAGS -fno-strict-aliasing"
- else
--  CFLAGS="$CFLAGS -g -O"
-   enable_gcc_warnings=no
-   enable_gcc_warnings_advisory=no
- fi
-@@ -945,6 +949,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

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 24d8a9a..0000000
--- a/net-misc/tor/files/tor.initd-r4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 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.

diff --git a/net-misc/tor/tor-0.2.1.30-r1.ebuild b/net-misc/tor/tor-0.2.1.30-r1.ebuild
deleted file mode 100644
index f17799b..0000000
--- a/net-misc/tor/tor-0.2.1.30-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.30.ebuild,v 1.5 2011/04/02 15:42:33 armin76 Exp $
-
-EAPI=2
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
-RDEPEND="${DEPEND}
-	net-proxy/tsocks[tordns]"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.1.30-respect-CFLAGS.patch
-	eautoreconf || die "eautoreconf failed"
-
-	# Normally tor uses a bundled libevent fragment to provide
-	# asynchronous DNS requests.  This is generally a bad idea, but at
-	# the moment the official libevent does not have the 0x20 hack, so
-	# anonymity is higher with the bundled variant.  Remove patch as
-	# soon as upstream has installed the autoconf option to use
-	# system's libevent.  This hasn't happened, so we
-	# have to live with the bundled libevent for this release, as the
-	# current version in tree won't suffice for tor to build
-	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
-	# for upstream's report
-	# Let's revisit this when libevent-2* is unmasked
-	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf $(use_enable debug)
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
-		doc/{HACKING,TODO}
-
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-
-	insinto /etc/tor/
-	doins "${FILESDIR}"/torrc
-
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-
-	# allow the tor user more open files to avoid errors, see bug 251171
-	insinto /etc/security/limits.d/
-	doins "${FILESDIR}"/tor.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-05-07 19:29 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-05-07 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     1094c6ee41bc70b41a64ca79ddf5d49e6ee19e16
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 19:29:23 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May  7 19:29:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=1094c6ee

net-misc/tor: bump alpha to 0.2.3.1

---
 net-misc/tor/ChangeLog                             |  154 ++++++++++++++------
 net-misc/tor/Manifest                              |   20 +--
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 ++++
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 +++
 net-misc/tor/files/tor.conf                        |    3 +
 net-misc/tor/files/tor.initd-r4                    |   57 +++++++
 net-misc/tor/files/torrc                           |    8 +
 net-misc/tor/files/torrc.sample-0.1.2.6.patch      |   30 ++++
 net-misc/tor/tor-0.2.3.1_alpha.ebuild              |   84 +++++++++++
 9 files changed, 353 insertions(+), 55 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 7cf4914..4f37d99 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,75 +1,141 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/01/07 23:54:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.253 2011/04/29 20:15:56 blueness Exp $
+
+*tor-0.2.3.1_alpha (07 May 2011)
+
+  07 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
+  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.3.1_alpha.ebuild,
+  +files/tor.conf, +files/tor.initd-r4, +files/torrc:
+  Bump alpha
+
+  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.23_alpha.ebuild, -tor-0.2.2.23_alpha-r1.ebuild,
+  -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+  Removed deprecated alpha
+
+*tor-0.2.2.25_alpha (29 Apr 2011)
+
+  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.25_alpha.ebuild:
+  Version bump
 
 *tor-0.2.2.24_alpha (18 Apr 2011)
 
   18 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
-  +files/tor-0.2.1.30-respect-CFLAGS.patch, +tor-0.2.2.24_alpha.ebuild,
-  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +files/CVS/Entries,
-  +files/CVS/Repository, +files/CVS/Root, +files/tor.conf,
-  +files/tor.initd-r4, +files/torrc:
+  +tor-0.2.2.24_alpha.ebuild,
+  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch:
   Version bump
 
+*tor-0.2.1.30-r1 (10 Apr 2011)
+
   10 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
-  -tor-0.2.1.30-r1.ebuild, -files/tor-0.2.1.30-respect-CFLAGS.patch,
-  -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch, -files/tor.conf,
-  -files/tor.initd-r4, -files/torrc:
-  moved to tree
+  +tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch,
+  files/torrc:
+  Backport of improved build system, see bug #360765
+
+  02 Apr 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.29.ebuild,
+  -tor-0.2.1.29-r1.ebuild:
+  Removed vulnerable versions, bug #359789
 
-  09 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch:
-  backport of tor-0.2.2.23_alpha-respect-CFLAGS.patch
+  02 Apr 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.30.ebuild:
+  arm/sparc stable wrt #359789
+
+  28 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+  Improved fix to build system, see bug #360765
 
 *tor-0.2.2.23_alpha-r1 (25 Mar 2011)
 
   25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
   +tor-0.2.2.23_alpha-r1.ebuild,
-  +files/tor-0.2.2.23_alpha-respect-CFLAGS.patch, +files/tor.conf,
-  +files/tor.initd-r4, +files/torrc:
-  Added patch against configure.in to completely respect CFLAGS
+  +files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+  Fixed build system to fully respect CFLAGS
 
-  10 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
-  -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
-  -tor-0.2.1.29-r1.ebuild, -files/tor.conf, -files/tor.initd-r4,
-  -files/torrc:
-  Moved to the tree.
+  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  tor-0.2.2.23_alpha.ebuild:
+  Removed superfluous USE flag
 
-  09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
-  tor-0.2.1.29-r1.ebuild:
-  Fixed pkg_postinst() message.
+  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.22_alpha-r1.ebuild:
+  Removed outdated alpha
+
+  22 Mar 2011; Thomas Kahle <tomka@gentoo.org> tor-0.2.1.30.ebuild:
+  x86 stable per bug 359789
+
+  21 Mar 2011; Christoph Mende <angelos@gentoo.org> tor-0.2.1.30.ebuild:
+  Stable on amd64 wrt bug #359789
+
+  21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> tor-0.2.1.30.ebuild:
+  ppc/ppc64 stable wrt #359789
+
+*tor-0.2.2.23_alpha (11 Mar 2011)
+
+  11 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.23_alpha.ebuild:
+  Version bump on alpha and removal of deprecated vesion.
+
+  27 Feb 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.29.ebuild:
+  Reverted removal of only stable ebuild on most arches.
+
+*tor-0.2.1.30 (27 Feb 2011)
+
+  27 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.1.29.ebuild,
+  +tor-0.2.1.30.ebuild:
+  Version bump and clean up.
+
+  12 Feb 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29-r1.ebuild:
+  sparc stable wrt #351920
+
+*tor-0.2.2.22_alpha-r1 (10 Feb 2011)
+
+  10 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.22_alpha.ebuild, +tor-0.2.2.22_alpha-r1.ebuild:
+  Added /etc/tor/torrc for alpha.
 
 *tor-0.2.1.29-r1 (09 Feb 2011)
 
   09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
-  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
-  +tor-0.2.1.29-r1.ebuild, +files/tor.conf, +files/tor.initd-r4,
-  +files/torrc:
-  Added /etc/torrc so that tor starts out of the box.
-  See: http://bugs.sabayon.org/show_bug.cgi?id=2135
+  +tor-0.2.1.29-r1.ebuild, +files/torrc:
+  Added /etc/tor/torrc so tor works out of the box.
 
-  17 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
-  -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
-  -tor-0.2.2.21_alpha.ebuild, -files/tor.conf, -files/tor.initd-r4:
-  net-mis/tor: in the tree
+*tor-0.2.2.22_alpha (01 Feb 2011)
+
+  01 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.2.21_alpha.ebuild,
+  +tor-0.2.2.22_alpha.ebuild:
+  Version bump on alpha and cleanup.
+
+  24 Jan 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.28.ebuild:
+  Removed vulnerable version, see bug #351920
+
+  24 Jan 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29.ebuild:
+  sparc stable
+
+  23 Jan 2011; Markus Meier <maekke@gentoo.org> tor-0.2.1.29.ebuild:
+  arm stable, bug #351920
+
+  18 Jan 2011; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.29.ebuild:
+  stable x86, security bug 351920
+
+  17 Jan 2011; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.29.ebuild:
+  Stable on amd64 wrt bug #351920
+
+  17 Jan 2011; <xarth@gentoo.org> tor-0.2.1.29.ebuild:
+  ppc/ppc64 stable wrt #351920
 
 *tor-0.2.2.21_alpha (17 Jan 2011)
+*tor-0.2.1.29 (17 Jan 2011)
 
-  17 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
-  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
-  +tor-0.2.2.21_alpha.ebuild, +files/tor.conf, +files/tor.initd-r4:
-  version bump for alpha, address remote exploit via heap overflow
+  17 Jan 2011; Tomas Touceda <chiiph@gentoo.org> +tor-0.2.1.29.ebuild,
+  -tor-0.2.2.20_alpha.ebuild, +tor-0.2.2.21_alpha.ebuild:
+  Versiom bump. Clean old alpha.
 
-  10 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.20_alpha.ebuild:
-  net-misc/tor: moved to tree
+*tor-0.2.2.20_alpha (10 Jan 2011)
 
   10 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
-  tor-0.2.2.20_alpha.ebuild:
-  net-misc/tor: updated DEPEND to depend on masked >=dev-libs/libevent-2.0
+  +tor-0.2.2.20_alpha.ebuild:
+  added alpha branch
 
   07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.25.ebuild,
   -tor-0.2.1.26.ebuild, -tor-0.2.1.27.ebuild:

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 4037652..733bdbd 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-MISC ChangeLog 35287 RMD160 cdfd38e07bc0ca7c719e9ea74866af3a21bf3cb4 SHA1 34ad96236fc11b6a538891eebf2e1f7a01adaac0 SHA256 7f7e8ba8341bf46a401ef4ba51dffeaaae586397b233e47a4e4fc425b392195c
+AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
+AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
+AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
+AUX tor.initd-r4 1566 RMD160 410611175c20425f48d340216ef680650bf6fa3d SHA1 dbdfd68db76871be8606d1196c0c2a7ba257aac0 SHA256 095334e62ee28d3346f84831015dc9c45f7224d8a6f3588974de7b26352e2824
+AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
+AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
+DIST tor-0.2.3.1-alpha.tar.gz 2686119 RMD160 9f6f69db3541395bb34d3f4b3db30577a4cd5f6e SHA1 577d34efa66e5f6ba72d010b38fb48ff5b9796e3 SHA256 8906e80068952a4d3d9f65dfea2f4b0fd76b6b301fd1e62adac6c1b3bebe360e
+EBUILD tor-0.2.3.1_alpha.ebuild 2375 RMD160 53f8494ce98a86e56638d152ceeeac4185a6c1f0 SHA1 d56bf448cfea86d44f90875308795cf40c58c693 SHA256 4351c3cfcd94fb1919b399d20854a895cfb3792706fecdeff2d1e0c1c0b86c9c
+MISC ChangeLog 36826 RMD160 820857019bfb7be1ffa5254582a02048f5338c61 SHA1 023e041327fe5224f0a597b6a43e86085f34c166 SHA256 15bcef1e5b066aecb8fe2df650ba55a675371e00063557f5ba437715411748f6
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk2sIXEACgkQl5yvQNBFVTUL3gCdHvVl1G05wzIzCSMgdrmr06oE
-HWsAniaTIpTP9LEosqw6jXUrLwVmBVdS
-=lL1b
------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
new file mode 100644
index 0000000..3eadcaa
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
@@ -0,0 +1,28 @@
+* 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-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
new file mode 100644
index 0000000..86b797b
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
@@ -0,0 +1,24 @@
+diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
+--- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
++++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
+@@ -9,6 +9,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -971,6 +976,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor.conf b/net-misc/tor/files/tor.conf
new file mode 100644
index 0000000..4e4c639
--- /dev/null
+++ b/net-misc/tor/files/tor.conf
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..c95ef19
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -0,0 +1,57 @@
+#!/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
new file mode 100644
index 0000000..dc2dea3
--- /dev/null
+++ b/net-misc/tor/files/torrc
@@ -0,0 +1,8 @@
+#
+# Minimal torrc so tor will work out of the box
+#
+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
new file mode 100644
index 0000000..7317552
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -0,0 +1,30 @@
+--- 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.

diff --git a/net-misc/tor/tor-0.2.3.1_alpha.ebuild b/net-misc/tor/tor-0.2.3.1_alpha.ebuild
new file mode 100644
index 0000000..77b7ee7
--- /dev/null
+++ b/net-misc/tor/tor-0.2.3.1_alpha.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.25_alpha.ebuild,v 1.1 2011/04/29 20:11:45 blueness Exp $
+
+EAPI=3
+
+inherit autotools eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+	econf --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/README
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	insinto /etc/tor/
+	doins "${FILESDIR}"/torrc
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+
+	# allow the tor user more open files to avoid errors, see bug 251171
+	insinto /etc/security/limits.d/
+	doins "${FILESDIR}"/tor.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-05-10 11:37 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-05-10 11:37 UTC (permalink / raw
  To: gentoo-commits

commit:     fe183fef9c61b424b725c720f84945524110bf68
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 11:17:51 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue May 10 11:17:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=fe183fef

net-misc/tor-0.2.3.1_alpha: moved to tree

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

---
 net-misc/tor/ChangeLog                             |    6 ++
 net-misc/tor/Manifest                              |   20 +++--
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 -------
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 ------
 net-misc/tor/files/tor.conf                        |    3 -
 net-misc/tor/files/tor.initd-r4                    |   57 -------------
 net-misc/tor/files/torrc                           |    8 --
 net-misc/tor/files/torrc.sample-0.1.2.6.patch      |   30 -------
 net-misc/tor/tor-0.2.3.1_alpha.ebuild              |   84 --------------------
 9 files changed, 17 insertions(+), 243 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 4f37d99..9887167 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.253 2011/04/29 20:15:56 blueness Exp $
 
+  10 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
+  -files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, -tor-0.2.3.1_alpha.ebuild,
+  -files/tor.conf, -files/tor.initd-r4, -files/torrc:
+  moved to tree
+
 *tor-0.2.3.1_alpha (07 May 2011)
 
   07 May 2011; Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 733bdbd..fa85021 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,12 @@
-AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
-AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
-AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
-AUX tor.initd-r4 1566 RMD160 410611175c20425f48d340216ef680650bf6fa3d SHA1 dbdfd68db76871be8606d1196c0c2a7ba257aac0 SHA256 095334e62ee28d3346f84831015dc9c45f7224d8a6f3588974de7b26352e2824
-AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
-AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-DIST tor-0.2.3.1-alpha.tar.gz 2686119 RMD160 9f6f69db3541395bb34d3f4b3db30577a4cd5f6e SHA1 577d34efa66e5f6ba72d010b38fb48ff5b9796e3 SHA256 8906e80068952a4d3d9f65dfea2f4b0fd76b6b301fd1e62adac6c1b3bebe360e
-EBUILD tor-0.2.3.1_alpha.ebuild 2375 RMD160 53f8494ce98a86e56638d152ceeeac4185a6c1f0 SHA1 d56bf448cfea86d44f90875308795cf40c58c693 SHA256 4351c3cfcd94fb1919b399d20854a895cfb3792706fecdeff2d1e0c1c0b86c9c
-MISC ChangeLog 36826 RMD160 820857019bfb7be1ffa5254582a02048f5338c61 SHA1 023e041327fe5224f0a597b6a43e86085f34c166 SHA256 15bcef1e5b066aecb8fe2df650ba55a675371e00063557f5ba437715411748f6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+MISC ChangeLog 37103 RMD160 84f50c5c6be079df7b0855a9140b4ca34c9813cb SHA1 39e9e2395185e5fd7c9548e9ed95083ce7201e82 SHA256 22a8f3627e27d8e3e648f60f2db8998c1dfda1cbf9f3f9e6dacd43b9897d7349
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk3JHt8ACgkQl5yvQNBFVTW1XACfZ2KfQM2U81bAoCTPqwqSQIWC
+pcIAnjQUt0NShZCz7G8VYhwgqq9Z/lJK
+=7wO/
+-----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-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
deleted file mode 100644
index 86b797b..0000000
--- a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
---- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
-+++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
-@@ -9,6 +9,11 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+CFLAGS=
-+LDFLAGS=
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -971,6 +976,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

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 dc2dea3..0000000
--- a/net-misc/tor/files/torrc
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Minimal torrc so tor will work out of the box
-#
-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.

diff --git a/net-misc/tor/tor-0.2.3.1_alpha.ebuild b/net-misc/tor/tor-0.2.3.1_alpha.ebuild
deleted file mode 100644
index 77b7ee7..0000000
--- a/net-misc/tor/tor-0.2.3.1_alpha.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.25_alpha.ebuild,v 1.1 2011/04/29 20:11:45 blueness Exp $
-
-EAPI=3
-
-inherit autotools eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0"
-# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
-RDEPEND="${DEPEND}
-	net-proxy/tsocks[tordns]"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-
-	insinto /etc/tor/
-	doins "${FILESDIR}"/torrc
-
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-
-	# allow the tor user more open files to avoid errors, see bug 251171
-	insinto /etc/security/limits.d/
-	doins "${FILESDIR}"/tor.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-05-30 20:48 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-05-30 20:48 UTC (permalink / raw
  To: gentoo-commits

commit:     2a81a27764a77ca353afaea4b2637c8d38a0e4ba
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 20:48:35 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:48:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=2a81a277

net-misc/tor: added missing

(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 ++++++++++
 .../tor/files/tor-0.2.1.30-respect-CFLAGS.patch    |   38 +++++++++++++
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 ++++++++
 net-misc/tor/files/tor.conf                        |    3 +
 net-misc/tor/files/tor.initd-r4                    |   57 ++++++++++++++++++++
 net-misc/tor/files/torrc                           |    8 +++
 net-misc/tor/files/torrc.sample-0.1.2.6.patch      |   30 ++++++++++
 8 files changed, 198 insertions(+), 3 deletions(-)

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index f838e38..cea9d3c 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,6 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
+AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
+AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
+AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
+AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
+AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
+AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.2.27-beta.tar.gz 2633715 RMD160 5a475497b035e676b953e1c0b531bead45ecbccb SHA1 c49d0970ecd5d418128d068a4db87cc25349f366 SHA256 61e184846ec38f4301ccfc7445567e89168e1d3e6c2e4bfed2d4ba5517ff4d68
 EBUILD tor-0.2.2.27_beta.ebuild 2375 RMD160 53f8494ce98a86e56638d152ceeeac4185a6c1f0 SHA1 d56bf448cfea86d44f90875308795cf40c58c693 SHA256 4351c3cfcd94fb1919b399d20854a895cfb3792706fecdeff2d1e0c1c0b86c9c
 MISC ChangeLog 37254 RMD160 e55d254e19c644b7484fbcc1c107369ddbedc1a6 SHA1 65e00c523c451883f19ebeee70b0cdde33ab0c3d SHA256 ea5451b27103a030a5c28d5c123ade113c2bf15b68242f176e687d5b53d766eb
@@ -8,7 +15,7 @@ MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk3jyuIACgkQl5yvQNBFVTX2CwCdEig3SPfewvh518wpxQISH9JM
-e50AmgMXeWS/53IZnI5JK0BSP+owrpyt
-=oKJT
+iEYEAREIAAYFAk3kAqMACgkQl5yvQNBFVTXWHgCdF/l645/1OvHSRv54ISj+O61V
+9WUAnRVIsKMiJMMEpeurd7XJxDqAswwo
+=Mco9
 -----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
new file mode 100644
index 0000000..3eadcaa
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
@@ -0,0 +1,28 @@
+* 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-0.2.1.30-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
new file mode 100644
index 0000000..3776756
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
@@ -0,0 +1,38 @@
+diff -Naur tor-0.2.1.30.orig/configure.in tor-0.2.1.30/configure.in
+--- tor-0.2.1.30.orig/configure.in	2011-02-23 03:25:39.000000000 -0500
++++ tor-0.2.1.30/configure.in	2011-04-09 13:25:40.000000000 -0400
+@@ -10,6 +10,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -784,12 +789,11 @@
+ # Set CFLAGS _after_ all the above checks, since our warnings are stricter
+ # than autoconf's macros like.
+ if test "$GCC" = yes; then
+-  CFLAGS="$CFLAGS -Wall -g -O2"
++  CFLAGS="$CFLAGS -Wall"
+   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
+   # accident waiting to happen.
+   CFLAGS="$CFLAGS -fno-strict-aliasing"
+ else
+-  CFLAGS="$CFLAGS -g -O"
+   enable_gcc_warnings=no
+   enable_gcc_warnings_advisory=no
+ fi
+@@ -865,6 +869,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
new file mode 100644
index 0000000..86b797b
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
@@ -0,0 +1,24 @@
+diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
+--- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
++++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
+@@ -9,6 +9,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -971,6 +976,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor.conf b/net-misc/tor/files/tor.conf
new file mode 100644
index 0000000..4e4c639
--- /dev/null
+++ b/net-misc/tor/files/tor.conf
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..24d8a9a
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2005 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
new file mode 100644
index 0000000..dc2dea3
--- /dev/null
+++ b/net-misc/tor/files/torrc
@@ -0,0 +1,8 @@
+#
+# Minimal torrc so tor will work out of the box
+#
+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
new file mode 100644
index 0000000..7317552
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -0,0 +1,30 @@
+--- 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.



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-05-30 20:49 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-05-30 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     16a2d2bc66ab160c5aaefec1a46ec1cca31a4210
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 20:48:35 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:49:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=16a2d2bc

net-misc/tor: added missing 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 ++++++++++
 .../tor/files/tor-0.2.1.30-respect-CFLAGS.patch    |   38 +++++++++++++
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 ++++++++
 net-misc/tor/files/tor.conf                        |    3 +
 net-misc/tor/files/tor.initd-r4                    |   57 ++++++++++++++++++++
 net-misc/tor/files/torrc                           |    8 +++
 net-misc/tor/files/torrc.sample-0.1.2.6.patch      |   30 ++++++++++
 8 files changed, 198 insertions(+), 3 deletions(-)

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index f838e38..cea9d3c 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,6 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
+AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
+AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
+AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
+AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
+AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
+AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.2.27-beta.tar.gz 2633715 RMD160 5a475497b035e676b953e1c0b531bead45ecbccb SHA1 c49d0970ecd5d418128d068a4db87cc25349f366 SHA256 61e184846ec38f4301ccfc7445567e89168e1d3e6c2e4bfed2d4ba5517ff4d68
 EBUILD tor-0.2.2.27_beta.ebuild 2375 RMD160 53f8494ce98a86e56638d152ceeeac4185a6c1f0 SHA1 d56bf448cfea86d44f90875308795cf40c58c693 SHA256 4351c3cfcd94fb1919b399d20854a895cfb3792706fecdeff2d1e0c1c0b86c9c
 MISC ChangeLog 37254 RMD160 e55d254e19c644b7484fbcc1c107369ddbedc1a6 SHA1 65e00c523c451883f19ebeee70b0cdde33ab0c3d SHA256 ea5451b27103a030a5c28d5c123ade113c2bf15b68242f176e687d5b53d766eb
@@ -8,7 +15,7 @@ MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk3jyuIACgkQl5yvQNBFVTX2CwCdEig3SPfewvh518wpxQISH9JM
-e50AmgMXeWS/53IZnI5JK0BSP+owrpyt
-=oKJT
+iEYEAREIAAYFAk3kAqMACgkQl5yvQNBFVTXWHgCdF/l645/1OvHSRv54ISj+O61V
+9WUAnRVIsKMiJMMEpeurd7XJxDqAswwo
+=Mco9
 -----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
new file mode 100644
index 0000000..3eadcaa
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
@@ -0,0 +1,28 @@
+* 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-0.2.1.30-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
new file mode 100644
index 0000000..3776756
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
@@ -0,0 +1,38 @@
+diff -Naur tor-0.2.1.30.orig/configure.in tor-0.2.1.30/configure.in
+--- tor-0.2.1.30.orig/configure.in	2011-02-23 03:25:39.000000000 -0500
++++ tor-0.2.1.30/configure.in	2011-04-09 13:25:40.000000000 -0400
+@@ -10,6 +10,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -784,12 +789,11 @@
+ # Set CFLAGS _after_ all the above checks, since our warnings are stricter
+ # than autoconf's macros like.
+ if test "$GCC" = yes; then
+-  CFLAGS="$CFLAGS -Wall -g -O2"
++  CFLAGS="$CFLAGS -Wall"
+   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
+   # accident waiting to happen.
+   CFLAGS="$CFLAGS -fno-strict-aliasing"
+ else
+-  CFLAGS="$CFLAGS -g -O"
+   enable_gcc_warnings=no
+   enable_gcc_warnings_advisory=no
+ fi
+@@ -865,6 +869,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
new file mode 100644
index 0000000..86b797b
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
@@ -0,0 +1,24 @@
+diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
+--- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
++++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
+@@ -9,6 +9,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -971,6 +976,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor.conf b/net-misc/tor/files/tor.conf
new file mode 100644
index 0000000..4e4c639
--- /dev/null
+++ b/net-misc/tor/files/tor.conf
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..24d8a9a
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2005 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
new file mode 100644
index 0000000..dc2dea3
--- /dev/null
+++ b/net-misc/tor/files/torrc
@@ -0,0 +1,8 @@
+#
+# Minimal torrc so tor will work out of the box
+#
+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
new file mode 100644
index 0000000..7317552
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -0,0 +1,30 @@
+--- 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.



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-06-06 16:54 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-06-06 16:54 UTC (permalink / raw
  To: gentoo-commits

commit:     e29c917a9368415a1f8e04cc6f0fbd6833c5579e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 16:54:10 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 16:54:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=e29c917a

net-misc/tor: testing bug #268396

---
 net-misc/tor/ChangeLog                             |    8 ++
 net-misc/tor/Manifest                              |   10 ++-
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 ++++++
 .../tor/files/tor-0.2.1.30-respect-CFLAGS.patch    |   38 ++++++++
 net-misc/tor/files/tor.conf                        |    3 +
 net-misc/tor/files/tor.initd-r6                    |   57 ++++++++++++
 net-misc/tor/files/torrc.1                         |    6 ++
 net-misc/tor/files/torrc.sample-0.2.1.30.patch     |   26 ++++++
 net-misc/tor/tor-0.2.1.30-r2.ebuild                |   95 ++++++++++++++++++++
 9 files changed, 270 insertions(+), 1 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index f5b38f3..06e7f0f 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.253 2011/04/29 20:15:56 blueness Exp $
 
+*tor-0.2.1.30-r2 (06 Jun 2011)
+
+  06 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/tor-0.2.1.19-logrotate.patch, +tor-0.2.1.30-r2.ebuild,
+  +files/tor-0.2.1.30-respect-CFLAGS.patch, +files/torrc.sample-0.2.1.30.patch,
+  +files/tor.conf, +files/tor.initd-r6, +files/torrc.1:
+  Testing bug #268396
+
 *tor-0.2.2.27_beta (30 May 2011)
 
   30 May 2011; Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index d451a6f..eee6875 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,2 +1,10 @@
-MISC ChangeLog 37254 RMD160 e55d254e19c644b7484fbcc1c107369ddbedc1a6 SHA1 65e00c523c451883f19ebeee70b0cdde33ab0c3d SHA256 ea5451b27103a030a5c28d5c123ade113c2bf15b68242f176e687d5b53d766eb
+AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
+AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
+AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
+AUX tor.initd-r6 1616 RMD160 3dd1daee3e7038d04dcb168bda24c4d9c4c04f34 SHA1 ee6de8777afc29ce3c71bde1f1499c58982a3380 SHA256 1f3d7c7ec5877eecf47dc76734c6dc706dd2d1a69e57f9c231f9dcf544fa4bc6
+AUX torrc.1 150 RMD160 17a70e9790b415c51639a5f08e47a0cb54323f20 SHA1 a217f018d1b2a15ca7ead718dc42f60109bb005d SHA256 e03ba21c23e9798075b2fcdafab143eaf58ffdae9198bcf40de22424a64a90f6
+AUX torrc.sample-0.2.1.30.patch 1067 RMD160 77ac6827513cc1fc48a72bf352915887e22c4284 SHA1 6194000ee38cbaf095954bd0f9adebb001ccaf05 SHA256 5e657209f85b52d2c4c8434a1c65d652828be5f58f672f5829db6524a80e9998
+DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
+EBUILD tor-0.2.1.30-r2.ebuild 3043 RMD160 71f1535be018f503e0a254b1f1736deabad00e86 SHA1 3cc05596abb3f5322a9562857c405ff2bab6ebc4 SHA256 2ecc7978b6dbfd009611081f5d3f1024156f005f0c65bf14b19a85207a0db1f0
+MISC ChangeLog 37564 RMD160 15dea18a2fadc2182ac444ff2e492800f10aa75e SHA1 740a779c4f797b49bef43ffd42127a520b47b072 SHA256 a3131f4c083859c99cc32ffb356d8763fd5fb6490c9c386dc524c64ad39ab230
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142

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
new file mode 100644
index 0000000..3eadcaa
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
@@ -0,0 +1,28 @@
+* 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-0.2.1.30-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
new file mode 100644
index 0000000..3776756
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
@@ -0,0 +1,38 @@
+diff -Naur tor-0.2.1.30.orig/configure.in tor-0.2.1.30/configure.in
+--- tor-0.2.1.30.orig/configure.in	2011-02-23 03:25:39.000000000 -0500
++++ tor-0.2.1.30/configure.in	2011-04-09 13:25:40.000000000 -0400
+@@ -10,6 +10,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -784,12 +789,11 @@
+ # Set CFLAGS _after_ all the above checks, since our warnings are stricter
+ # than autoconf's macros like.
+ if test "$GCC" = yes; then
+-  CFLAGS="$CFLAGS -Wall -g -O2"
++  CFLAGS="$CFLAGS -Wall"
+   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
+   # accident waiting to happen.
+   CFLAGS="$CFLAGS -fno-strict-aliasing"
+ else
+-  CFLAGS="$CFLAGS -g -O"
+   enable_gcc_warnings=no
+   enable_gcc_warnings_advisory=no
+ fi
+@@ -865,6 +869,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

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

diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.initd-r6
new file mode 100644
index 0000000..211a40d
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r6
@@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-misc/tor/files/tor.initd-r6,v 1.1 2009/06/03 13:02:24 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 --User tor -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 --User tor -f ${CONFFILE}
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+        ebegin "Starting Tor"
+        HOME=/var/lib/tor
+	start-stop-daemon --start --user tor --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping Tor"
+	start-stop-daemon --stop --user tor --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.1 b/net-misc/tor/files/torrc.1
new file mode 100644
index 0000000..eb1a856
--- /dev/null
+++ b/net-misc/tor/files/torrc.1
@@ -0,0 +1,6 @@
+#
+# Minimal torrc so tor will work out of the box
+#
+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.2.1.30.patch b/net-misc/tor/files/torrc.sample-0.2.1.30.patch
new file mode 100644
index 0000000..99959f4
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.2.1.30.patch
@@ -0,0 +1,26 @@
+--- 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,7 @@
+ ## With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
+ ## /Library/Tor/torrc
+ 
++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.

diff --git a/net-misc/tor/tor-0.2.1.30-r2.ebuild b/net-misc/tor/tor-0.2.1.30-r2.ebuild
new file mode 100644
index 0000000..9bf572e
--- /dev/null
+++ b/net-misc/tor/tor-0.2.1.30-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.30-r1.ebuild,v 1.1 2011/04/10 17:42:03 blueness Exp $
+
+EAPI=2
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+MY_PV=${PV/_/-}
+SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample-0.2.1.30.patch
+	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.1.30-respect-CFLAGS.patch
+	eautoreconf || die "eautoreconf failed"
+
+	# Normally tor uses a bundled libevent fragment to provide
+	# asynchronous DNS requests.  This is generally a bad idea, but at
+	# the moment the official libevent does not have the 0x20 hack, so
+	# anonymity is higher with the bundled variant.  Remove patch as
+	# soon as upstream has installed the autoconf option to use
+	# system's libevent.  This hasn't happened, so we
+	# have to live with the bundled libevent for this release, as the
+	# current version in tree won't suffice for tor to build
+	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
+	# for upstream's report
+	# Let's revisit this when libevent-2* is unmasked
+	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+	econf $(use_enable debug)
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO}
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc.1 torrc
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+
+	# allow the tor user more open files to avoid errors, see bug 251171
+	insinto /etc/security/limits.d/
+	doins "${FILESDIR}"/tor.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-06-06 17:27 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-06-06 17:27 UTC (permalink / raw
  To: gentoo-commits

commit:     000ee0b635581d823e4f3030c45e76a5df8bc586
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 17:26:45 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 17:26:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=000ee0b6

net-misc/tor: net-misc/tor: testing bug #268396 - comment 16

---
 net-misc/tor/Manifest                              |   10 +++++-----
 net-misc/tor/files/tor.confd                       |    3 +++
 net-misc/tor/files/{tor.initd-r6 => tor.initd-r5}  |   13 +++++++------
 net-misc/tor/files/{torrc.1 => torrc}              |    2 ++
 ...e-0.2.1.30.patch => torrc.sample-0.1.2.6.patch} |    6 +++++-
 net-misc/tor/tor-0.2.1.30-r2.ebuild                |   13 ++++++-------
 6 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index eee6875..664221d 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,10 @@
 AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
 AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
-AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
-AUX tor.initd-r6 1616 RMD160 3dd1daee3e7038d04dcb168bda24c4d9c4c04f34 SHA1 ee6de8777afc29ce3c71bde1f1499c58982a3380 SHA256 1f3d7c7ec5877eecf47dc76734c6dc706dd2d1a69e57f9c231f9dcf544fa4bc6
-AUX torrc.1 150 RMD160 17a70e9790b415c51639a5f08e47a0cb54323f20 SHA1 a217f018d1b2a15ca7ead718dc42f60109bb005d SHA256 e03ba21c23e9798075b2fcdafab143eaf58ffdae9198bcf40de22424a64a90f6
-AUX torrc.sample-0.2.1.30.patch 1067 RMD160 77ac6827513cc1fc48a72bf352915887e22c4284 SHA1 6194000ee38cbaf095954bd0f9adebb001ccaf05 SHA256 5e657209f85b52d2c4c8434a1c65d652828be5f58f672f5829db6524a80e9998
+AUX tor.confd 37 RMD160 2d7fcd5a217d11e9798a0985e61970c117bc9734 SHA1 057ea3b42e40bdca678b27dbb63ea1862da30c73 SHA256 6c1d04625f5f2e6e9494ab91aaa09e9af76b7b40f557960aaba3284102087c00
+AUX tor.initd-r5 1586 RMD160 ff3b6ae16ad40072d8ea2e1f9b2723155cc1d499 SHA1 4f2d2e2e8cb4cc2d04e67513025905959fa3f600 SHA256 e5e776cfce6a1b30d0db0095b75c2410a3bee4abad3b2168e29d63939ebda1e6
+AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
+AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
-EBUILD tor-0.2.1.30-r2.ebuild 3043 RMD160 71f1535be018f503e0a254b1f1736deabad00e86 SHA1 3cc05596abb3f5322a9562857c405ff2bab6ebc4 SHA256 2ecc7978b6dbfd009611081f5d3f1024156f005f0c65bf14b19a85207a0db1f0
+EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 2bd1cd0cd9af566d9e919125b4a18613ca8b3004 SHA1 d83f170194a2b787949ae48da5f26ea198cfa48b SHA256 6dbac9b041ab5f3ec9db200d95948fdd62cc6e3d6adb33d2e22b21f29bf26d62
 MISC ChangeLog 37564 RMD160 15dea18a2fadc2182ac444ff2e492800f10aa75e SHA1 740a779c4f797b49bef43ffd42127a520b47b072 SHA256 a3131f4c083859c99cc32ffb356d8763fd5fb6490c9c386dc524c64ad39ab230
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
new file mode 100644
index 0000000..5f95bd2
--- /dev/null
+++ b/net-misc/tor/files/tor.confd
@@ -0,0 +1,3 @@
+#
+# Set the file limit
+ULIMITN=10000

diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.initd-r5
similarity index 65%
rename from net-misc/tor/files/tor.initd-r6
rename to net-misc/tor/files/tor.initd-r5
index 211a40d..79b0b6b 100644
--- a/net-misc/tor/files/tor.initd-r6
+++ b/net-misc/tor/files/tor.initd-r5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-misc/tor/files/tor.initd-r6,v 1.1 2009/06/03 13:02:24 fauli Exp $
+# $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
@@ -20,13 +20,13 @@ checkconfig() {
 	fi
 
 	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config --User tor -f ${CONFFILE} > /dev/null 2>&1
+	/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 --User tor -f ${CONFFILE}
+		/usr/bin/tor --verify-config -f ${CONFFILE}
 		return 1
 	fi
 }
@@ -35,13 +35,14 @@ start() {
 	checkconfig || return 1
         ebegin "Starting Tor"
         HOME=/var/lib/tor
-	start-stop-daemon --start --user tor --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
+	ulimit -n $ULIMITN
+	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 --user tor --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
+	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
         eend $?
 }
 

diff --git a/net-misc/tor/files/torrc.1 b/net-misc/tor/files/torrc
similarity index 88%
rename from net-misc/tor/files/torrc.1
rename to net-misc/tor/files/torrc
index eb1a856..dc2dea3 100644
--- a/net-misc/tor/files/torrc.1
+++ b/net-misc/tor/files/torrc
@@ -1,6 +1,8 @@
 #
 # Minimal torrc so tor will work out of the box
 #
+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.2.1.30.patch b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
similarity index 91%
rename from net-misc/tor/files/torrc.sample-0.2.1.30.patch
rename to net-misc/tor/files/torrc.sample-0.1.2.6.patch
index 99959f4..7317552 100644
--- a/net-misc/tor/files/torrc.sample-0.2.1.30.patch
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -1,9 +1,13 @@
 --- 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,7 @@
+@@ -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

diff --git a/net-misc/tor/tor-0.2.1.30-r2.ebuild b/net-misc/tor/tor-0.2.1.30-r2.ebuild
index 9bf572e..0a19c27 100644
--- a/net-misc/tor/tor-0.2.1.30-r2.ebuild
+++ b/net-misc/tor/tor-0.2.1.30-r2.ebuild
@@ -29,7 +29,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.2.1.30.patch
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
 	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
 
 	einfo "Regenerating autotools files ..."
@@ -59,7 +59,10 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	# allow the tor user more open files to avoid errors, see bug 251171
+	newconfd "${FILESDIR}"/tor.confd tor
+
+	newinitd "${FILESDIR}"/tor.initd-r5 tor
 	emake DESTDIR="${D}" install || die
 	keepdir /var/{lib,log,run}/tor
 
@@ -71,14 +74,10 @@ src_install() {
 	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
 
 	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc.1 torrc
+	doins "${FILESDIR}"/torrc
 
 	insinto /etc/logrotate.d
 	newins contrib/tor.logrotate tor
-
-	# allow the tor user more open files to avoid errors, see bug 251171
-	insinto /etc/security/limits.d/
-	doins "${FILESDIR}"/tor.conf
 }
 
 pkg_postinst() {



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-06-07 21:00 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-06-07 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     9553d8eae45cb41b9dd7b08d2c2999bcb560f03c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 20:59:39 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 21:00:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=9553d8ea

net-misc/tor: use rc_ulimit to set -n 30000

---
 net-misc/tor/Manifest                             |    6 +++---
 net-misc/tor/files/tor.confd                      |    2 +-
 net-misc/tor/files/{tor.initd-r5 => tor.initd-r4} |    1 -
 net-misc/tor/tor-0.2.1.30-r2.ebuild               |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 664221d..2b3c0e5 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,10 @@
 AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
 AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
-AUX tor.confd 37 RMD160 2d7fcd5a217d11e9798a0985e61970c117bc9734 SHA1 057ea3b42e40bdca678b27dbb63ea1862da30c73 SHA256 6c1d04625f5f2e6e9494ab91aaa09e9af76b7b40f557960aaba3284102087c00
-AUX tor.initd-r5 1586 RMD160 ff3b6ae16ad40072d8ea2e1f9b2723155cc1d499 SHA1 4f2d2e2e8cb4cc2d04e67513025905959fa3f600 SHA256 e5e776cfce6a1b30d0db0095b75c2410a3bee4abad3b2168e29d63939ebda1e6
+AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
+AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
 AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
-EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 2bd1cd0cd9af566d9e919125b4a18613ca8b3004 SHA1 d83f170194a2b787949ae48da5f26ea198cfa48b SHA256 6dbac9b041ab5f3ec9db200d95948fdd62cc6e3d6adb33d2e22b21f29bf26d62
+EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 b358d41321da83d5a27b3e3181620186b3619e58 SHA1 f29769c22765af3213a1c7ea77d381b800d5a10a SHA256 18fd05198917c8d511ed8c1221c28db855ee53be25e6b99adce357d14f90d3d0
 MISC ChangeLog 37564 RMD160 15dea18a2fadc2182ac444ff2e492800f10aa75e SHA1 740a779c4f797b49bef43ffd42127a520b47b072 SHA256 a3131f4c083859c99cc32ffb356d8763fd5fb6490c9c386dc524c64ad39ab230
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
index 5f95bd2..4195bf3 100644
--- a/net-misc/tor/files/tor.confd
+++ b/net-misc/tor/files/tor.confd
@@ -1,3 +1,3 @@
 #
 # Set the file limit
-ULIMITN=10000
+rc_ulimit="-n 30000"

diff --git a/net-misc/tor/files/tor.initd-r5 b/net-misc/tor/files/tor.initd-r4
similarity index 98%
rename from net-misc/tor/files/tor.initd-r5
rename to net-misc/tor/files/tor.initd-r4
index 79b0b6b..24d8a9a 100644
--- a/net-misc/tor/files/tor.initd-r5
+++ b/net-misc/tor/files/tor.initd-r4
@@ -35,7 +35,6 @@ start() {
 	checkconfig || return 1
         ebegin "Starting Tor"
         HOME=/var/lib/tor
-	ulimit -n $ULIMITN
 	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
         eend $?
 }

diff --git a/net-misc/tor/tor-0.2.1.30-r2.ebuild b/net-misc/tor/tor-0.2.1.30-r2.ebuild
index 0a19c27..13a7382 100644
--- a/net-misc/tor/tor-0.2.1.30-r2.ebuild
+++ b/net-misc/tor/tor-0.2.1.30-r2.ebuild
@@ -62,7 +62,7 @@ src_install() {
 	# allow the tor user more open files to avoid errors, see bug 251171
 	newconfd "${FILESDIR}"/tor.confd tor
 
-	newinitd "${FILESDIR}"/tor.initd-r5 tor
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
 	emake DESTDIR="${D}" install || die
 	keepdir /var/{lib,log,run}/tor
 



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-06-07 21:16 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-06-07 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     3ae278a824bfda747995a43f01d0dff31d3c29b5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 21:16:37 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 21:16:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=3ae278a8

net-misc/tor: solved bug #268396, moved to tree

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

---
 net-misc/tor/ChangeLog                             |    6 ++
 net-misc/tor/Manifest                              |   20 +++--
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 ------
 .../tor/files/tor-0.2.1.30-respect-CFLAGS.patch    |   38 --------
 net-misc/tor/files/tor.confd                       |    3 -
 net-misc/tor/files/tor.initd-r4                    |   57 ------------
 net-misc/tor/files/torrc                           |    8 --
 net-misc/tor/files/torrc.sample-0.1.2.6.patch      |   30 ------
 net-misc/tor/tor-0.2.1.30-r2.ebuild                |   94 --------------------
 9 files changed, 17 insertions(+), 267 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 06e7f0f..bd77743 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.253 2011/04/29 20:15:56 blueness Exp $
 
+  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch,
+  -tor-0.2.1.30-r2.ebuild, -files/tor-0.2.1.30-respect-CFLAGS.patch,
+  -files/tor.confd, -files/tor.initd-r4, -files/torrc:
+  moved to tree
+
 *tor-0.2.1.30-r2 (06 Jun 2011)
 
   06 Jun 2011; Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 2b3c0e5..e7cc9cf 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,12 @@
-AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
-AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
-AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
-AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
-AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
-AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
-EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 b358d41321da83d5a27b3e3181620186b3619e58 SHA1 f29769c22765af3213a1c7ea77d381b800d5a10a SHA256 18fd05198917c8d511ed8c1221c28db855ee53be25e6b99adce357d14f90d3d0
-MISC ChangeLog 37564 RMD160 15dea18a2fadc2182ac444ff2e492800f10aa75e SHA1 740a779c4f797b49bef43ffd42127a520b47b072 SHA256 a3131f4c083859c99cc32ffb356d8763fd5fb6490c9c386dc524c64ad39ab230
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+MISC ChangeLog 37834 RMD160 c8924142415a2a8a8052169cc697c69643538363 SHA1 09ba07a3a40b3cff434dd4d34126cce1a99053ca SHA256 9ef95f6327b2165fcd6a0ec6928af6eb98b3b4888ce7b1e9aa09cce748a19728
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk3ulTUACgkQl5yvQNBFVTWrTwCeOo9v1KYSAKWAPpoqToLwpqwe
+1rwAnilE+jf5Kli5wCqRXkUt/o29f+w4
+=3p10
+-----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-0.2.1.30-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
deleted file mode 100644
index 3776756..0000000
--- a/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur tor-0.2.1.30.orig/configure.in tor-0.2.1.30/configure.in
---- tor-0.2.1.30.orig/configure.in	2011-02-23 03:25:39.000000000 -0500
-+++ tor-0.2.1.30/configure.in	2011-04-09 13:25:40.000000000 -0400
-@@ -10,6 +10,11 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+CFLAGS=
-+LDFLAGS=
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -784,12 +789,11 @@
- # Set CFLAGS _after_ all the above checks, since our warnings are stricter
- # than autoconf's macros like.
- if test "$GCC" = yes; then
--  CFLAGS="$CFLAGS -Wall -g -O2"
-+  CFLAGS="$CFLAGS -Wall"
-   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
-   # accident waiting to happen.
-   CFLAGS="$CFLAGS -fno-strict-aliasing"
- else
--  CFLAGS="$CFLAGS -g -O"
-   enable_gcc_warnings=no
-   enable_gcc_warnings_advisory=no
- fi
-@@ -865,6 +869,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
deleted file mode 100644
index 4195bf3..0000000
--- a/net-misc/tor/files/tor.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Set the file limit
-rc_ulimit="-n 30000"

diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4
deleted file mode 100644
index 24d8a9a..0000000
--- a/net-misc/tor/files/tor.initd-r4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 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 dc2dea3..0000000
--- a/net-misc/tor/files/torrc
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Minimal torrc so tor will work out of the box
-#
-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.

diff --git a/net-misc/tor/tor-0.2.1.30-r2.ebuild b/net-misc/tor/tor-0.2.1.30-r2.ebuild
deleted file mode 100644
index 13a7382..0000000
--- a/net-misc/tor/tor-0.2.1.30-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.30-r1.ebuild,v 1.1 2011/04/10 17:42:03 blueness Exp $
-
-EAPI=2
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
-RDEPEND="${DEPEND}
-	net-proxy/tsocks[tordns]"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.1.30-respect-CFLAGS.patch
-	eautoreconf || die "eautoreconf failed"
-
-	# Normally tor uses a bundled libevent fragment to provide
-	# asynchronous DNS requests.  This is generally a bad idea, but at
-	# the moment the official libevent does not have the 0x20 hack, so
-	# anonymity is higher with the bundled variant.  Remove patch as
-	# soon as upstream has installed the autoconf option to use
-	# system's libevent.  This hasn't happened, so we
-	# have to live with the bundled libevent for this release, as the
-	# current version in tree won't suffice for tor to build
-	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
-	# for upstream's report
-	# Let's revisit this when libevent-2* is unmasked
-	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf $(use_enable debug)
-}
-
-src_install() {
-	# allow the tor user more open files to avoid errors, see bug 251171
-	newconfd "${FILESDIR}"/tor.confd tor
-
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
-		doc/{HACKING,TODO}
-
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-
-	insinto /etc/tor/
-	doins "${FILESDIR}"/torrc
-
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-07-22 17:30 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-07-22 17:30 UTC (permalink / raw
  To: gentoo-commits

commit:     0da8fc9d7c4e1e4e8f1cd92dc6159544440a0714
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 17:30:29 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 17:30:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=0da8fc9d

net-misc/tor: fixes bug #375955

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

---
 net-misc/tor/ChangeLog                             | 1136 ++++++++++++++++++++
 net-misc/tor/Manifest                              |   21 +
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 +
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 +
 .../tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch |   11 +
 net-misc/tor/files/tor.confd                       |    3 +
 net-misc/tor/files/tor.initd-r4                    |   57 +
 net-misc/tor/files/torrc                           |    8 +
 net-misc/tor/files/torrc.sample-0.1.2.6.patch      |   30 +
 net-misc/tor/metadata.xml                          |   20 +
 net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild           |   92 ++
 11 files changed, 1430 insertions(+), 0 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
new file mode 100644
index 0000000..66618c1
--- /dev/null
+++ b/net-misc/tor/ChangeLog
@@ -0,0 +1,1136 @@
+# ChangeLog for net-misc/tor
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.262 2011/07/21 14:20:02 blueness Exp $
+
+*tor-0.2.3.2_alpha-r2 (22 Jul 2011)
+
+  22 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
+  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.3.2_alpha-r2.ebuild,
+  +files/tor-0.2.3.2_alpha-fix-asneeded.patch, +files/tor.confd,
+  +files/tor.initd-r4, +files/torrc, +metadata.xml:
+  Fixes bug #375955
+
+*tor-0.2.3.2_alpha-r1 (21 Jul 2011)
+*tor-0.2.2.30_rc-r1 (21 Jul 2011)
+
+  21 Jul 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml,
+  +tor-0.2.2.30_rc-r1.ebuild, +tor-0.2.3.2_alpha-r1.ebuild:
+  Removed automatic configuration of features
+
+*tor-0.2.2.30_rc (19 Jul 2011)
+
+  19 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.29_beta.ebuild, +tor-0.2.2.30_rc.ebuild:
+  Beta bumped to first rc and removed deprecated
+
+*tor-0.2.3.2_alpha (19 Jul 2011)
+
+  19 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.3.1_alpha-r1.ebuild, +tor-0.2.3.2_alpha.ebuild:
+  Bumped alpha and removed deprecated
+
+*tor-0.2.2.29_beta (21 Jun 2011)
+
+  21 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.28_beta.ebuild, +tor-0.2.2.29_beta.ebuild:
+  Version bump beta, removed deprecated
+
+*tor-0.2.2.28_beta (10 Jun 2011)
+
+  10 Jun 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.30-r1.ebuild,
+  -tor-0.2.2.27_beta-r1.ebuild, +tor-0.2.2.28_beta.ebuild:
+  Version bump beta, and removed deprecated
+
+*tor-0.2.3.1_alpha-r1 (07 Jun 2011)
+*tor-0.2.2.27_beta-r1 (07 Jun 2011)
+
+  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.27_beta.ebuild, +tor-0.2.2.27_beta-r1.ebuild,
+  -tor-0.2.3.1_alpha.ebuild, +tor-0.2.3.1_alpha-r1.ebuild:
+  Forward ported rc_ulimit fix to beta and alpha, see bug #268396, comment #19
+
+*tor-0.2.1.30-r2 (07 Jun 2011)
+
+  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.30-r2.ebuild,
+  +files/tor.confd:
+  Use rc_ulimit to set file limit, see bug #268396, comment #19
+
+*tor-0.2.2.27_beta (30 May 2011)
+
+  30 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.25_alpha.ebuild, +tor-0.2.2.27_beta.ebuild:
+  Version bump and removed deprecated
+
+*tor-0.2.3.1_alpha (08 May 2011)
+
+  08 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.24_alpha.ebuild, +tor-0.2.3.1_alpha.ebuild:
+  Added new alpha 0.2.3.1 and removed older alpha 0.2.2.24
+
+  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.23_alpha.ebuild, -tor-0.2.2.23_alpha-r1.ebuild,
+  -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+  Removed deprecated alpha
+
+*tor-0.2.2.25_alpha (29 Apr 2011)
+
+  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.25_alpha.ebuild:
+  Version bump
+
+*tor-0.2.2.24_alpha (18 Apr 2011)
+
+  18 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.24_alpha.ebuild,
+  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch:
+  Version bump
+
+*tor-0.2.1.30-r1 (10 Apr 2011)
+
+  10 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch,
+  files/torrc:
+  Backport of improved build system, see bug #360765
+
+  02 Apr 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.29.ebuild,
+  -tor-0.2.1.29-r1.ebuild:
+  Removed vulnerable versions, bug #359789
+
+  02 Apr 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.30.ebuild:
+  arm/sparc stable wrt #359789
+
+  28 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+  Improved fix to build system, see bug #360765
+
+*tor-0.2.2.23_alpha-r1 (25 Mar 2011)
+
+  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.23_alpha-r1.ebuild,
+  +files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+  Fixed build system to fully respect CFLAGS
+
+  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  tor-0.2.2.23_alpha.ebuild:
+  Removed superfluous USE flag
+
+  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.22_alpha-r1.ebuild:
+  Removed outdated alpha
+
+  22 Mar 2011; Thomas Kahle <tomka@gentoo.org> tor-0.2.1.30.ebuild:
+  x86 stable per bug 359789
+
+  21 Mar 2011; Christoph Mende <angelos@gentoo.org> tor-0.2.1.30.ebuild:
+  Stable on amd64 wrt bug #359789
+
+  21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> tor-0.2.1.30.ebuild:
+  ppc/ppc64 stable wrt #359789
+
+*tor-0.2.2.23_alpha (11 Mar 2011)
+
+  11 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.23_alpha.ebuild:
+  Version bump on alpha and removal of deprecated vesion.
+
+  27 Feb 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.29.ebuild:
+  Reverted removal of only stable ebuild on most arches.
+
+*tor-0.2.1.30 (27 Feb 2011)
+
+  27 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.1.29.ebuild,
+  +tor-0.2.1.30.ebuild:
+  Version bump and clean up.
+
+  12 Feb 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29-r1.ebuild:
+  sparc stable wrt #351920
+
+*tor-0.2.2.22_alpha-r1 (10 Feb 2011)
+
+  10 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.22_alpha.ebuild, +tor-0.2.2.22_alpha-r1.ebuild:
+  Added /etc/tor/torrc for alpha.
+
+*tor-0.2.1.29-r1 (09 Feb 2011)
+
+  09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.1.29-r1.ebuild, +files/torrc:
+  Added /etc/tor/torrc so tor works out of the box.
+
+*tor-0.2.2.22_alpha (01 Feb 2011)
+
+  01 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.2.21_alpha.ebuild,
+  +tor-0.2.2.22_alpha.ebuild:
+  Version bump on alpha and cleanup.
+
+  24 Jan 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.28.ebuild:
+  Removed vulnerable version, see bug #351920
+
+  24 Jan 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29.ebuild:
+  sparc stable
+
+  23 Jan 2011; Markus Meier <maekke@gentoo.org> tor-0.2.1.29.ebuild:
+  arm stable, bug #351920
+
+  18 Jan 2011; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.29.ebuild:
+  stable x86, security bug 351920
+
+  17 Jan 2011; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.29.ebuild:
+  Stable on amd64 wrt bug #351920
+
+  17 Jan 2011; <xarth@gentoo.org> tor-0.2.1.29.ebuild:
+  ppc/ppc64 stable wrt #351920
+
+*tor-0.2.2.21_alpha (17 Jan 2011)
+*tor-0.2.1.29 (17 Jan 2011)
+
+  17 Jan 2011; Tomas Touceda <chiiph@gentoo.org> +tor-0.2.1.29.ebuild,
+  -tor-0.2.2.20_alpha.ebuild, +tor-0.2.2.21_alpha.ebuild:
+  Versiom bump. Clean old alpha.
+
+*tor-0.2.2.20_alpha (10 Jan 2011)
+
+  10 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.20_alpha.ebuild:
+  added alpha branch
+
+  07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.25.ebuild,
+  -tor-0.2.1.26.ebuild, -tor-0.2.1.27.ebuild:
+  clean up vulnerable versions
+
+  07 Jan 2011; Brent Baude <ranger@gentoo.org> tor-0.2.1.28.ebuild:
+  Marking tor-0.2.1.28 ppc for bug 349312
+
+  06 Jan 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
+  Removed fauli and added chiiph as maintainer
+
+  06 Jan 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
+  Added myself as maintainer
+
+  27 Dec 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.28.ebuild:
+  Marking tor-0.2.1.28 ppc64 for bug 349312
+
+  26 Dec 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.28.ebuild:
+  arm/sparc stable wrt #349312
+
+  26 Dec 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.28.ebuild:
+  Stable on amd64 wrt bug #349312
+
+  25 Dec 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.28.ebuild:
+  stable x86, security bug 349312
+
+*tor-0.2.1.28 (23 Dec 2010)
+
+  23 Dec 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.28.ebuild:
+  bump for security bug 349312
+
+  08 Dec 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.27.ebuild:
+  arm stable, bug #346759
+
+  03 Dec 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.27.ebuild:
+  request USE=tordns on net-proxy/tsocks to raise level of anonymity
+
+  28 Nov 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.27.ebuild:
+  Stable on amd64 wrt bug #346759
+
+*tor-0.2.1.27 (25 Nov 2010)
+
+  25 Nov 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.27.ebuild:
+  version bump, fixes OpenSSL issues, see bug 346715
+
+  14 Oct 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.26.ebuild:
+  stable ppc, bug 329879
+
+  30 Sep 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.25.ebuild:
+  stable ppc64, bug 309873
+
+  18 Sep 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.26.ebuild:
+  sparc stable wrt #329879
+
+  18 Aug 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.26.ebuild:
+  arm stable, bug #329879
+
+  30 Jul 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.26.ebuild:
+  Stable on amd64 wrt bug #329879
+
+  26 Jul 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.26.ebuild:
+  stable x86, bug 329879
+
+*tor-0.2.1.26 (24 Jun 2010)
+
+  24 Jun 2010; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.22.ebuild,
+  +tor-0.2.1.26.ebuild:
+  version bump for bug 325243 by Michael <gentoo AT scribeofthenile DOT
+  com>, and clean up
+
+  06 Jun 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.25.ebuild:
+  arm stable wrt #300830
+
+  23 May 2010; Pacho Ramos <pacho@gentoo.org> tor-0.2.1.25.ebuild:
+  stable amd64, bug 309873
+
+  22 May 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
+  Remove humpback from metadata.xml (#34793)
+
+  17 Apr 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.22.ebuild,
+  tor-0.2.1.25.ebuild:
+  Add ~arm wrt #300830
+
+  05 Apr 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.25.ebuild:
+  sparc stable wrt #309873
+
+  24 Mar 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.25.ebuild:
+  stable ppc, bug 309873
+
+  24 Mar 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.25.ebuild:
+  stable x86, bug 309873
+
+  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
+  -tor-0.2.1.19-r2.ebuild, -files/tor-0.2.1.19-openssl.patch,
+  -tor-0.2.1.20-r1.ebuild, -tor-0.2.1.21.ebuild:
+  clean up
+
+*tor-0.2.1.25 (23 Mar 2010)
+
+  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.25.ebuild:
+  version bump
+
+  10 Feb 2010; Joseph Jezak <josejx@gentoo.org> tor-0.2.1.22.ebuild:
+  Marked ppc stable for bug #301701.
+
+  01 Feb 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.22.ebuild:
+  amd64 stable, bug #301701
+
+  30 Jan 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.22.ebuild:
+  sparc stable wrt #301701
+
+  22 Jan 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.22.ebuild:
+  Marking tor-0.2.1.22 ppc64 for bug 301701
+
+  22 Jan 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.22.ebuild:
+  stable x86, bug 301701
+
+*tor-0.2.1.22 (22 Jan 2010)
+
+  22 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.22.ebuild:
+  version bump for security bug 301701
+
+*tor-0.2.1.21 (16 Jan 2010)
+
+  16 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.21.ebuild:
+  version bump, bug 301169 by Tim O'Kelly <bugs_gentoo_org DOT Tim_OKelly AT
+  neverbox DOT org>
+
+  27 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/tor-0.2.0.30-logrotate.patch,
+  -files/tor-0.2.0.33-no-internal-libevent.patch, -tor-0.2.0.35.ebuild,
+  -tor-0.2.1.19.ebuild, -tor-0.2.1.19-r1.ebuild:
+  clean up
+
+  26 Dec 2009; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.19-r2.ebuild:
+  sparc stable wrt #294297
+
+  08 Dec 2009; Brent Baude <ranger@gentoo.org> tor-0.2.1.19-r2.ebuild:
+  Marking tor-0.2.1.19-r2 ppc64 for bug 294297
+
+*tor-0.2.1.20-r1 (06 Dec 2009)
+
+  06 Dec 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.20.ebuild,
+  +tor-0.2.1.20-r1.ebuild:
+  reintroduce OpenSSL patch for bug 292661
+
+*tor-0.2.1.20 (02 Dec 2009)
+
+  02 Dec 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.20.ebuild:
+  version bump
+
+  25 Nov 2009; Markus Meier <maekke@gentoo.org> tor-0.2.1.19-r2.ebuild:
+  amd64 stable, bug #294297
+
+  24 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
+  tor-0.2.1.19-r2.ebuild:
+  stable x86, bug 294297
+
+  21 Nov 2009; nixnut <nixnut@gentoo.org> tor-0.2.1.19-r2.ebuild:
+  ppc stable #292022
+
+*tor-0.2.1.19-r2 (12 Nov 2009)
+
+  12 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
+  +tor-0.2.1.19-r2.ebuild, +files/tor-0.2.1.19-openssl.patch:
+  fix bug 2926611, patch discovered by Aidan Marks <aidan AT cisco DOT com>
+
+  07 Sep 2009; Christian Faulhammer <fauli@gentoo.org> files/tor.initd-r4:
+  respect CONFFILE variable in start calls, reported by Iome <frodone AT
+  gmail DOT com> in bug 283524
+
+*tor-0.2.1.19-r1 (17 Aug 2009)
+
+  17 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
+  +tor-0.2.1.19-r1.ebuild, +files/tor-0.2.1.19-logrotate.patch:
+  fix logrotate support as provided by Martin von Gagern <Martin AT vGagern
+  AT gmx DOT net> in bug 281439
+
+  06 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
+  -tor-0.2.1.16_rc.ebuild:
+  clean up release candidate
+
+*tor-0.2.1.19 (06 Aug 2009)
+
+  06 Aug 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.19.ebuild:
+  version bump
+
+  14 Jul 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.34.ebuild:
+  remove vulnerable version
+
+  12 Jul 2009; Joseph Jezak <josejx@gentoo.org> tor-0.2.0.35.ebuild:
+  Marked ppc stable for bug #275628.
+
+  30 Jun 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.35.ebuild:
+  Marking tor-0.2.0.35 ppc64 for bug 275628
+
+  30 Jun 2009; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.35.ebuild:
+  sparc stable wrt #275628
+
+  29 Jun 2009; Christian Faulhammer <fauli@gentoo.org> tor-0.2.0.34.ebuild,
+  tor-0.2.0.35.ebuild, tor-0.2.1.16_rc.ebuild:
+  fix HOMEPAGE entries
+
+  29 Jun 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.35.ebuild:
+  amd64 stable, bug #275628
+
+*tor-0.2.1.16_rc (29 Jun 2009)
+
+  29 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  -tor-0.2.1.15_rc.ebuild, +tor-0.2.1.16_rc.ebuild:
+  extend version bump for security bug 275628 and remove one vulnerable
+  version
+
+*tor-0.2.0.35 (28 Jun 2009)
+
+  28 Jun 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.35.ebuild:
+  version bump for security bug 275628, directly stable for x86
+
+  17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  tor-0.2.1.15_rc.ebuild:
+  remove all occurences of USE=bundledlibevent
+
+*tor-0.2.1.15_rc (17 Jun 2009)
+
+  17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  +tor-0.2.1.15_rc.ebuild:
+  add release candidate for 0.2.1 series
+
+  12 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  files/torrc.sample-0.1.2.6.patch, +tor-0.2.0.34.ebuild,
+  -tor-0.2.0.34-r2.ebuild, +files/tor.initd-r4, -files/tor.initd-r6:
+  revert all my changes for bug 268396 as they will break badly with
+  Baselayout 1, see bug 272527
+
+*tor-0.2.0.34-r2 (03 Jun 2009)
+
+  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org> -files/tor.initd-r5,
+  +files/tor.initd-r6, -tor-0.2.0.34-r1.ebuild, +tor-0.2.0.34-r2.ebuild:
+  revision bump to make it compatible with Baselayout 1, as reported by
+  Stanislav Cymbalov <DummyUnit AT gmail.com> in bug 272404
+
+*tor-0.2.0.34-r1 (03 Jun 2009)
+
+  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  files/torrc.sample-0.1.2.6.patch, -files/tor.initd-r4,
+  +files/tor.initd-r5, -tor-0.2.0.34.ebuild, +tor-0.2.0.34-r1.ebuild:
+  Really respect limits from /etc/limits.d/ by some tweaks: moving user
+  context switch from torrc to init script, including verification of config
+  file in the latter; fixes bug 268396 by W. Elschner <gentoobugzilla_reply AT
+  elschner DOT net>
+
+  19 Feb 2009; nixnut <nixnut@gentoo.org> tor-0.2.0.34.ebuild:
+  ppc stable
+
+  18 Feb 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.33.ebuild:
+  clean up vulnerable versions
+
+  15 Feb 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.34.ebuild:
+  amd64/x86 stable, bug #258833
+
+  13 Feb 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.34.ebuild:
+  Marking tor-0.2.0.34 ppc64 for bug 258833
+
+  13 Feb 2009; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.34.ebuild:
+  Sparc stable --- Security Bug #258833 --- tests good.
+
+*tor-0.2.0.34 (13 Feb 2009)
+
+  13 Feb 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.34.ebuild:
+  version bump for security bug 258833, reported by Jesse Adelman <jesse AT
+  boldandbusted DOT com>
+
+  08 Feb 2009; Christian Faulhammer <fauli@gentoo.org> tor-0.2.0.33.ebuild:
+  kill logrotate USE flag as requested by bangert on bug 258188
+
+  05 Feb 2009; Christian Faulhammer <fauli@gentoo.org>
+  +files/tor-0.2.0.33-no-internal-libevent.patch, metadata.xml,
+  tor-0.2.0.33.ebuild:
+  make use of bundled libevent async DNS part optional via USE=flag, this
+  should fix bug 206969
+
+  26 Jan 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.32.ebuild,
+  -tor-0.2.0.32-r1.ebuild:
+  clean up
+
+  25 Jan 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.33.ebuild:
+  amd64/x86 stable, bug #256078
+
+  24 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.2.0.33.ebuild:
+  ppc stable, bug #256078
+
+  24 Jan 2009; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.33.ebuild:
+  Sparc stable, Security Bug #256078.
+
+  24 Jan 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.33.ebuild:
+  Marking tor-0.2.0.33 ppc64 for bug 256078
+
+*tor-0.2.0.33 (24 Jan 2009)
+
+  24 Jan 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.33.ebuild:
+  version bump for security bug 256078
+
+*tor-0.2.0.32-r1 (21 Dec 2008)
+
+  21 Dec 2008; Christian Faulhammer <fauli@gentoo.org> +files/tor.conf,
+  +tor-0.2.0.32-r1.ebuild:
+  install limits file so tor can open more files on the system than normally
+  allowed, this fixes bug 251171 reported by candrews AT integralblue DOT
+  com
+
+  10 Dec 2008; Christian Faulhammer <fauli@gentoo.org>
+  -files/tor-0.2.0.31-sparc.patch, -tor-0.2.0.31-r1.ebuild:
+  clean up
+
+  09 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> tor-0.2.0.32.ebuild:
+  Stable on sparc, security bug #250018
+
+  08 Dec 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.32.ebuild:
+  Marking tor-0.2.0.32 ppc64 for bug 250018
+
+  08 Dec 2008; Markus Meier <maekke@gentoo.org> tor-0.2.0.32.ebuild:
+  x86 stable, bug #250018
+
+  07 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.2.0.32.ebuild:
+  ppc stable, bug #250018
+
+  07 Dec 2008; Richard Freeman <rich0@gentoo.org> tor-0.2.0.32.ebuild:
+  amd64 stable - 250018
+
+*tor-0.2.0.32 (06 Dec 2008)
+
+  06 Dec 2008; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.32.ebuild:
+  version bump for security bug 250018
+
+  28 Nov 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
+  Change my email address
+
+  22 Nov 2008; Christian Faulhammer <opfer@gentoo.org>
+  -tor-0.2.0.30-r1.ebuild, -tor-0.2.0.31.ebuild, tor-0.2.0.31-r1.ebuild:
+  clean up and add stable KEYWORDS for -r1
+
+  22 Nov 2008; Markus Meier <maekke@gentoo.org> tor-0.2.0.31.ebuild:
+  amd64 stable, bug #244679
+
+  14 Nov 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.31.ebuild,
+  tor-0.2.0.31-r1.ebuild:
+  Address sparc alignment problems reported in Bug #246483 --- this fixes them
+  but is untested on anything else.
+
+*tor-0.2.0.31-r1 (14 Nov 2008)
+
+  14 Nov 2008; Ferris McCormick <fmccor@gentoo.org>
+  +files/tor-0.2.0.31-sparc.patch, +tor-0.2.0.31-r1.ebuild:
+  Add new version to address sparc alignment problem, Bug #246483 which see
+  for details.
+
+  01 Nov 2008; nixnut <nixnut@gentoo.org> tor-0.2.0.31.ebuild:
+  Stable on ppc wrt bug 244679
+
+  30 Oct 2008; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.31.ebuild:
+  x86 stable #244679
+
+  28 Oct 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.31.ebuild:
+  Sparc stable, Bug #244679.
+
+  27 Oct 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.31.ebuild:
+  stable ppc64, bug 244679
+
+*tor-0.2.0.31 (26 Sep 2008)
+
+  26 Sep 2008; Christian Faulhammer <opfer@gentoo.org> +tor-0.2.0.31.ebuild:
+  version bump for bug 238787
+
+  06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> files/tor.initd-r4:
+  remove bashisms from init file, as reported in bug 236857 by Martin Väth
+  <vaeth AT mathematik DOT uni-wuerzburg DOT de>
+
+  06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r3,
+  -files/tor.logrotate.patch, -tor-0.1.2.19-r2.ebuild, -tor-0.2.0.30.ebuild:
+  clean up
+
+  06 Sep 2008; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  x86 stable wrt #236536
+
+  06 Sep 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  stable ppc64, bug 236536
+
+  06 Sep 2008; Richard Freeman <rich0@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  amd64 stable - 236536
+
+  04 Sep 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  stable ppc, bug 236536
+
+  03 Sep 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  Sparc stable --- Bug #236536 --- test suite passes.
+
+*tor-0.2.0.30-r1 (03 Sep 2008)
+
+  03 Sep 2008; Christian Faulhammer <opfer@gentoo.org> +files/tor.initd-r4,
+  +tor-0.2.0.30-r1.ebuild:
+  update init script to prevent runtime failures as reported in bug 235208
+
+*tor-0.2.0.30 (03 Aug 2008)
+
+  03 Aug 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/tor-0.2.0.30-logrotate.patch, +tor-0.2.0.30.ebuild:
+  version bump for bug 233612 by puchu <rauchwolke AT gmx DOT net>
+
+  29 May 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.19.ebuild:
+  clean up
+
+  29 May 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.19-r2.ebuild:
+  sparc stable wrt #223705, thanks to Friedrich Oslage for testing
+
+  28 May 2008; Peter Volkov <pva@gentoo.org> tor-0.1.2.19-r2.ebuild:
+  amd64 stable, bug #223705.
+
+  27 May 2008; Markus Rothe <corsair@gentoo.org> tor-0.1.2.19-r2.ebuild:
+  Stable on ppc64; bug #223705
+
+  26 May 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.19-r2.ebuild:
+  Stable on ppc wrt bug 223705
+
+  26 May 2008; Christian Faulhammer <opfer@gentoo.org>
+  tor-0.1.2.19-r2.ebuild:
+  stable x86, bug 223705
+
+*tor-0.1.2.19-r2 (29 Apr 2008)
+
+  29 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
+  -tor-0.1.2.19-r1.ebuild, +tor-0.1.2.19-r2.ebuild:
+  logrotate should now really work again
+
+*tor-0.1.2.19-r1 (25 Apr 2008)
+
+  25 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
+  +tor-0.1.2.19-r1.ebuild:
+  create the logrotate file with the correct permissions as pointed out on bug
+  216298 by Serge Koksharov <gentoosiast AT yandex DOT ru>
+
+  05 Mar 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.18.ebuild:
+  clean up
+
+  04 Mar 2008; Richard Freeman <rich0@gentoo.org> tor-0.1.2.19.ebuild:
+  amd64 stable - 211021
+
+  04 Mar 2008; Brent Baude <ranger@gentoo.org> tor-0.1.2.19.ebuild:
+  stable ppc64, bug 211021
+
+  03 Mar 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.19.ebuild:
+  sparc stable wrt #211021
+
+  02 Mar 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.19.ebuild:
+  Stable on ppc wrt bug 211021
+
+  01 Mar 2008; Christian Faulhammer <opfer@gentoo.org> metadata.xml:
+  adding myself to metadata.xml
+
+  01 Mar 2008; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.19.ebuild:
+  stable x86, bug 211021
+
+  07 Feb 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r2,
+  -tor-0.1.2.17.ebuild:
+  clean up
+
+  07 Feb 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.18.ebuild:
+  sparc stable wrt #208336
+
+  06 Feb 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.18.ebuild:
+  stable on ppc wrt bug #208336
+
+  02 Feb 2008; Richard Freeman <rich0@gentoo.org> tor-0.1.2.18.ebuild:
+  amd64 stable - #208336
+
+  31 Jan 2008; Brent Baude <ranger@gentoo.org> tor-0.1.2.18.ebuild:
+  Marking tor-0.1.2.18 ppc64 stable for bug 208336
+
+  31 Jan 2008; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.18.ebuild:
+  stable x86, bug 208336
+
+*tor-0.1.2.19 (31 Jan 2008)
+
+  31 Jan 2008; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.19.ebuild:
+  version bump
+
+*tor-0.1.2.18 (03 Jan 2008)
+
+  03 Jan 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.16.ebuild,
+  -tor-0.1.2.16-r1.ebuild, +tor-0.1.2.18.ebuild:
+  version bump (bug 199818) and clean up
+
+  03 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.2.17.ebuild:
+  ppc stable, bug #190968
+
+  02 Sep 2007; Jose Luis Rivero <yoswink@gentoo.org> tor-0.1.2.17.ebuild:
+  Stable on sparc wrt security bug #190968
+
+  02 Sep 2007; Markus Rothe <corsair@gentoo.org> tor-0.1.2.17.ebuild:
+  Stable on ppc64; bug #190968
+
+  02 Sep 2007; Christoph Mende <angelos@gentoo.org> tor-0.1.2.17.ebuild:
+  Stable on amd64 wrt security bug #190968
+
+*tor-0.1.2.17 (02 Sep 2007)
+
+  02 Sep 2007; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.17.ebuild:
+  version bump and stable x86, security bug 190968
+
+  29 Aug 2007; Gustavo Felisberto <humpback@gentoo.org> files/tor.initd-r3:
+  Adding correct init script.
+
+*tor-0.1.2.16-r1 (28 Aug 2007)
+
+  28 Aug 2007; Gustavo Felisberto <humpback@gentoo.org>
+  -files/torrc.sample-0.1.0.16.patch, -files/torrc.sample-0.1.1.23.patch,
+  -files/tor.confd, -files/tor.initd, -files/tor.initd-r1,
+  +files/tor.initd-r3, -tor-0.1.1.23.ebuild, -tor-0.1.1.26.ebuild,
+  -tor-0.1.2.14.ebuild, +tor-0.1.2.16-r1.ebuild:
+  Removed older versions and dangled files. Fixed bug with init with
+  baselayout-2 closes 189724. Thanks to Christian Faulhammer (opfer) for the
+  fix.
+
+  09 Aug 2007; Robert Buchholz <rbu@gentoo.org> tor-0.1.2.16.ebuild:
+  Stable on amd64 (bug #186644)
+
+  06 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.2.16.ebuild:
+  Stable on sparc wrt security #186644
+
+  04 Aug 2007; Markus Rothe <corsair@gentoo.org> tor-0.1.2.16.ebuild:
+  Stable on ppc64; bug #186644
+
+  04 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.2.16.ebuild:
+  ppc stable, bug #186644
+
+  03 Aug 2007; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.16.ebuild:
+  stable x86, security bug 186644
+
+*tor-0.1.2.16 (03 Aug 2007)
+
+  03 Aug 2007; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.16.ebuild:
+  version bump, for security bug 186644
+
+  02 Jun 2007; René Nussbaumer <killerfox@gentoo.org> tor-0.1.2.14.ebuild:
+  Stable on ppc. See bug #180139.
+
+  31 May 2007; Christoph Mende <angelos@gentoo.org> tor-0.1.2.14.ebuild:
+  Stable on amd64 wrt security bug 180139
+
+  31 May 2007; Brent Baude <ranger@gentoo.org> tor-0.1.2.14.ebuild:
+  Marking tor-0.1.2.14 ppc64 stable for bug#180139
+
+  31 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.2.14.ebuild:
+  Stable on sparc wrt security #180139
+
+  31 May 2007; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.14.ebuild:
+  stable x86, security bug 180139
+
+*tor-0.1.2.14 (31 May 2007)
+
+  31 May 2007; <humpback@gentoo.org> -tor-0.1.0.18.ebuild,
+  -tor-0.1.0.18-r1.ebuild, -tor-0.1.2.13.ebuild, +tor-0.1.2.14.ebuild:
+  Bumped 0.1.2.13 to 0.1.2.14, removed older versions. Fixed #178975 with idea 
+  from Remy Blank
+
+  15 May 2007; <humpback@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.0.18-r1.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.26.ebuild,
+  tor-0.1.2.13.ebuild:
+  Added keepdir. Close Bug #177590.
+
+  15 May 2007; <humpback@gentoo.org> tor-0.1.1.23.ebuild,
+  tor-0.1.1.26.ebuild:
+  Fixed missing RDEP's. Close Bug #174185.
+
+*tor-0.1.2.13 (15 May 2007)
+
+  15 May 2007; <humpback@gentoo.org> +files/tor.initd-r2,
+  -tor-0.1.2.6_alpha.ebuild, +tor-0.1.2.13.ebuild:
+  Removed alpha 1.2 release and added a bump. Help from all in bug #176018,
+  specially jakub, was very much apretiated.
+
+  29 Apr 2007; Torsten Veller <tove@gentoo.org> tor-0.1.1.23.ebuild,
+  tor-0.1.1.26.ebuild, tor-0.1.2.6_alpha.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
+
+*tor-0.1.2.6_alpha (27 Jan 2007)
+
+  27 Jan 2007; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/torrc.sample-0.1.2.6.patch, +tor-0.1.2.6_alpha.ebuild:
+  Added alpha release of tor at request from Flameeyes. It seems tork needs
+  it. As always, if it is masked and you install and destroy your system dont
+  come complain alot.
+
+*tor-0.1.1.26 (18 Dec 2006)
+
+  18 Dec 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  -tor-0.1.1.24.ebuild, +tor-0.1.1.26.ebuild:
+  Bumped to 0.1.1.26 and removed older version.
+
+*tor-0.1.0.18-r1 (22 Oct 2006)
+
+  22 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.1.0.18.ebuild, +tor-0.1.0.18-r1.ebuild:
+  Small configuration issue in the chroot. Fixes bug #139354.
+
+  21 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.24.ebuild:
+  Added ewarn about the needed dot in the privoxy integration. Closes bug
+  #152137.
+
+*tor-0.1.1.24 (09 Oct 2006)
+
+  09 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +tor-0.1.1.24.ebuild:
+  Bump from 0.1.1.23
+
+  11 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.1.0.18.ebuild:
+  Changed einfo about configuration of chroot. Removes tor from bug #140371
+
+  05 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/torrc.sample-0.1.0.14.patch, -tor-0.1.0.14-r1.ebuild,
+  -tor-0.1.0.16.ebuild, -tor-0.1.0.17.ebuild, -tor-0.1.1.20.ebuild,
+  -tor-0.1.1.22.ebuild:
+  Removed older version that had sec issues.
+
+  30 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.1.23.ebuild:
+  Stable on sparc wrt security #145458
+
+  30 Aug 2006; <blubb@gentoo.org> tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild:
+  stable on amd64 wrt bug 145458
+
+  30 Aug 2006; Joshua Jackson <tsunam@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.1.23.ebuild:
+  Stable x86; security bug #145458
+
+  29 Aug 2006; Markus Rothe <corsair@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.1.23.ebuild:
+  Stable on ppc64; bug #145458
+
+  29 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.1.23.ebuild:
+  ppc stable, bug #145458
+
+*tor-0.1.0.18 (29 Aug 2006)
+
+  29 Aug 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +tor-0.1.0.18.ebuild:
+  Adding 0.1.0.18 that fixes sec issue in the 0.1.0.* series. The 0.1.1.23 is
+  not affected.
+
+*tor-0.1.1.23 (24 Aug 2006)
+
+  24 Aug 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/torrc.sample-0.1.1.23.patch, +tor-0.1.1.23.ebuild:
+  Updated version, bump and small cosmetics. Thanks to Olivier Mondolini in
+  bug #144417.
+
+  16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> tor-0.1.1.22.ebuild:
+  Add ~x86-fbsd keyword.
+
+*tor-0.1.1.22 (08 Jul 2006)
+
+  08 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +tor-0.1.1.22.ebuild:
+  Bump to 0.1.1.22. Closes bug # 138073.
+
+  05 Jun 2006; Simon Stelling <blubb@gentoo.org> tor-0.1.1.20.ebuild:
+  stable on amd64 wrt bug 134329
+
+  01 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.1.20.ebuild:
+  Stable on sparc wrt security #134329
+
+  01 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.1.20.ebuild:
+  ppc stable, bug #134329
+
+  01 Jun 2006; Markus Rothe <corsair@gentoo.org> tor-0.1.1.20.ebuild:
+  Stable on ppc64; bug #134329
+
+  01 Jun 2006; Joshua Jackson <tsunam@gentoo.org> tor-0.1.1.20.ebuild:
+  Stable on x86; security bug #134329
+
+*tor-0.1.1.20 (01 Jun 2006)
+
+  01 Jun 2006; Stefan Cornelius <dercorny@gentoo.org> +tor-0.1.1.20.ebuild:
+  Bumping to version 0.1.1.20 for security bugs #134329 and #118918
+
+  23 Apr 2006; Emanuele Giaquinta <exg@gentoo.org> tor-0.1.0.14-r1.ebuild,
+  tor-0.1.0.16.ebuild, tor-0.1.0.17.ebuild:
+  Move enew{group,user} in pkg_setup.
+
+*tor-0.1.0.17 (28 Feb 2006)
+
+  28 Feb 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +tor-0.1.0.17.ebuild:
+  Bump to 0.1.017. Credits go to Christian Mandery in bug #123530 for
+  reporting this.
+
+*tor-0.1.0.16 (04 Jan 2006)
+
+  04 Jan 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/torrc.sample-0.1.0.16.patch, +files/tor.confd, +files/tor.initd-r1,
+  +tor-0.1.0.16.ebuild:
+  Adding tor 1.0.16 to portage. Arch teams please dont mark stable as the new
+  chroot stuff needs serious testing.
+
+*tor-0.1.0.14-r1 (11 Sep 2005)
+
+  11 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
+  -tor-0.1.0.14.ebuild, +tor-0.1.0.14-r1.ebuild:
+  I was having some strange issues with sending signal 2 to tor. And we do not
+  need a SIGINT, a SIGTERM is fine.
+
+  06 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/torrc.sample.patch-00, -tor-0.0.9.10.ebuild:
+  Removing older version.
+
+  16 Aug 2005; Jason Wever <weeve@gentoo.org> tor-0.1.0.14.ebuild:
+  Stable on SPARC wrt security bug #102245.
+
+  15 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.1.0.14.ebuild:
+  Stable on ppc.
+
+  15 Aug 2005; Markus Rothe <corsair@gentoo.org> tor-0.1.0.14.ebuild:
+  Stable on ppc64 (bug #102245)
+
+*tor-0.1.0.14 (14 Aug 2005)
+
+  14 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/torrc.sample-0.1.0.14.patch, +tor-0.1.0.14.ebuild:
+  Adding new version as amd64 and x86 due to sec bug. See #102245
+
+  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on amd64.
+
+  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on sparc
+
+  21 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on ppc (#96320).
+
+  21 Jun 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on ppc64
+
+*tor-0.0.9.10 (16 Jun 2005)
+
+  16 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -tor-0.0.9.5.ebuild, -tor-0.0.9.6.ebuild, -tor-0.0.9.7.ebuild,
+  -tor-0.0.9.9.ebuild, +tor-0.0.9.10.ebuild:
+  Added version 0.9.0.10 that fixes a security bug, removed older versions
+  that were affected.
+
+  12 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
+  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild, tor-0.0.9.9.ebuild:
+  New HOMEPAGE, thanks to Matteo in bug #95754.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
+  Stable on ppc64
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.5.ebuild:
+  Stable on ppc.
+
+*tor-0.0.9.9 (25 Apr 2005)
+
+  25 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
+  tor-0.0.9.6.ebuild, +tor-0.0.9.9.ebuild:
+  Removing older versions and bumping to 0.9.9 .
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> tor-0.0.9.5.ebuild,
+  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild:
+  net-misc/tsocks -> net-proxy/tsocks
+
+  08 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.7.ebuild:
+  Keyworded ~sparc wrt #88305
+
+*tor-0.0.9.7 (01 Apr 2005)
+
+  01 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.7.ebuild:
+  Bumped
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #86993
+
+*tor-0.0.9.6 (25 Mar 2005)
+
+  25 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.6.ebuild:
+  Bumped to 0.0.9.6
+
+  23 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd:
+  Changed init script to send SIGINT at shutdown. May increase the shutdown time
+  of servers, but will close in a more clean way.
+
+  25 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -tor-0.0.9.4-r1.ebuild, -tor-0.0.9.4-r2.ebuild, tor-0.0.9.5.ebuild:
+  Marking latest as x86 and removing older versions.
+
+*tor-0.0.9.5 (23 Feb 2005)
+
+  23 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.0.9.4-r2.ebuild, +tor-0.0.9.5.ebuild:
+  Adding version 0.0.9.5 and marking 0.0.9.4-r2 as x86.
+
+*tor-0.0.9.4-r2 (13 Feb 2005)
+
+  13 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
+  +files/torrc.sample.patch-00, -tor-0.0.8.1.ebuild, -tor-0.0.9.1.ebuild,
+  -tor-0.0.9.2.ebuild, +tor-0.0.9.4-r2.ebuild, -tor-0.0.9.4.ebuild:
+  Adding new version that properly patches the sample config and deleting older
+  versions. Lost the stable ppc-macos but that arch is lagging way to much.
+
+*tor-0.0.9.4-r1 (10 Feb 2005)
+
+  10 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; +files/tor.initd,
+  +tor-0.0.9.4-r1.ebuild:
+  Using ideas in bug #75381 from Faustus <orlovm@cs.bgu.ac.il> and after talking
+  to latexer i'm commiting this version that can use a init.d script for easier
+  usage.
+
+*tor-0.0.9.4 (04 Feb 2005)
+
+  04 Feb 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.4.ebuild:
+  Bump.
+
+  09 Jan 2005; Marcus Hanwell <cryos@gentoo.org> tor-0.0.9.2.ebuild:
+  Marked ~amd64, closes bug 76780.
+
+*tor-0.0.9.2 (04 Jan 2005)
+
+  04 Jan 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.2.ebuild:
+  Bump.
+
+*tor-0.0.9.1 (16 Dec 2004)
+
+  16 Dec 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.1.ebuild:
+  Bump. Add tsocks dependancy, see bug #70879
+
+  20 Oct 2004; Peter Johanson <latexer@gentoo.org> -tor-0.0.6.1.ebuild,
+  -tor-0.0.6.ebuild, -tor-0.0.7.2.ebuild, -tor-0.0.7.3.ebuild,
+  -tor-0.0.7.ebuild:
+  Remove old vulnerable versions. See bug #67756
+
+  21 Oct 2004; Joseph Jezak <josejx@gentoo.org> tor-0.0.8.1.ebuild:
+  Keyworded ppc-macos and macos due to vulnerability in previous versions.
+  Removed tsocks RDEPEND at the request of latexer. See bug #67756
+
+*tor-0.0.8.1 (17 Oct 2004)
+
+  17 Oct 2004; <peter@gentoo.org> +tor-0.0.8.1.ebuild, -tor-0.0.8.ebuild:
+  Bump and remove 0.0.8 which is vulnerable to a remote DoS. See bug #67756.
+
+*tor-0.0.8 (06 Oct 2004)
+
+  06 Oct 2004; <peter@gentoo.org> tor-0.0.6.1.ebuild, tor-0.0.6.ebuild,
+  tor-0.0.7.2.ebuild, tor-0.0.7.3.ebuild, tor-0.0.7.ebuild, +tor-0.0.8.ebuild:
+  Bump. Also fix the license as this is really under 3-clause BSD.
+
+*tor-0.0.7.3 (15 Aug 2004)
+
+  15 Aug 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.3.ebuild:
+  Bump. Only needed for servers.
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  24 Jul 2004; Erik Swanson <erik@gentoo.org> tor-0.0.7.2.ebuild:
+  Added macos to KEYWORDS
+
+*tor-0.0.7.2 (15 Jul 2004)
+
+  15 Jul 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.2.ebuild:
+  Bump to latest version. tsocks is now a depend for everything but macos, since
+  tsocks no worky there.
+
+*tor-0.0.7 (07 Jun 2004)
+
+  07 Jun 2004; Peter Johanson,,, <peter@gentoo.org> tor-0.0.2_pre27.ebuild,
+  tor-0.0.5.ebuild, tor-0.0.6_rc1.ebuild, tor-0.0.7.ebuild:
+  Bump to lates release, and remove older versions.
+
+*tor-0.0.6.1 (06 May 2004)
+
+  06 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.1.ebuild:
+  Bump.
+
+  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
+  Adding back ~ppc, as dholm wants me to keep it around for future updates.
+
+*tor-0.0.6 (02 May 2004)
+
+  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
+  Bump to latest release.
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> tor-0.0.6_rc1.ebuild:
+  Added to ~ppc.
+
+*tor-0.0.6_rc1 (29 Apr 2004)
+
+  29 Apr 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6_rc1.ebuild:
+  Bump to latest. Beware, this version is not backwards compatible with older
+  versions.
+
+*tor-0.0.5 (30 Mar 2004)
+
+  30 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre21.ebuild,
+  tor-0.0.2_pre22.ebuild, tor-0.0.2_pre23.ebuild, tor-0.0.2_pre24.ebuild,
+  tor-0.0.2_pre25.ebuild, tor-0.0.5.ebuild:
+  Bump to latest release. Removed a bunch of the old stuff. Initscript coming
+  soon, i swear.
+
+*tor-0.0.2_pre27 (15 Mar 2004)
+
+  15 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre27.ebuild:
+  Bump.
+
+*tor-0.0.2_pre25 (04 Mar 2004)
+
+  04 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre25.ebuild:
+  Bump. Fixes a crash due to DNS stuff.
+
+*tor-0.0.2_pre24 (03 Mar 2004)
+
+  03 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre24.ebuild:
+  Bump
+
+*tor-0.0.2_pre23 (29 Feb 2004)
+
+  29 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre23.ebuild:
+  Bump
+
+*tor-0.0.2_pre22 (28 Feb 2004)
+
+  28 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre22.ebuild:
+  Bump
+
+*tor-0.0.2_pre21 (22 Feb 2004)
+
+  22 Feb 2004; Peter Johanson <latexer@gentoo.org> metadata.xml,
+  tor-0.0.2_pre21.ebuild:
+  Initial Commit. Ebuild by yours truly.
+

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
new file mode 100644
index 0000000..73491a9
--- /dev/null
+++ b/net-misc/tor/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
+AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
+AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c1819b24c0ab7940 SHA1 4400ed72fa60d04a96c82f0aba7c6eb41e23f5c5 SHA256 4500436719cb96a17bfd4eb67b2ebf2b1db222904bf1b14b75cc17b8f1b41345
+AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
+AUX tor.initd-r4 1566 RMD160 410611175c20425f48d340216ef680650bf6fa3d SHA1 dbdfd68db76871be8606d1196c0c2a7ba257aac0 SHA256 095334e62ee28d3346f84831015dc9c45f7224d8a6f3588974de7b26352e2824
+AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
+AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
+DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
+EBUILD tor-0.2.3.2_alpha-r2.ebuild 2741 RMD160 b4020ceffd81cf266652a5386c438e9eefcc17e8 SHA1 4fb5a1692842b8f44ad783c3042a0610de92c802 SHA256 09a3e77599d139f9ea35515f52df67ce3334c314260e9c4c0c7b7e148536d83d
+MISC ChangeLog 38845 RMD160 a7cb92c41384c22fe1ddd183a8b95e188472b82a SHA1 3a191ea9d74c9e66d1922ecf531811430e2e3503 SHA256 37e447abd554f792af889f2edf2c80e58d0f4efb02934351edcebffdd23669a6
+MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4ps7UACgkQl5yvQNBFVTUdqACgk+U30T4mgTfFbLq845tcaFv/
+uDwAoInlwLMVqELtqTxmoJ+57NMbHpNC
+=oWY5
+-----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
new file mode 100644
index 0000000..3eadcaa
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch
@@ -0,0 +1,28 @@
+* 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-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
new file mode 100644
index 0000000..86b797b
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
@@ -0,0 +1,24 @@
+diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
+--- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
++++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
+@@ -9,6 +9,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -971,6 +976,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch b/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch
new file mode 100644
index 0000000..75981d5
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch
@@ -0,0 +1,11 @@
+diff --git a/tor-0.2.3.2-alpha.orig/src/tools/tor-fw-helper/Makefile.am b/tor-0.2.3.2-alpha/src/tools/tor-fw-helper/Makefile.am
+index 75878f2..77ff63f 100644
+--- a/tor-0.2.3.2-alpha.orig/src/tools/tor-fw-helper/Makefile.am
++++ b/tor-0.2.3.2-alpha/src/tools/tor-fw-helper/Makefile.am
+@@ -34,5 +34,5 @@ miniupnpc_cppflags =
+ endif
+ 
+ tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags)
+-tor_fw_helper_LDADD = $(nat_pmp_ldadd) $(miniupnpc_ldadd) ../../common/libor.a @TOR_LIB_WS32@
++tor_fw_helper_LDADD = ../../common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) @TOR_LIB_WS32@
+ tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags)

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
new file mode 100644
index 0000000..4195bf3
--- /dev/null
+++ b/net-misc/tor/files/tor.confd
@@ -0,0 +1,3 @@
+#
+# Set the file limit
+rc_ulimit="-n 30000"

diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4
new file mode 100644
index 0000000..c95ef19
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -0,0 +1,57 @@
+#!/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
new file mode 100644
index 0000000..dc2dea3
--- /dev/null
+++ b/net-misc/tor/files/torrc
@@ -0,0 +1,8 @@
+#
+# Minimal torrc so tor will work out of the box
+#
+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
new file mode 100644
index 0000000..7317552
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch
@@ -0,0 +1,30 @@
+--- 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.

diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
new file mode 100644
index 0000000..4d8f7a1
--- /dev/null
+++ b/net-misc/tor/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer>
+		<email>chiiph@gentoo.org</email>
+		<name>Tomás Touceda</name>
+	</maintainer>
+	<use>
+		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
+		<flag name='transparent-proxy'>Enable transparent proxying</flag>
+		<flag name='bufferevents'>Use Libevent's buffered IO</flag>
+		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
+		<flag name='upnp'>Enable Universal Plug and Play</flag>
+	</use>
+</pkgmetadata>

diff --git a/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild b/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild
new file mode 100644
index 0000000..6b562df
--- /dev/null
+++ b/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.2_alpha-r1.ebuild,v 1.1 2011/07/21 14:20:02 blueness Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0
+	nat-pmp? ( net-libs/libnatpmp )
+	upnp? ( net-libs/miniupnpc )"
+
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3.2_alpha-fix-asneeded.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+	econf --docdir=/usr/share/doc/${PF}				\
+		$(use_enable bufferevents)					\
+		$(use_enable doc asciidoc)					\
+		$(use_enable nat-pmp)						\
+		$(use_enable tor-hardening gcc-hardening)	\
+		$(use_enable tor-hardening linker-hardening)\
+		$(use_enable transparent-proxy transparent)	\
+		$(use_enable threads)						\
+		$(use_enable upnp)
+}
+
+src_install() {
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/README
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	insinto /etc/tor/
+	doins "${FILESDIR}"/torrc
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-07-23 11:29 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-07-23 11:29 UTC (permalink / raw
  To: gentoo-commits

commit:     9a054dd852851e53972fed2170d3a92a30df95be
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 11:28:58 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 11:28:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=9a054dd8

net-misc/tor: moved to tree

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

---
 net-misc/tor/ChangeLog                             | 1136 --------------------
 net-misc/tor/Manifest                              |   21 -
 net-misc/tor/files/tor-0.2.1.19-logrotate.patch    |   28 -
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 -
 .../tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch |   11 -
 net-misc/tor/files/tor.confd                       |    3 -
 net-misc/tor/files/tor.initd-r4                    |   57 -
 net-misc/tor/files/torrc                           |    8 -
 net-misc/tor/files/torrc.sample-0.1.2.6.patch      |   30 -
 net-misc/tor/metadata.xml                          |   20 -
 net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild           |   92 --
 11 files changed, 0 insertions(+), 1430 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
deleted file mode 100644
index 66618c1..0000000
--- a/net-misc/tor/ChangeLog
+++ /dev/null
@@ -1,1136 +0,0 @@
-# ChangeLog for net-misc/tor
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.262 2011/07/21 14:20:02 blueness Exp $
-
-*tor-0.2.3.2_alpha-r2 (22 Jul 2011)
-
-  22 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch,
-  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.3.2_alpha-r2.ebuild,
-  +files/tor-0.2.3.2_alpha-fix-asneeded.patch, +files/tor.confd,
-  +files/tor.initd-r4, +files/torrc, +metadata.xml:
-  Fixes bug #375955
-
-*tor-0.2.3.2_alpha-r1 (21 Jul 2011)
-*tor-0.2.2.30_rc-r1 (21 Jul 2011)
-
-  21 Jul 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml,
-  +tor-0.2.2.30_rc-r1.ebuild, +tor-0.2.3.2_alpha-r1.ebuild:
-  Removed automatic configuration of features
-
-*tor-0.2.2.30_rc (19 Jul 2011)
-
-  19 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.29_beta.ebuild, +tor-0.2.2.30_rc.ebuild:
-  Beta bumped to first rc and removed deprecated
-
-*tor-0.2.3.2_alpha (19 Jul 2011)
-
-  19 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.3.1_alpha-r1.ebuild, +tor-0.2.3.2_alpha.ebuild:
-  Bumped alpha and removed deprecated
-
-*tor-0.2.2.29_beta (21 Jun 2011)
-
-  21 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.28_beta.ebuild, +tor-0.2.2.29_beta.ebuild:
-  Version bump beta, removed deprecated
-
-*tor-0.2.2.28_beta (10 Jun 2011)
-
-  10 Jun 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.30-r1.ebuild,
-  -tor-0.2.2.27_beta-r1.ebuild, +tor-0.2.2.28_beta.ebuild:
-  Version bump beta, and removed deprecated
-
-*tor-0.2.3.1_alpha-r1 (07 Jun 2011)
-*tor-0.2.2.27_beta-r1 (07 Jun 2011)
-
-  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.27_beta.ebuild, +tor-0.2.2.27_beta-r1.ebuild,
-  -tor-0.2.3.1_alpha.ebuild, +tor-0.2.3.1_alpha-r1.ebuild:
-  Forward ported rc_ulimit fix to beta and alpha, see bug #268396, comment #19
-
-*tor-0.2.1.30-r2 (07 Jun 2011)
-
-  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.30-r2.ebuild,
-  +files/tor.confd:
-  Use rc_ulimit to set file limit, see bug #268396, comment #19
-
-*tor-0.2.2.27_beta (30 May 2011)
-
-  30 May 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.25_alpha.ebuild, +tor-0.2.2.27_beta.ebuild:
-  Version bump and removed deprecated
-
-*tor-0.2.3.1_alpha (08 May 2011)
-
-  08 May 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.24_alpha.ebuild, +tor-0.2.3.1_alpha.ebuild:
-  Added new alpha 0.2.3.1 and removed older alpha 0.2.2.24
-
-  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.23_alpha.ebuild, -tor-0.2.2.23_alpha-r1.ebuild,
-  -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
-  Removed deprecated alpha
-
-*tor-0.2.2.25_alpha (29 Apr 2011)
-
-  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.25_alpha.ebuild:
-  Version bump
-
-*tor-0.2.2.24_alpha (18 Apr 2011)
-
-  18 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.24_alpha.ebuild,
-  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch:
-  Version bump
-
-*tor-0.2.1.30-r1 (10 Apr 2011)
-
-  10 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch,
-  files/torrc:
-  Backport of improved build system, see bug #360765
-
-  02 Apr 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.29.ebuild,
-  -tor-0.2.1.29-r1.ebuild:
-  Removed vulnerable versions, bug #359789
-
-  02 Apr 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.30.ebuild:
-  arm/sparc stable wrt #359789
-
-  28 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
-  Improved fix to build system, see bug #360765
-
-*tor-0.2.2.23_alpha-r1 (25 Mar 2011)
-
-  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.23_alpha-r1.ebuild,
-  +files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
-  Fixed build system to fully respect CFLAGS
-
-  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  tor-0.2.2.23_alpha.ebuild:
-  Removed superfluous USE flag
-
-  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.22_alpha-r1.ebuild:
-  Removed outdated alpha
-
-  22 Mar 2011; Thomas Kahle <tomka@gentoo.org> tor-0.2.1.30.ebuild:
-  x86 stable per bug 359789
-
-  21 Mar 2011; Christoph Mende <angelos@gentoo.org> tor-0.2.1.30.ebuild:
-  Stable on amd64 wrt bug #359789
-
-  21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> tor-0.2.1.30.ebuild:
-  ppc/ppc64 stable wrt #359789
-
-*tor-0.2.2.23_alpha (11 Mar 2011)
-
-  11 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.23_alpha.ebuild:
-  Version bump on alpha and removal of deprecated vesion.
-
-  27 Feb 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.29.ebuild:
-  Reverted removal of only stable ebuild on most arches.
-
-*tor-0.2.1.30 (27 Feb 2011)
-
-  27 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.1.29.ebuild,
-  +tor-0.2.1.30.ebuild:
-  Version bump and clean up.
-
-  12 Feb 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29-r1.ebuild:
-  sparc stable wrt #351920
-
-*tor-0.2.2.22_alpha-r1 (10 Feb 2011)
-
-  10 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.22_alpha.ebuild, +tor-0.2.2.22_alpha-r1.ebuild:
-  Added /etc/tor/torrc for alpha.
-
-*tor-0.2.1.29-r1 (09 Feb 2011)
-
-  09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.1.29-r1.ebuild, +files/torrc:
-  Added /etc/tor/torrc so tor works out of the box.
-
-*tor-0.2.2.22_alpha (01 Feb 2011)
-
-  01 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.2.21_alpha.ebuild,
-  +tor-0.2.2.22_alpha.ebuild:
-  Version bump on alpha and cleanup.
-
-  24 Jan 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.28.ebuild:
-  Removed vulnerable version, see bug #351920
-
-  24 Jan 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29.ebuild:
-  sparc stable
-
-  23 Jan 2011; Markus Meier <maekke@gentoo.org> tor-0.2.1.29.ebuild:
-  arm stable, bug #351920
-
-  18 Jan 2011; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.29.ebuild:
-  stable x86, security bug 351920
-
-  17 Jan 2011; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.29.ebuild:
-  Stable on amd64 wrt bug #351920
-
-  17 Jan 2011; <xarth@gentoo.org> tor-0.2.1.29.ebuild:
-  ppc/ppc64 stable wrt #351920
-
-*tor-0.2.2.21_alpha (17 Jan 2011)
-*tor-0.2.1.29 (17 Jan 2011)
-
-  17 Jan 2011; Tomas Touceda <chiiph@gentoo.org> +tor-0.2.1.29.ebuild,
-  -tor-0.2.2.20_alpha.ebuild, +tor-0.2.2.21_alpha.ebuild:
-  Versiom bump. Clean old alpha.
-
-*tor-0.2.2.20_alpha (10 Jan 2011)
-
-  10 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.20_alpha.ebuild:
-  added alpha branch
-
-  07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.25.ebuild,
-  -tor-0.2.1.26.ebuild, -tor-0.2.1.27.ebuild:
-  clean up vulnerable versions
-
-  07 Jan 2011; Brent Baude <ranger@gentoo.org> tor-0.2.1.28.ebuild:
-  Marking tor-0.2.1.28 ppc for bug 349312
-
-  06 Jan 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
-  Removed fauli and added chiiph as maintainer
-
-  06 Jan 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
-  Added myself as maintainer
-
-  27 Dec 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.28.ebuild:
-  Marking tor-0.2.1.28 ppc64 for bug 349312
-
-  26 Dec 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.28.ebuild:
-  arm/sparc stable wrt #349312
-
-  26 Dec 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.28.ebuild:
-  Stable on amd64 wrt bug #349312
-
-  25 Dec 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.28.ebuild:
-  stable x86, security bug 349312
-
-*tor-0.2.1.28 (23 Dec 2010)
-
-  23 Dec 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.28.ebuild:
-  bump for security bug 349312
-
-  08 Dec 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.27.ebuild:
-  arm stable, bug #346759
-
-  03 Dec 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.27.ebuild:
-  request USE=tordns on net-proxy/tsocks to raise level of anonymity
-
-  28 Nov 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.27.ebuild:
-  Stable on amd64 wrt bug #346759
-
-*tor-0.2.1.27 (25 Nov 2010)
-
-  25 Nov 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.27.ebuild:
-  version bump, fixes OpenSSL issues, see bug 346715
-
-  14 Oct 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.26.ebuild:
-  stable ppc, bug 329879
-
-  30 Sep 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.25.ebuild:
-  stable ppc64, bug 309873
-
-  18 Sep 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.26.ebuild:
-  sparc stable wrt #329879
-
-  18 Aug 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.26.ebuild:
-  arm stable, bug #329879
-
-  30 Jul 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.26.ebuild:
-  Stable on amd64 wrt bug #329879
-
-  26 Jul 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.26.ebuild:
-  stable x86, bug 329879
-
-*tor-0.2.1.26 (24 Jun 2010)
-
-  24 Jun 2010; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.22.ebuild,
-  +tor-0.2.1.26.ebuild:
-  version bump for bug 325243 by Michael <gentoo AT scribeofthenile DOT
-  com>, and clean up
-
-  06 Jun 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.25.ebuild:
-  arm stable wrt #300830
-
-  23 May 2010; Pacho Ramos <pacho@gentoo.org> tor-0.2.1.25.ebuild:
-  stable amd64, bug 309873
-
-  22 May 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
-  Remove humpback from metadata.xml (#34793)
-
-  17 Apr 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.22.ebuild,
-  tor-0.2.1.25.ebuild:
-  Add ~arm wrt #300830
-
-  05 Apr 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.25.ebuild:
-  sparc stable wrt #309873
-
-  24 Mar 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.25.ebuild:
-  stable ppc, bug 309873
-
-  24 Mar 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.25.ebuild:
-  stable x86, bug 309873
-
-  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
-  -tor-0.2.1.19-r2.ebuild, -files/tor-0.2.1.19-openssl.patch,
-  -tor-0.2.1.20-r1.ebuild, -tor-0.2.1.21.ebuild:
-  clean up
-
-*tor-0.2.1.25 (23 Mar 2010)
-
-  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.25.ebuild:
-  version bump
-
-  10 Feb 2010; Joseph Jezak <josejx@gentoo.org> tor-0.2.1.22.ebuild:
-  Marked ppc stable for bug #301701.
-
-  01 Feb 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.22.ebuild:
-  amd64 stable, bug #301701
-
-  30 Jan 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.22.ebuild:
-  sparc stable wrt #301701
-
-  22 Jan 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.22.ebuild:
-  Marking tor-0.2.1.22 ppc64 for bug 301701
-
-  22 Jan 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.22.ebuild:
-  stable x86, bug 301701
-
-*tor-0.2.1.22 (22 Jan 2010)
-
-  22 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.22.ebuild:
-  version bump for security bug 301701
-
-*tor-0.2.1.21 (16 Jan 2010)
-
-  16 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.21.ebuild:
-  version bump, bug 301169 by Tim O'Kelly <bugs_gentoo_org DOT Tim_OKelly AT
-  neverbox DOT org>
-
-  27 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
-  -files/tor-0.2.0.30-logrotate.patch,
-  -files/tor-0.2.0.33-no-internal-libevent.patch, -tor-0.2.0.35.ebuild,
-  -tor-0.2.1.19.ebuild, -tor-0.2.1.19-r1.ebuild:
-  clean up
-
-  26 Dec 2009; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.19-r2.ebuild:
-  sparc stable wrt #294297
-
-  08 Dec 2009; Brent Baude <ranger@gentoo.org> tor-0.2.1.19-r2.ebuild:
-  Marking tor-0.2.1.19-r2 ppc64 for bug 294297
-
-*tor-0.2.1.20-r1 (06 Dec 2009)
-
-  06 Dec 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.20.ebuild,
-  +tor-0.2.1.20-r1.ebuild:
-  reintroduce OpenSSL patch for bug 292661
-
-*tor-0.2.1.20 (02 Dec 2009)
-
-  02 Dec 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.20.ebuild:
-  version bump
-
-  25 Nov 2009; Markus Meier <maekke@gentoo.org> tor-0.2.1.19-r2.ebuild:
-  amd64 stable, bug #294297
-
-  24 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
-  tor-0.2.1.19-r2.ebuild:
-  stable x86, bug 294297
-
-  21 Nov 2009; nixnut <nixnut@gentoo.org> tor-0.2.1.19-r2.ebuild:
-  ppc stable #292022
-
-*tor-0.2.1.19-r2 (12 Nov 2009)
-
-  12 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
-  +tor-0.2.1.19-r2.ebuild, +files/tor-0.2.1.19-openssl.patch:
-  fix bug 2926611, patch discovered by Aidan Marks <aidan AT cisco DOT com>
-
-  07 Sep 2009; Christian Faulhammer <fauli@gentoo.org> files/tor.initd-r4:
-  respect CONFFILE variable in start calls, reported by Iome <frodone AT
-  gmail DOT com> in bug 283524
-
-*tor-0.2.1.19-r1 (17 Aug 2009)
-
-  17 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
-  +tor-0.2.1.19-r1.ebuild, +files/tor-0.2.1.19-logrotate.patch:
-  fix logrotate support as provided by Martin von Gagern <Martin AT vGagern
-  AT gmx DOT net> in bug 281439
-
-  06 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
-  -tor-0.2.1.16_rc.ebuild:
-  clean up release candidate
-
-*tor-0.2.1.19 (06 Aug 2009)
-
-  06 Aug 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.19.ebuild:
-  version bump
-
-  14 Jul 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.34.ebuild:
-  remove vulnerable version
-
-  12 Jul 2009; Joseph Jezak <josejx@gentoo.org> tor-0.2.0.35.ebuild:
-  Marked ppc stable for bug #275628.
-
-  30 Jun 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.35.ebuild:
-  Marking tor-0.2.0.35 ppc64 for bug 275628
-
-  30 Jun 2009; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.35.ebuild:
-  sparc stable wrt #275628
-
-  29 Jun 2009; Christian Faulhammer <fauli@gentoo.org> tor-0.2.0.34.ebuild,
-  tor-0.2.0.35.ebuild, tor-0.2.1.16_rc.ebuild:
-  fix HOMEPAGE entries
-
-  29 Jun 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.35.ebuild:
-  amd64 stable, bug #275628
-
-*tor-0.2.1.16_rc (29 Jun 2009)
-
-  29 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  -tor-0.2.1.15_rc.ebuild, +tor-0.2.1.16_rc.ebuild:
-  extend version bump for security bug 275628 and remove one vulnerable
-  version
-
-*tor-0.2.0.35 (28 Jun 2009)
-
-  28 Jun 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.35.ebuild:
-  version bump for security bug 275628, directly stable for x86
-
-  17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  tor-0.2.1.15_rc.ebuild:
-  remove all occurences of USE=bundledlibevent
-
-*tor-0.2.1.15_rc (17 Jun 2009)
-
-  17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  +tor-0.2.1.15_rc.ebuild:
-  add release candidate for 0.2.1 series
-
-  12 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  files/torrc.sample-0.1.2.6.patch, +tor-0.2.0.34.ebuild,
-  -tor-0.2.0.34-r2.ebuild, +files/tor.initd-r4, -files/tor.initd-r6:
-  revert all my changes for bug 268396 as they will break badly with
-  Baselayout 1, see bug 272527
-
-*tor-0.2.0.34-r2 (03 Jun 2009)
-
-  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org> -files/tor.initd-r5,
-  +files/tor.initd-r6, -tor-0.2.0.34-r1.ebuild, +tor-0.2.0.34-r2.ebuild:
-  revision bump to make it compatible with Baselayout 1, as reported by
-  Stanislav Cymbalov <DummyUnit AT gmail.com> in bug 272404
-
-*tor-0.2.0.34-r1 (03 Jun 2009)
-
-  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  files/torrc.sample-0.1.2.6.patch, -files/tor.initd-r4,
-  +files/tor.initd-r5, -tor-0.2.0.34.ebuild, +tor-0.2.0.34-r1.ebuild:
-  Really respect limits from /etc/limits.d/ by some tweaks: moving user
-  context switch from torrc to init script, including verification of config
-  file in the latter; fixes bug 268396 by W. Elschner <gentoobugzilla_reply AT
-  elschner DOT net>
-
-  19 Feb 2009; nixnut <nixnut@gentoo.org> tor-0.2.0.34.ebuild:
-  ppc stable
-
-  18 Feb 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.33.ebuild:
-  clean up vulnerable versions
-
-  15 Feb 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.34.ebuild:
-  amd64/x86 stable, bug #258833
-
-  13 Feb 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.34.ebuild:
-  Marking tor-0.2.0.34 ppc64 for bug 258833
-
-  13 Feb 2009; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.34.ebuild:
-  Sparc stable --- Security Bug #258833 --- tests good.
-
-*tor-0.2.0.34 (13 Feb 2009)
-
-  13 Feb 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.34.ebuild:
-  version bump for security bug 258833, reported by Jesse Adelman <jesse AT
-  boldandbusted DOT com>
-
-  08 Feb 2009; Christian Faulhammer <fauli@gentoo.org> tor-0.2.0.33.ebuild:
-  kill logrotate USE flag as requested by bangert on bug 258188
-
-  05 Feb 2009; Christian Faulhammer <fauli@gentoo.org>
-  +files/tor-0.2.0.33-no-internal-libevent.patch, metadata.xml,
-  tor-0.2.0.33.ebuild:
-  make use of bundled libevent async DNS part optional via USE=flag, this
-  should fix bug 206969
-
-  26 Jan 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.32.ebuild,
-  -tor-0.2.0.32-r1.ebuild:
-  clean up
-
-  25 Jan 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.33.ebuild:
-  amd64/x86 stable, bug #256078
-
-  24 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.2.0.33.ebuild:
-  ppc stable, bug #256078
-
-  24 Jan 2009; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.33.ebuild:
-  Sparc stable, Security Bug #256078.
-
-  24 Jan 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.33.ebuild:
-  Marking tor-0.2.0.33 ppc64 for bug 256078
-
-*tor-0.2.0.33 (24 Jan 2009)
-
-  24 Jan 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.33.ebuild:
-  version bump for security bug 256078
-
-*tor-0.2.0.32-r1 (21 Dec 2008)
-
-  21 Dec 2008; Christian Faulhammer <fauli@gentoo.org> +files/tor.conf,
-  +tor-0.2.0.32-r1.ebuild:
-  install limits file so tor can open more files on the system than normally
-  allowed, this fixes bug 251171 reported by candrews AT integralblue DOT
-  com
-
-  10 Dec 2008; Christian Faulhammer <fauli@gentoo.org>
-  -files/tor-0.2.0.31-sparc.patch, -tor-0.2.0.31-r1.ebuild:
-  clean up
-
-  09 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> tor-0.2.0.32.ebuild:
-  Stable on sparc, security bug #250018
-
-  08 Dec 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.32.ebuild:
-  Marking tor-0.2.0.32 ppc64 for bug 250018
-
-  08 Dec 2008; Markus Meier <maekke@gentoo.org> tor-0.2.0.32.ebuild:
-  x86 stable, bug #250018
-
-  07 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.2.0.32.ebuild:
-  ppc stable, bug #250018
-
-  07 Dec 2008; Richard Freeman <rich0@gentoo.org> tor-0.2.0.32.ebuild:
-  amd64 stable - 250018
-
-*tor-0.2.0.32 (06 Dec 2008)
-
-  06 Dec 2008; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.32.ebuild:
-  version bump for security bug 250018
-
-  28 Nov 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
-  Change my email address
-
-  22 Nov 2008; Christian Faulhammer <opfer@gentoo.org>
-  -tor-0.2.0.30-r1.ebuild, -tor-0.2.0.31.ebuild, tor-0.2.0.31-r1.ebuild:
-  clean up and add stable KEYWORDS for -r1
-
-  22 Nov 2008; Markus Meier <maekke@gentoo.org> tor-0.2.0.31.ebuild:
-  amd64 stable, bug #244679
-
-  14 Nov 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.31.ebuild,
-  tor-0.2.0.31-r1.ebuild:
-  Address sparc alignment problems reported in Bug #246483 --- this fixes them
-  but is untested on anything else.
-
-*tor-0.2.0.31-r1 (14 Nov 2008)
-
-  14 Nov 2008; Ferris McCormick <fmccor@gentoo.org>
-  +files/tor-0.2.0.31-sparc.patch, +tor-0.2.0.31-r1.ebuild:
-  Add new version to address sparc alignment problem, Bug #246483 which see
-  for details.
-
-  01 Nov 2008; nixnut <nixnut@gentoo.org> tor-0.2.0.31.ebuild:
-  Stable on ppc wrt bug 244679
-
-  30 Oct 2008; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.31.ebuild:
-  x86 stable #244679
-
-  28 Oct 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.31.ebuild:
-  Sparc stable, Bug #244679.
-
-  27 Oct 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.31.ebuild:
-  stable ppc64, bug 244679
-
-*tor-0.2.0.31 (26 Sep 2008)
-
-  26 Sep 2008; Christian Faulhammer <opfer@gentoo.org> +tor-0.2.0.31.ebuild:
-  version bump for bug 238787
-
-  06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> files/tor.initd-r4:
-  remove bashisms from init file, as reported in bug 236857 by Martin Väth
-  <vaeth AT mathematik DOT uni-wuerzburg DOT de>
-
-  06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r3,
-  -files/tor.logrotate.patch, -tor-0.1.2.19-r2.ebuild, -tor-0.2.0.30.ebuild:
-  clean up
-
-  06 Sep 2008; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  x86 stable wrt #236536
-
-  06 Sep 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  stable ppc64, bug 236536
-
-  06 Sep 2008; Richard Freeman <rich0@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  amd64 stable - 236536
-
-  04 Sep 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  stable ppc, bug 236536
-
-  03 Sep 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  Sparc stable --- Bug #236536 --- test suite passes.
-
-*tor-0.2.0.30-r1 (03 Sep 2008)
-
-  03 Sep 2008; Christian Faulhammer <opfer@gentoo.org> +files/tor.initd-r4,
-  +tor-0.2.0.30-r1.ebuild:
-  update init script to prevent runtime failures as reported in bug 235208
-
-*tor-0.2.0.30 (03 Aug 2008)
-
-  03 Aug 2008; Christian Faulhammer <opfer@gentoo.org>
-  +files/tor-0.2.0.30-logrotate.patch, +tor-0.2.0.30.ebuild:
-  version bump for bug 233612 by puchu <rauchwolke AT gmx DOT net>
-
-  29 May 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.19.ebuild:
-  clean up
-
-  29 May 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.19-r2.ebuild:
-  sparc stable wrt #223705, thanks to Friedrich Oslage for testing
-
-  28 May 2008; Peter Volkov <pva@gentoo.org> tor-0.1.2.19-r2.ebuild:
-  amd64 stable, bug #223705.
-
-  27 May 2008; Markus Rothe <corsair@gentoo.org> tor-0.1.2.19-r2.ebuild:
-  Stable on ppc64; bug #223705
-
-  26 May 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.19-r2.ebuild:
-  Stable on ppc wrt bug 223705
-
-  26 May 2008; Christian Faulhammer <opfer@gentoo.org>
-  tor-0.1.2.19-r2.ebuild:
-  stable x86, bug 223705
-
-*tor-0.1.2.19-r2 (29 Apr 2008)
-
-  29 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
-  -tor-0.1.2.19-r1.ebuild, +tor-0.1.2.19-r2.ebuild:
-  logrotate should now really work again
-
-*tor-0.1.2.19-r1 (25 Apr 2008)
-
-  25 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
-  +tor-0.1.2.19-r1.ebuild:
-  create the logrotate file with the correct permissions as pointed out on bug
-  216298 by Serge Koksharov <gentoosiast AT yandex DOT ru>
-
-  05 Mar 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.18.ebuild:
-  clean up
-
-  04 Mar 2008; Richard Freeman <rich0@gentoo.org> tor-0.1.2.19.ebuild:
-  amd64 stable - 211021
-
-  04 Mar 2008; Brent Baude <ranger@gentoo.org> tor-0.1.2.19.ebuild:
-  stable ppc64, bug 211021
-
-  03 Mar 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.19.ebuild:
-  sparc stable wrt #211021
-
-  02 Mar 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.19.ebuild:
-  Stable on ppc wrt bug 211021
-
-  01 Mar 2008; Christian Faulhammer <opfer@gentoo.org> metadata.xml:
-  adding myself to metadata.xml
-
-  01 Mar 2008; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.19.ebuild:
-  stable x86, bug 211021
-
-  07 Feb 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r2,
-  -tor-0.1.2.17.ebuild:
-  clean up
-
-  07 Feb 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.18.ebuild:
-  sparc stable wrt #208336
-
-  06 Feb 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.18.ebuild:
-  stable on ppc wrt bug #208336
-
-  02 Feb 2008; Richard Freeman <rich0@gentoo.org> tor-0.1.2.18.ebuild:
-  amd64 stable - #208336
-
-  31 Jan 2008; Brent Baude <ranger@gentoo.org> tor-0.1.2.18.ebuild:
-  Marking tor-0.1.2.18 ppc64 stable for bug 208336
-
-  31 Jan 2008; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.18.ebuild:
-  stable x86, bug 208336
-
-*tor-0.1.2.19 (31 Jan 2008)
-
-  31 Jan 2008; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.19.ebuild:
-  version bump
-
-*tor-0.1.2.18 (03 Jan 2008)
-
-  03 Jan 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.16.ebuild,
-  -tor-0.1.2.16-r1.ebuild, +tor-0.1.2.18.ebuild:
-  version bump (bug 199818) and clean up
-
-  03 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.2.17.ebuild:
-  ppc stable, bug #190968
-
-  02 Sep 2007; Jose Luis Rivero <yoswink@gentoo.org> tor-0.1.2.17.ebuild:
-  Stable on sparc wrt security bug #190968
-
-  02 Sep 2007; Markus Rothe <corsair@gentoo.org> tor-0.1.2.17.ebuild:
-  Stable on ppc64; bug #190968
-
-  02 Sep 2007; Christoph Mende <angelos@gentoo.org> tor-0.1.2.17.ebuild:
-  Stable on amd64 wrt security bug #190968
-
-*tor-0.1.2.17 (02 Sep 2007)
-
-  02 Sep 2007; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.17.ebuild:
-  version bump and stable x86, security bug 190968
-
-  29 Aug 2007; Gustavo Felisberto <humpback@gentoo.org> files/tor.initd-r3:
-  Adding correct init script.
-
-*tor-0.1.2.16-r1 (28 Aug 2007)
-
-  28 Aug 2007; Gustavo Felisberto <humpback@gentoo.org>
-  -files/torrc.sample-0.1.0.16.patch, -files/torrc.sample-0.1.1.23.patch,
-  -files/tor.confd, -files/tor.initd, -files/tor.initd-r1,
-  +files/tor.initd-r3, -tor-0.1.1.23.ebuild, -tor-0.1.1.26.ebuild,
-  -tor-0.1.2.14.ebuild, +tor-0.1.2.16-r1.ebuild:
-  Removed older versions and dangled files. Fixed bug with init with
-  baselayout-2 closes 189724. Thanks to Christian Faulhammer (opfer) for the
-  fix.
-
-  09 Aug 2007; Robert Buchholz <rbu@gentoo.org> tor-0.1.2.16.ebuild:
-  Stable on amd64 (bug #186644)
-
-  06 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.2.16.ebuild:
-  Stable on sparc wrt security #186644
-
-  04 Aug 2007; Markus Rothe <corsair@gentoo.org> tor-0.1.2.16.ebuild:
-  Stable on ppc64; bug #186644
-
-  04 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.2.16.ebuild:
-  ppc stable, bug #186644
-
-  03 Aug 2007; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.16.ebuild:
-  stable x86, security bug 186644
-
-*tor-0.1.2.16 (03 Aug 2007)
-
-  03 Aug 2007; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.16.ebuild:
-  version bump, for security bug 186644
-
-  02 Jun 2007; René Nussbaumer <killerfox@gentoo.org> tor-0.1.2.14.ebuild:
-  Stable on ppc. See bug #180139.
-
-  31 May 2007; Christoph Mende <angelos@gentoo.org> tor-0.1.2.14.ebuild:
-  Stable on amd64 wrt security bug 180139
-
-  31 May 2007; Brent Baude <ranger@gentoo.org> tor-0.1.2.14.ebuild:
-  Marking tor-0.1.2.14 ppc64 stable for bug#180139
-
-  31 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.2.14.ebuild:
-  Stable on sparc wrt security #180139
-
-  31 May 2007; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.14.ebuild:
-  stable x86, security bug 180139
-
-*tor-0.1.2.14 (31 May 2007)
-
-  31 May 2007; <humpback@gentoo.org> -tor-0.1.0.18.ebuild,
-  -tor-0.1.0.18-r1.ebuild, -tor-0.1.2.13.ebuild, +tor-0.1.2.14.ebuild:
-  Bumped 0.1.2.13 to 0.1.2.14, removed older versions. Fixed #178975 with idea 
-  from Remy Blank
-
-  15 May 2007; <humpback@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.0.18-r1.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.26.ebuild,
-  tor-0.1.2.13.ebuild:
-  Added keepdir. Close Bug #177590.
-
-  15 May 2007; <humpback@gentoo.org> tor-0.1.1.23.ebuild,
-  tor-0.1.1.26.ebuild:
-  Fixed missing RDEP's. Close Bug #174185.
-
-*tor-0.1.2.13 (15 May 2007)
-
-  15 May 2007; <humpback@gentoo.org> +files/tor.initd-r2,
-  -tor-0.1.2.6_alpha.ebuild, +tor-0.1.2.13.ebuild:
-  Removed alpha 1.2 release and added a bump. Help from all in bug #176018,
-  specially jakub, was very much apretiated.
-
-  29 Apr 2007; Torsten Veller <tove@gentoo.org> tor-0.1.1.23.ebuild,
-  tor-0.1.1.26.ebuild, tor-0.1.2.6_alpha.ebuild:
-  Fix *initd, *confd and *envd calls (#173884, #174266)
-
-*tor-0.1.2.6_alpha (27 Jan 2007)
-
-  27 Jan 2007; Gustavo Felisberto <humpback@gentoo.org>;
-  +files/torrc.sample-0.1.2.6.patch, +tor-0.1.2.6_alpha.ebuild:
-  Added alpha release of tor at request from Flameeyes. It seems tork needs
-  it. As always, if it is masked and you install and destroy your system dont
-  come complain alot.
-
-*tor-0.1.1.26 (18 Dec 2006)
-
-  18 Dec 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  -tor-0.1.1.24.ebuild, +tor-0.1.1.26.ebuild:
-  Bumped to 0.1.1.26 and removed older version.
-
-*tor-0.1.0.18-r1 (22 Oct 2006)
-
-  22 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  tor-0.1.0.18.ebuild, +tor-0.1.0.18-r1.ebuild:
-  Small configuration issue in the chroot. Fixes bug #139354.
-
-  21 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.24.ebuild:
-  Added ewarn about the needed dot in the privoxy integration. Closes bug
-  #152137.
-
-*tor-0.1.1.24 (09 Oct 2006)
-
-  09 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +tor-0.1.1.24.ebuild:
-  Bump from 0.1.1.23
-
-  11 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  tor-0.1.0.18.ebuild:
-  Changed einfo about configuration of chroot. Removes tor from bug #140371
-
-  05 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  -files/torrc.sample-0.1.0.14.patch, -tor-0.1.0.14-r1.ebuild,
-  -tor-0.1.0.16.ebuild, -tor-0.1.0.17.ebuild, -tor-0.1.1.20.ebuild,
-  -tor-0.1.1.22.ebuild:
-  Removed older version that had sec issues.
-
-  30 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.1.23.ebuild:
-  Stable on sparc wrt security #145458
-
-  30 Aug 2006; <blubb@gentoo.org> tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild:
-  stable on amd64 wrt bug 145458
-
-  30 Aug 2006; Joshua Jackson <tsunam@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.1.23.ebuild:
-  Stable x86; security bug #145458
-
-  29 Aug 2006; Markus Rothe <corsair@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.1.23.ebuild:
-  Stable on ppc64; bug #145458
-
-  29 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.1.23.ebuild:
-  ppc stable, bug #145458
-
-*tor-0.1.0.18 (29 Aug 2006)
-
-  29 Aug 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +tor-0.1.0.18.ebuild:
-  Adding 0.1.0.18 that fixes sec issue in the 0.1.0.* series. The 0.1.1.23 is
-  not affected.
-
-*tor-0.1.1.23 (24 Aug 2006)
-
-  24 Aug 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +files/torrc.sample-0.1.1.23.patch, +tor-0.1.1.23.ebuild:
-  Updated version, bump and small cosmetics. Thanks to Olivier Mondolini in
-  bug #144417.
-
-  16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> tor-0.1.1.22.ebuild:
-  Add ~x86-fbsd keyword.
-
-*tor-0.1.1.22 (08 Jul 2006)
-
-  08 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +tor-0.1.1.22.ebuild:
-  Bump to 0.1.1.22. Closes bug # 138073.
-
-  05 Jun 2006; Simon Stelling <blubb@gentoo.org> tor-0.1.1.20.ebuild:
-  stable on amd64 wrt bug 134329
-
-  01 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.1.20.ebuild:
-  Stable on sparc wrt security #134329
-
-  01 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.1.20.ebuild:
-  ppc stable, bug #134329
-
-  01 Jun 2006; Markus Rothe <corsair@gentoo.org> tor-0.1.1.20.ebuild:
-  Stable on ppc64; bug #134329
-
-  01 Jun 2006; Joshua Jackson <tsunam@gentoo.org> tor-0.1.1.20.ebuild:
-  Stable on x86; security bug #134329
-
-*tor-0.1.1.20 (01 Jun 2006)
-
-  01 Jun 2006; Stefan Cornelius <dercorny@gentoo.org> +tor-0.1.1.20.ebuild:
-  Bumping to version 0.1.1.20 for security bugs #134329 and #118918
-
-  23 Apr 2006; Emanuele Giaquinta <exg@gentoo.org> tor-0.1.0.14-r1.ebuild,
-  tor-0.1.0.16.ebuild, tor-0.1.0.17.ebuild:
-  Move enew{group,user} in pkg_setup.
-
-*tor-0.1.0.17 (28 Feb 2006)
-
-  28 Feb 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +tor-0.1.0.17.ebuild:
-  Bump to 0.1.017. Credits go to Christian Mandery in bug #123530 for
-  reporting this.
-
-*tor-0.1.0.16 (04 Jan 2006)
-
-  04 Jan 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +files/torrc.sample-0.1.0.16.patch, +files/tor.confd, +files/tor.initd-r1,
-  +tor-0.1.0.16.ebuild:
-  Adding tor 1.0.16 to portage. Arch teams please dont mark stable as the new
-  chroot stuff needs serious testing.
-
-*tor-0.1.0.14-r1 (11 Sep 2005)
-
-  11 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
-  -tor-0.1.0.14.ebuild, +tor-0.1.0.14-r1.ebuild:
-  I was having some strange issues with sending signal 2 to tor. And we do not
-  need a SIGINT, a SIGTERM is fine.
-
-  06 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  -files/torrc.sample.patch-00, -tor-0.0.9.10.ebuild:
-  Removing older version.
-
-  16 Aug 2005; Jason Wever <weeve@gentoo.org> tor-0.1.0.14.ebuild:
-  Stable on SPARC wrt security bug #102245.
-
-  15 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.1.0.14.ebuild:
-  Stable on ppc.
-
-  15 Aug 2005; Markus Rothe <corsair@gentoo.org> tor-0.1.0.14.ebuild:
-  Stable on ppc64 (bug #102245)
-
-*tor-0.1.0.14 (14 Aug 2005)
-
-  14 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  +files/torrc.sample-0.1.0.14.patch, +tor-0.1.0.14.ebuild:
-  Adding new version as amd64 and x86 due to sec bug. See #102245
-
-  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> tor-0.0.9.10.ebuild:
-  Stable on amd64.
-
-  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.10.ebuild:
-  Stable on sparc
-
-  21 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.10.ebuild:
-  Stable on ppc (#96320).
-
-  21 Jun 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.10.ebuild:
-  Stable on ppc64
-
-*tor-0.0.9.10 (16 Jun 2005)
-
-  16 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  -tor-0.0.9.5.ebuild, -tor-0.0.9.6.ebuild, -tor-0.0.9.7.ebuild,
-  -tor-0.0.9.9.ebuild, +tor-0.0.9.10.ebuild:
-  Added version 0.9.0.10 that fixes a security bug, removed older versions
-  that were affected.
-
-  12 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
-  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild, tor-0.0.9.9.ebuild:
-  New HOMEPAGE, thanks to Matteo in bug #95754.
-
-  18 May 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
-  Stable on ppc64
-
-  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.5.ebuild:
-  Stable on ppc.
-
-*tor-0.0.9.9 (25 Apr 2005)
-
-  25 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
-  tor-0.0.9.6.ebuild, +tor-0.0.9.9.ebuild:
-  Removing older versions and bumping to 0.9.9 .
-
-  22 Apr 2005; Alin Nastac <mrness@gentoo.org> tor-0.0.9.5.ebuild,
-  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild:
-  net-misc/tsocks -> net-proxy/tsocks
-
-  08 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.7.ebuild:
-  Keyworded ~sparc wrt #88305
-
-*tor-0.0.9.7 (01 Apr 2005)
-
-  01 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.7.ebuild:
-  Bumped
-
-  29 Mar 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
-  Added ~ppc64 to KEYWORDS; bug #86993
-
-*tor-0.0.9.6 (25 Mar 2005)
-
-  25 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.6.ebuild:
-  Bumped to 0.0.9.6
-
-  23 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd:
-  Changed init script to send SIGINT at shutdown. May increase the shutdown time
-  of servers, but will close in a more clean way.
-
-  25 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  -tor-0.0.9.4-r1.ebuild, -tor-0.0.9.4-r2.ebuild, tor-0.0.9.5.ebuild:
-  Marking latest as x86 and removing older versions.
-
-*tor-0.0.9.5 (23 Feb 2005)
-
-  23 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  tor-0.0.9.4-r2.ebuild, +tor-0.0.9.5.ebuild:
-  Adding version 0.0.9.5 and marking 0.0.9.4-r2 as x86.
-
-*tor-0.0.9.4-r2 (13 Feb 2005)
-
-  13 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
-  +files/torrc.sample.patch-00, -tor-0.0.8.1.ebuild, -tor-0.0.9.1.ebuild,
-  -tor-0.0.9.2.ebuild, +tor-0.0.9.4-r2.ebuild, -tor-0.0.9.4.ebuild:
-  Adding new version that properly patches the sample config and deleting older
-  versions. Lost the stable ppc-macos but that arch is lagging way to much.
-
-*tor-0.0.9.4-r1 (10 Feb 2005)
-
-  10 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; +files/tor.initd,
-  +tor-0.0.9.4-r1.ebuild:
-  Using ideas in bug #75381 from Faustus <orlovm@cs.bgu.ac.il> and after talking
-  to latexer i'm commiting this version that can use a init.d script for easier
-  usage.
-
-*tor-0.0.9.4 (04 Feb 2005)
-
-  04 Feb 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.4.ebuild:
-  Bump.
-
-  09 Jan 2005; Marcus Hanwell <cryos@gentoo.org> tor-0.0.9.2.ebuild:
-  Marked ~amd64, closes bug 76780.
-
-*tor-0.0.9.2 (04 Jan 2005)
-
-  04 Jan 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.2.ebuild:
-  Bump.
-
-*tor-0.0.9.1 (16 Dec 2004)
-
-  16 Dec 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.1.ebuild:
-  Bump. Add tsocks dependancy, see bug #70879
-
-  20 Oct 2004; Peter Johanson <latexer@gentoo.org> -tor-0.0.6.1.ebuild,
-  -tor-0.0.6.ebuild, -tor-0.0.7.2.ebuild, -tor-0.0.7.3.ebuild,
-  -tor-0.0.7.ebuild:
-  Remove old vulnerable versions. See bug #67756
-
-  21 Oct 2004; Joseph Jezak <josejx@gentoo.org> tor-0.0.8.1.ebuild:
-  Keyworded ppc-macos and macos due to vulnerability in previous versions.
-  Removed tsocks RDEPEND at the request of latexer. See bug #67756
-
-*tor-0.0.8.1 (17 Oct 2004)
-
-  17 Oct 2004; <peter@gentoo.org> +tor-0.0.8.1.ebuild, -tor-0.0.8.ebuild:
-  Bump and remove 0.0.8 which is vulnerable to a remote DoS. See bug #67756.
-
-*tor-0.0.8 (06 Oct 2004)
-
-  06 Oct 2004; <peter@gentoo.org> tor-0.0.6.1.ebuild, tor-0.0.6.ebuild,
-  tor-0.0.7.2.ebuild, tor-0.0.7.3.ebuild, tor-0.0.7.ebuild, +tor-0.0.8.ebuild:
-  Bump. Also fix the license as this is really under 3-clause BSD.
-
-*tor-0.0.7.3 (15 Aug 2004)
-
-  15 Aug 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.3.ebuild:
-  Bump. Only needed for servers.
-
-  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
-  Fixed Manifest.
-
-  24 Jul 2004; Erik Swanson <erik@gentoo.org> tor-0.0.7.2.ebuild:
-  Added macos to KEYWORDS
-
-*tor-0.0.7.2 (15 Jul 2004)
-
-  15 Jul 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.2.ebuild:
-  Bump to latest version. tsocks is now a depend for everything but macos, since
-  tsocks no worky there.
-
-*tor-0.0.7 (07 Jun 2004)
-
-  07 Jun 2004; Peter Johanson,,, <peter@gentoo.org> tor-0.0.2_pre27.ebuild,
-  tor-0.0.5.ebuild, tor-0.0.6_rc1.ebuild, tor-0.0.7.ebuild:
-  Bump to lates release, and remove older versions.
-
-*tor-0.0.6.1 (06 May 2004)
-
-  06 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.1.ebuild:
-  Bump.
-
-  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
-  Adding back ~ppc, as dholm wants me to keep it around for future updates.
-
-*tor-0.0.6 (02 May 2004)
-
-  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
-  Bump to latest release.
-
-  30 Apr 2004; David Holm <dholm@gentoo.org> tor-0.0.6_rc1.ebuild:
-  Added to ~ppc.
-
-*tor-0.0.6_rc1 (29 Apr 2004)
-
-  29 Apr 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6_rc1.ebuild:
-  Bump to latest. Beware, this version is not backwards compatible with older
-  versions.
-
-*tor-0.0.5 (30 Mar 2004)
-
-  30 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre21.ebuild,
-  tor-0.0.2_pre22.ebuild, tor-0.0.2_pre23.ebuild, tor-0.0.2_pre24.ebuild,
-  tor-0.0.2_pre25.ebuild, tor-0.0.5.ebuild:
-  Bump to latest release. Removed a bunch of the old stuff. Initscript coming
-  soon, i swear.
-
-*tor-0.0.2_pre27 (15 Mar 2004)
-
-  15 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre27.ebuild:
-  Bump.
-
-*tor-0.0.2_pre25 (04 Mar 2004)
-
-  04 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre25.ebuild:
-  Bump. Fixes a crash due to DNS stuff.
-
-*tor-0.0.2_pre24 (03 Mar 2004)
-
-  03 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre24.ebuild:
-  Bump
-
-*tor-0.0.2_pre23 (29 Feb 2004)
-
-  29 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre23.ebuild:
-  Bump
-
-*tor-0.0.2_pre22 (28 Feb 2004)
-
-  28 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre22.ebuild:
-  Bump
-
-*tor-0.0.2_pre21 (22 Feb 2004)
-
-  22 Feb 2004; Peter Johanson <latexer@gentoo.org> metadata.xml,
-  tor-0.0.2_pre21.ebuild:
-  Initial Commit. Ebuild by yours truly.
-

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
deleted file mode 100644
index 73491a9..0000000
--- a/net-misc/tor/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
-AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
-AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c1819b24c0ab7940 SHA1 4400ed72fa60d04a96c82f0aba7c6eb41e23f5c5 SHA256 4500436719cb96a17bfd4eb67b2ebf2b1db222904bf1b14b75cc17b8f1b41345
-AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
-AUX tor.initd-r4 1566 RMD160 410611175c20425f48d340216ef680650bf6fa3d SHA1 dbdfd68db76871be8606d1196c0c2a7ba257aac0 SHA256 095334e62ee28d3346f84831015dc9c45f7224d8a6f3588974de7b26352e2824
-AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97
-AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
-EBUILD tor-0.2.3.2_alpha-r2.ebuild 2741 RMD160 b4020ceffd81cf266652a5386c438e9eefcc17e8 SHA1 4fb5a1692842b8f44ad783c3042a0610de92c802 SHA256 09a3e77599d139f9ea35515f52df67ce3334c314260e9c4c0c7b7e148536d83d
-MISC ChangeLog 38845 RMD160 a7cb92c41384c22fe1ddd183a8b95e188472b82a SHA1 3a191ea9d74c9e66d1922ecf531811430e2e3503 SHA256 37e447abd554f792af889f2edf2c80e58d0f4efb02934351edcebffdd23669a6
-MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk4ps7UACgkQl5yvQNBFVTUdqACgk+U30T4mgTfFbLq845tcaFv/
-uDwAoInlwLMVqELtqTxmoJ+57NMbHpNC
-=oWY5
------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-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
deleted file mode 100644
index 86b797b..0000000
--- a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
---- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
-+++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
-@@ -9,6 +9,11 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+CFLAGS=
-+LDFLAGS=
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -971,6 +976,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

diff --git a/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch b/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch
deleted file mode 100644
index 75981d5..0000000
--- a/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/tor-0.2.3.2-alpha.orig/src/tools/tor-fw-helper/Makefile.am b/tor-0.2.3.2-alpha/src/tools/tor-fw-helper/Makefile.am
-index 75878f2..77ff63f 100644
---- a/tor-0.2.3.2-alpha.orig/src/tools/tor-fw-helper/Makefile.am
-+++ b/tor-0.2.3.2-alpha/src/tools/tor-fw-helper/Makefile.am
-@@ -34,5 +34,5 @@ miniupnpc_cppflags =
- endif
- 
- tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags)
--tor_fw_helper_LDADD = $(nat_pmp_ldadd) $(miniupnpc_ldadd) ../../common/libor.a @TOR_LIB_WS32@
-+tor_fw_helper_LDADD = ../../common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) @TOR_LIB_WS32@
- tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags)

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
deleted file mode 100644
index 4195bf3..0000000
--- a/net-misc/tor/files/tor.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Set the file limit
-rc_ulimit="-n 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 dc2dea3..0000000
--- a/net-misc/tor/files/torrc
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Minimal torrc so tor will work out of the box
-#
-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.

diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
deleted file mode 100644
index 4d8f7a1..0000000
--- a/net-misc/tor/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer>
-		<email>chiiph@gentoo.org</email>
-		<name>Tomás Touceda</name>
-	</maintainer>
-	<use>
-		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
-		<flag name='transparent-proxy'>Enable transparent proxying</flag>
-		<flag name='bufferevents'>Use Libevent's buffered IO</flag>
-		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
-		<flag name='upnp'>Enable Universal Plug and Play</flag>
-	</use>
-</pkgmetadata>

diff --git a/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild b/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild
deleted file mode 100644
index 6b562df..0000000
--- a/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.2_alpha-r1.ebuild,v 1.1 2011/07/21 14:20:02 blueness Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0
-	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( net-libs/miniupnpc )"
-
-# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
-RDEPEND="${DEPEND}
-	net-proxy/tsocks[tordns]"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
-	epatch "${FILESDIR}"/${PN}-0.2.3.2_alpha-fix-asneeded.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf --docdir=/usr/share/doc/${PF}				\
-		$(use_enable bufferevents)					\
-		$(use_enable doc asciidoc)					\
-		$(use_enable nat-pmp)						\
-		$(use_enable tor-hardening gcc-hardening)	\
-		$(use_enable tor-hardening linker-hardening)\
-		$(use_enable transparent-proxy transparent)	\
-		$(use_enable threads)						\
-		$(use_enable upnp)
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-
-	insinto /etc/tor/
-	doins "${FILESDIR}"/torrc
-
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-08-30  3:35 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-08-30  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     c9d55ae40ab685bc3b40b573ed6236de6c0f600d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 03:35:30 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 03:35:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=c9d55ae4

net-misc/tor: Log to syslog rather than a file, bug #380117

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

---
 net-misc/tor/ChangeLog                             | 1176 ++++++++++++++++++++
 net-misc/tor/Manifest                              |   22 +
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 +
 .../tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch |   11 +
 net-misc/tor/files/tor.confd                       |    3 +
 net-misc/tor/files/tor.initd-r4                    |   57 +
 net-misc/tor/files/torrc-r1                        |    8 +
 net-misc/tor/files/torrc.sample.patch              |   31 +
 net-misc/tor/metadata.xml                          |   20 +
 net-misc/tor/tor-0.2.2.32-r1.ebuild                |   82 ++
 net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild           |   88 ++
 11 files changed, 1522 insertions(+), 0 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
new file mode 100644
index 0000000..8c04f9b
--- /dev/null
+++ b/net-misc/tor/ChangeLog
@@ -0,0 +1,1176 @@
+# ChangeLog for net-misc/tor
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.269 2011/08/28 11:15:42 blueness Exp $
+
+  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.2.32-r1.ebuild,
+  +tor-0.2.3.2_alpha-r3.ebuild, +files/tor-0.2.3.2_alpha-fix-asneeded.patch,
+  +files/tor.confd, +files/tor.initd-r4, +files/torrc-r1,
+  +files/torrc.sample.patch, +metadata.xml:
+  Log to syslog rather than a file, bug #380117
+
+*tor-0.2.3.2_alpha-r3 (30 Aug 2011)
+*tor-0.2.2.32-r1 (30 Aug 2011)
+
+  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.2.32-r1.ebuild,
+  +tor-0.2.3.2_alpha-r3.ebuild, +files/tor-0.2.3.2_alpha-fix-asneeded.patch,
+  +files/tor.confd, +files/tor.initd-r4, +files/torrc-r1,
+  +files/torrc.sample.patch, +metadata.xml:
+  Move logging to syslog, bug #380117
+
+  28 Aug 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.2.31_rc.ebuild:
+  Removed old release candidate
+
+*tor-0.2.2.32 (28 Aug 2011)
+
+  28 Aug 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.2.32.ebuild:
+  Version bump to new stable candidate
+
+  23 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/tor.initd-r4:
+  Removed incorrect --stop from init script, bug #379939
+
+*tor-0.2.2.31_rc (19 Aug 2011)
+
+  19 Aug 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.2.30_rc.ebuild,
+  -tor-0.2.2.30_rc-r1.ebuild, +tor-0.2.2.31_rc.ebuild,
+  -tor-0.2.3.2_alpha.ebuild:
+  Version bump RC and remove deprecated
+
+  05 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/tor.initd-r4:
+  Removed deprecated -oknodo, bug #377773
+
+  30 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  tor-0.2.3.2_alpha-r2.ebuild:
+  DEPEND only on <net-libs/miniupnpc-1.6, bug #376621
+
+*tor-0.2.3.2_alpha-r2 (22 Jul 2011)
+
+  22 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.3.2_alpha-r1.ebuild, +tor-0.2.3.2_alpha-r2.ebuild,
+  +files/tor-0.2.3.2_alpha-fix-asneeded.patch:
+  Address bug #375955
+
+*tor-0.2.3.2_alpha-r1 (21 Jul 2011)
+*tor-0.2.2.30_rc-r1 (21 Jul 2011)
+
+  21 Jul 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml,
+  +tor-0.2.2.30_rc-r1.ebuild, +tor-0.2.3.2_alpha-r1.ebuild:
+  Removed automatic configuration of features
+
+*tor-0.2.2.30_rc (19 Jul 2011)
+
+  19 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.29_beta.ebuild, +tor-0.2.2.30_rc.ebuild:
+  Beta bumped to first rc and removed deprecated
+
+*tor-0.2.3.2_alpha (19 Jul 2011)
+
+  19 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.3.1_alpha-r1.ebuild, +tor-0.2.3.2_alpha.ebuild:
+  Bumped alpha and removed deprecated
+
+*tor-0.2.2.29_beta (21 Jun 2011)
+
+  21 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.28_beta.ebuild, +tor-0.2.2.29_beta.ebuild:
+  Version bump beta, removed deprecated
+
+*tor-0.2.2.28_beta (10 Jun 2011)
+
+  10 Jun 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.30-r1.ebuild,
+  -tor-0.2.2.27_beta-r1.ebuild, +tor-0.2.2.28_beta.ebuild:
+  Version bump beta, and removed deprecated
+
+*tor-0.2.3.1_alpha-r1 (07 Jun 2011)
+*tor-0.2.2.27_beta-r1 (07 Jun 2011)
+
+  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.27_beta.ebuild, +tor-0.2.2.27_beta-r1.ebuild,
+  -tor-0.2.3.1_alpha.ebuild, +tor-0.2.3.1_alpha-r1.ebuild:
+  Forward ported rc_ulimit fix to beta and alpha, see bug #268396, comment #19
+
+*tor-0.2.1.30-r2 (07 Jun 2011)
+
+  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.30-r2.ebuild,
+  +files/tor.confd:
+  Use rc_ulimit to set file limit, see bug #268396, comment #19
+
+*tor-0.2.2.27_beta (30 May 2011)
+
+  30 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.25_alpha.ebuild, +tor-0.2.2.27_beta.ebuild:
+  Version bump and removed deprecated
+
+*tor-0.2.3.1_alpha (08 May 2011)
+
+  08 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.24_alpha.ebuild, +tor-0.2.3.1_alpha.ebuild:
+  Added new alpha 0.2.3.1 and removed older alpha 0.2.2.24
+
+  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.23_alpha.ebuild, -tor-0.2.2.23_alpha-r1.ebuild,
+  -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+  Removed deprecated alpha
+
+*tor-0.2.2.25_alpha (29 Apr 2011)
+
+  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.25_alpha.ebuild:
+  Version bump
+
+*tor-0.2.2.24_alpha (18 Apr 2011)
+
+  18 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.24_alpha.ebuild,
+  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch:
+  Version bump
+
+*tor-0.2.1.30-r1 (10 Apr 2011)
+
+  10 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch,
+  files/torrc:
+  Backport of improved build system, see bug #360765
+
+  02 Apr 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.29.ebuild,
+  -tor-0.2.1.29-r1.ebuild:
+  Removed vulnerable versions, bug #359789
+
+  02 Apr 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.30.ebuild:
+  arm/sparc stable wrt #359789
+
+  28 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+  Improved fix to build system, see bug #360765
+
+*tor-0.2.2.23_alpha-r1 (25 Mar 2011)
+
+  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.23_alpha-r1.ebuild,
+  +files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+  Fixed build system to fully respect CFLAGS
+
+  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  tor-0.2.2.23_alpha.ebuild:
+  Removed superfluous USE flag
+
+  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.22_alpha-r1.ebuild:
+  Removed outdated alpha
+
+  22 Mar 2011; Thomas Kahle <tomka@gentoo.org> tor-0.2.1.30.ebuild:
+  x86 stable per bug 359789
+
+  21 Mar 2011; Christoph Mende <angelos@gentoo.org> tor-0.2.1.30.ebuild:
+  Stable on amd64 wrt bug #359789
+
+  21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> tor-0.2.1.30.ebuild:
+  ppc/ppc64 stable wrt #359789
+
+*tor-0.2.2.23_alpha (11 Mar 2011)
+
+  11 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.23_alpha.ebuild:
+  Version bump on alpha and removal of deprecated vesion.
+
+  27 Feb 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.29.ebuild:
+  Reverted removal of only stable ebuild on most arches.
+
+*tor-0.2.1.30 (27 Feb 2011)
+
+  27 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.1.29.ebuild,
+  +tor-0.2.1.30.ebuild:
+  Version bump and clean up.
+
+  12 Feb 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29-r1.ebuild:
+  sparc stable wrt #351920
+
+*tor-0.2.2.22_alpha-r1 (10 Feb 2011)
+
+  10 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.2.22_alpha.ebuild, +tor-0.2.2.22_alpha-r1.ebuild:
+  Added /etc/tor/torrc for alpha.
+
+*tor-0.2.1.29-r1 (09 Feb 2011)
+
+  09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.1.29-r1.ebuild, +files/torrc:
+  Added /etc/tor/torrc so tor works out of the box.
+
+*tor-0.2.2.22_alpha (01 Feb 2011)
+
+  01 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.2.21_alpha.ebuild,
+  +tor-0.2.2.22_alpha.ebuild:
+  Version bump on alpha and cleanup.
+
+  24 Jan 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.28.ebuild:
+  Removed vulnerable version, see bug #351920
+
+  24 Jan 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29.ebuild:
+  sparc stable
+
+  23 Jan 2011; Markus Meier <maekke@gentoo.org> tor-0.2.1.29.ebuild:
+  arm stable, bug #351920
+
+  18 Jan 2011; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.29.ebuild:
+  stable x86, security bug 351920
+
+  17 Jan 2011; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.29.ebuild:
+  Stable on amd64 wrt bug #351920
+
+  17 Jan 2011; <xarth@gentoo.org> tor-0.2.1.29.ebuild:
+  ppc/ppc64 stable wrt #351920
+
+*tor-0.2.2.21_alpha (17 Jan 2011)
+*tor-0.2.1.29 (17 Jan 2011)
+
+  17 Jan 2011; Tomas Touceda <chiiph@gentoo.org> +tor-0.2.1.29.ebuild,
+  -tor-0.2.2.20_alpha.ebuild, +tor-0.2.2.21_alpha.ebuild:
+  Versiom bump. Clean old alpha.
+
+*tor-0.2.2.20_alpha (10 Jan 2011)
+
+  10 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.20_alpha.ebuild:
+  added alpha branch
+
+  07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.25.ebuild,
+  -tor-0.2.1.26.ebuild, -tor-0.2.1.27.ebuild:
+  clean up vulnerable versions
+
+  07 Jan 2011; Brent Baude <ranger@gentoo.org> tor-0.2.1.28.ebuild:
+  Marking tor-0.2.1.28 ppc for bug 349312
+
+  06 Jan 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
+  Removed fauli and added chiiph as maintainer
+
+  06 Jan 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
+  Added myself as maintainer
+
+  27 Dec 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.28.ebuild:
+  Marking tor-0.2.1.28 ppc64 for bug 349312
+
+  26 Dec 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.28.ebuild:
+  arm/sparc stable wrt #349312
+
+  26 Dec 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.28.ebuild:
+  Stable on amd64 wrt bug #349312
+
+  25 Dec 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.28.ebuild:
+  stable x86, security bug 349312
+
+*tor-0.2.1.28 (23 Dec 2010)
+
+  23 Dec 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.28.ebuild:
+  bump for security bug 349312
+
+  08 Dec 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.27.ebuild:
+  arm stable, bug #346759
+
+  03 Dec 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.27.ebuild:
+  request USE=tordns on net-proxy/tsocks to raise level of anonymity
+
+  28 Nov 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.27.ebuild:
+  Stable on amd64 wrt bug #346759
+
+*tor-0.2.1.27 (25 Nov 2010)
+
+  25 Nov 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.27.ebuild:
+  version bump, fixes OpenSSL issues, see bug 346715
+
+  14 Oct 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.26.ebuild:
+  stable ppc, bug 329879
+
+  30 Sep 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.25.ebuild:
+  stable ppc64, bug 309873
+
+  18 Sep 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.26.ebuild:
+  sparc stable wrt #329879
+
+  18 Aug 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.26.ebuild:
+  arm stable, bug #329879
+
+  30 Jul 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.26.ebuild:
+  Stable on amd64 wrt bug #329879
+
+  26 Jul 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.26.ebuild:
+  stable x86, bug 329879
+
+*tor-0.2.1.26 (24 Jun 2010)
+
+  24 Jun 2010; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.22.ebuild,
+  +tor-0.2.1.26.ebuild:
+  version bump for bug 325243 by Michael <gentoo AT scribeofthenile DOT
+  com>, and clean up
+
+  06 Jun 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.25.ebuild:
+  arm stable wrt #300830
+
+  23 May 2010; Pacho Ramos <pacho@gentoo.org> tor-0.2.1.25.ebuild:
+  stable amd64, bug 309873
+
+  22 May 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
+  Remove humpback from metadata.xml (#34793)
+
+  17 Apr 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.22.ebuild,
+  tor-0.2.1.25.ebuild:
+  Add ~arm wrt #300830
+
+  05 Apr 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.25.ebuild:
+  sparc stable wrt #309873
+
+  24 Mar 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.25.ebuild:
+  stable ppc, bug 309873
+
+  24 Mar 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.25.ebuild:
+  stable x86, bug 309873
+
+  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
+  -tor-0.2.1.19-r2.ebuild, -files/tor-0.2.1.19-openssl.patch,
+  -tor-0.2.1.20-r1.ebuild, -tor-0.2.1.21.ebuild:
+  clean up
+
+*tor-0.2.1.25 (23 Mar 2010)
+
+  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.25.ebuild:
+  version bump
+
+  10 Feb 2010; Joseph Jezak <josejx@gentoo.org> tor-0.2.1.22.ebuild:
+  Marked ppc stable for bug #301701.
+
+  01 Feb 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.22.ebuild:
+  amd64 stable, bug #301701
+
+  30 Jan 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.22.ebuild:
+  sparc stable wrt #301701
+
+  22 Jan 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.22.ebuild:
+  Marking tor-0.2.1.22 ppc64 for bug 301701
+
+  22 Jan 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.22.ebuild:
+  stable x86, bug 301701
+
+*tor-0.2.1.22 (22 Jan 2010)
+
+  22 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.22.ebuild:
+  version bump for security bug 301701
+
+*tor-0.2.1.21 (16 Jan 2010)
+
+  16 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.21.ebuild:
+  version bump, bug 301169 by Tim O'Kelly <bugs_gentoo_org DOT Tim_OKelly AT
+  neverbox DOT org>
+
+  27 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/tor-0.2.0.30-logrotate.patch,
+  -files/tor-0.2.0.33-no-internal-libevent.patch, -tor-0.2.0.35.ebuild,
+  -tor-0.2.1.19.ebuild, -tor-0.2.1.19-r1.ebuild:
+  clean up
+
+  26 Dec 2009; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.19-r2.ebuild:
+  sparc stable wrt #294297
+
+  08 Dec 2009; Brent Baude <ranger@gentoo.org> tor-0.2.1.19-r2.ebuild:
+  Marking tor-0.2.1.19-r2 ppc64 for bug 294297
+
+*tor-0.2.1.20-r1 (06 Dec 2009)
+
+  06 Dec 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.20.ebuild,
+  +tor-0.2.1.20-r1.ebuild:
+  reintroduce OpenSSL patch for bug 292661
+
+*tor-0.2.1.20 (02 Dec 2009)
+
+  02 Dec 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.20.ebuild:
+  version bump
+
+  25 Nov 2009; Markus Meier <maekke@gentoo.org> tor-0.2.1.19-r2.ebuild:
+  amd64 stable, bug #294297
+
+  24 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
+  tor-0.2.1.19-r2.ebuild:
+  stable x86, bug 294297
+
+  21 Nov 2009; nixnut <nixnut@gentoo.org> tor-0.2.1.19-r2.ebuild:
+  ppc stable #292022
+
+*tor-0.2.1.19-r2 (12 Nov 2009)
+
+  12 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
+  +tor-0.2.1.19-r2.ebuild, +files/tor-0.2.1.19-openssl.patch:
+  fix bug 2926611, patch discovered by Aidan Marks <aidan AT cisco DOT com>
+
+  07 Sep 2009; Christian Faulhammer <fauli@gentoo.org> files/tor.initd-r4:
+  respect CONFFILE variable in start calls, reported by Iome <frodone AT
+  gmail DOT com> in bug 283524
+
+*tor-0.2.1.19-r1 (17 Aug 2009)
+
+  17 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
+  +tor-0.2.1.19-r1.ebuild, +files/tor-0.2.1.19-logrotate.patch:
+  fix logrotate support as provided by Martin von Gagern <Martin AT vGagern
+  AT gmx DOT net> in bug 281439
+
+  06 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
+  -tor-0.2.1.16_rc.ebuild:
+  clean up release candidate
+
+*tor-0.2.1.19 (06 Aug 2009)
+
+  06 Aug 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.19.ebuild:
+  version bump
+
+  14 Jul 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.34.ebuild:
+  remove vulnerable version
+
+  12 Jul 2009; Joseph Jezak <josejx@gentoo.org> tor-0.2.0.35.ebuild:
+  Marked ppc stable for bug #275628.
+
+  30 Jun 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.35.ebuild:
+  Marking tor-0.2.0.35 ppc64 for bug 275628
+
+  30 Jun 2009; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.35.ebuild:
+  sparc stable wrt #275628
+
+  29 Jun 2009; Christian Faulhammer <fauli@gentoo.org> tor-0.2.0.34.ebuild,
+  tor-0.2.0.35.ebuild, tor-0.2.1.16_rc.ebuild:
+  fix HOMEPAGE entries
+
+  29 Jun 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.35.ebuild:
+  amd64 stable, bug #275628
+
+*tor-0.2.1.16_rc (29 Jun 2009)
+
+  29 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  -tor-0.2.1.15_rc.ebuild, +tor-0.2.1.16_rc.ebuild:
+  extend version bump for security bug 275628 and remove one vulnerable
+  version
+
+*tor-0.2.0.35 (28 Jun 2009)
+
+  28 Jun 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.35.ebuild:
+  version bump for security bug 275628, directly stable for x86
+
+  17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  tor-0.2.1.15_rc.ebuild:
+  remove all occurences of USE=bundledlibevent
+
+*tor-0.2.1.15_rc (17 Jun 2009)
+
+  17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  +tor-0.2.1.15_rc.ebuild:
+  add release candidate for 0.2.1 series
+
+  12 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  files/torrc.sample-0.1.2.6.patch, +tor-0.2.0.34.ebuild,
+  -tor-0.2.0.34-r2.ebuild, +files/tor.initd-r4, -files/tor.initd-r6:
+  revert all my changes for bug 268396 as they will break badly with
+  Baselayout 1, see bug 272527
+
+*tor-0.2.0.34-r2 (03 Jun 2009)
+
+  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org> -files/tor.initd-r5,
+  +files/tor.initd-r6, -tor-0.2.0.34-r1.ebuild, +tor-0.2.0.34-r2.ebuild:
+  revision bump to make it compatible with Baselayout 1, as reported by
+  Stanislav Cymbalov <DummyUnit AT gmail.com> in bug 272404
+
+*tor-0.2.0.34-r1 (03 Jun 2009)
+
+  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  files/torrc.sample-0.1.2.6.patch, -files/tor.initd-r4,
+  +files/tor.initd-r5, -tor-0.2.0.34.ebuild, +tor-0.2.0.34-r1.ebuild:
+  Really respect limits from /etc/limits.d/ by some tweaks: moving user
+  context switch from torrc to init script, including verification of config
+  file in the latter; fixes bug 268396 by W. Elschner <gentoobugzilla_reply AT
+  elschner DOT net>
+
+  19 Feb 2009; nixnut <nixnut@gentoo.org> tor-0.2.0.34.ebuild:
+  ppc stable
+
+  18 Feb 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.33.ebuild:
+  clean up vulnerable versions
+
+  15 Feb 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.34.ebuild:
+  amd64/x86 stable, bug #258833
+
+  13 Feb 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.34.ebuild:
+  Marking tor-0.2.0.34 ppc64 for bug 258833
+
+  13 Feb 2009; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.34.ebuild:
+  Sparc stable --- Security Bug #258833 --- tests good.
+
+*tor-0.2.0.34 (13 Feb 2009)
+
+  13 Feb 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.34.ebuild:
+  version bump for security bug 258833, reported by Jesse Adelman <jesse AT
+  boldandbusted DOT com>
+
+  08 Feb 2009; Christian Faulhammer <fauli@gentoo.org> tor-0.2.0.33.ebuild:
+  kill logrotate USE flag as requested by bangert on bug 258188
+
+  05 Feb 2009; Christian Faulhammer <fauli@gentoo.org>
+  +files/tor-0.2.0.33-no-internal-libevent.patch, metadata.xml,
+  tor-0.2.0.33.ebuild:
+  make use of bundled libevent async DNS part optional via USE=flag, this
+  should fix bug 206969
+
+  26 Jan 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.32.ebuild,
+  -tor-0.2.0.32-r1.ebuild:
+  clean up
+
+  25 Jan 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.33.ebuild:
+  amd64/x86 stable, bug #256078
+
+  24 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.2.0.33.ebuild:
+  ppc stable, bug #256078
+
+  24 Jan 2009; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.33.ebuild:
+  Sparc stable, Security Bug #256078.
+
+  24 Jan 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.33.ebuild:
+  Marking tor-0.2.0.33 ppc64 for bug 256078
+
+*tor-0.2.0.33 (24 Jan 2009)
+
+  24 Jan 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.33.ebuild:
+  version bump for security bug 256078
+
+*tor-0.2.0.32-r1 (21 Dec 2008)
+
+  21 Dec 2008; Christian Faulhammer <fauli@gentoo.org> +files/tor.conf,
+  +tor-0.2.0.32-r1.ebuild:
+  install limits file so tor can open more files on the system than normally
+  allowed, this fixes bug 251171 reported by candrews AT integralblue DOT
+  com
+
+  10 Dec 2008; Christian Faulhammer <fauli@gentoo.org>
+  -files/tor-0.2.0.31-sparc.patch, -tor-0.2.0.31-r1.ebuild:
+  clean up
+
+  09 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> tor-0.2.0.32.ebuild:
+  Stable on sparc, security bug #250018
+
+  08 Dec 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.32.ebuild:
+  Marking tor-0.2.0.32 ppc64 for bug 250018
+
+  08 Dec 2008; Markus Meier <maekke@gentoo.org> tor-0.2.0.32.ebuild:
+  x86 stable, bug #250018
+
+  07 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.2.0.32.ebuild:
+  ppc stable, bug #250018
+
+  07 Dec 2008; Richard Freeman <rich0@gentoo.org> tor-0.2.0.32.ebuild:
+  amd64 stable - 250018
+
+*tor-0.2.0.32 (06 Dec 2008)
+
+  06 Dec 2008; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.32.ebuild:
+  version bump for security bug 250018
+
+  28 Nov 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
+  Change my email address
+
+  22 Nov 2008; Christian Faulhammer <opfer@gentoo.org>
+  -tor-0.2.0.30-r1.ebuild, -tor-0.2.0.31.ebuild, tor-0.2.0.31-r1.ebuild:
+  clean up and add stable KEYWORDS for -r1
+
+  22 Nov 2008; Markus Meier <maekke@gentoo.org> tor-0.2.0.31.ebuild:
+  amd64 stable, bug #244679
+
+  14 Nov 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.31.ebuild,
+  tor-0.2.0.31-r1.ebuild:
+  Address sparc alignment problems reported in Bug #246483 --- this fixes them
+  but is untested on anything else.
+
+*tor-0.2.0.31-r1 (14 Nov 2008)
+
+  14 Nov 2008; Ferris McCormick <fmccor@gentoo.org>
+  +files/tor-0.2.0.31-sparc.patch, +tor-0.2.0.31-r1.ebuild:
+  Add new version to address sparc alignment problem, Bug #246483 which see
+  for details.
+
+  01 Nov 2008; nixnut <nixnut@gentoo.org> tor-0.2.0.31.ebuild:
+  Stable on ppc wrt bug 244679
+
+  30 Oct 2008; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.31.ebuild:
+  x86 stable #244679
+
+  28 Oct 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.31.ebuild:
+  Sparc stable, Bug #244679.
+
+  27 Oct 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.31.ebuild:
+  stable ppc64, bug 244679
+
+*tor-0.2.0.31 (26 Sep 2008)
+
+  26 Sep 2008; Christian Faulhammer <opfer@gentoo.org> +tor-0.2.0.31.ebuild:
+  version bump for bug 238787
+
+  06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> files/tor.initd-r4:
+  remove bashisms from init file, as reported in bug 236857 by Martin Väth
+  <vaeth AT mathematik DOT uni-wuerzburg DOT de>
+
+  06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r3,
+  -files/tor.logrotate.patch, -tor-0.1.2.19-r2.ebuild, -tor-0.2.0.30.ebuild:
+  clean up
+
+  06 Sep 2008; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  x86 stable wrt #236536
+
+  06 Sep 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  stable ppc64, bug 236536
+
+  06 Sep 2008; Richard Freeman <rich0@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  amd64 stable - 236536
+
+  04 Sep 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  stable ppc, bug 236536
+
+  03 Sep 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.30-r1.ebuild:
+  Sparc stable --- Bug #236536 --- test suite passes.
+
+*tor-0.2.0.30-r1 (03 Sep 2008)
+
+  03 Sep 2008; Christian Faulhammer <opfer@gentoo.org> +files/tor.initd-r4,
+  +tor-0.2.0.30-r1.ebuild:
+  update init script to prevent runtime failures as reported in bug 235208
+
+*tor-0.2.0.30 (03 Aug 2008)
+
+  03 Aug 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/tor-0.2.0.30-logrotate.patch, +tor-0.2.0.30.ebuild:
+  version bump for bug 233612 by puchu <rauchwolke AT gmx DOT net>
+
+  29 May 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.19.ebuild:
+  clean up
+
+  29 May 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.19-r2.ebuild:
+  sparc stable wrt #223705, thanks to Friedrich Oslage for testing
+
+  28 May 2008; Peter Volkov <pva@gentoo.org> tor-0.1.2.19-r2.ebuild:
+  amd64 stable, bug #223705.
+
+  27 May 2008; Markus Rothe <corsair@gentoo.org> tor-0.1.2.19-r2.ebuild:
+  Stable on ppc64; bug #223705
+
+  26 May 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.19-r2.ebuild:
+  Stable on ppc wrt bug 223705
+
+  26 May 2008; Christian Faulhammer <opfer@gentoo.org>
+  tor-0.1.2.19-r2.ebuild:
+  stable x86, bug 223705
+
+*tor-0.1.2.19-r2 (29 Apr 2008)
+
+  29 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
+  -tor-0.1.2.19-r1.ebuild, +tor-0.1.2.19-r2.ebuild:
+  logrotate should now really work again
+
+*tor-0.1.2.19-r1 (25 Apr 2008)
+
+  25 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
+  +tor-0.1.2.19-r1.ebuild:
+  create the logrotate file with the correct permissions as pointed out on bug
+  216298 by Serge Koksharov <gentoosiast AT yandex DOT ru>
+
+  05 Mar 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.18.ebuild:
+  clean up
+
+  04 Mar 2008; Richard Freeman <rich0@gentoo.org> tor-0.1.2.19.ebuild:
+  amd64 stable - 211021
+
+  04 Mar 2008; Brent Baude <ranger@gentoo.org> tor-0.1.2.19.ebuild:
+  stable ppc64, bug 211021
+
+  03 Mar 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.19.ebuild:
+  sparc stable wrt #211021
+
+  02 Mar 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.19.ebuild:
+  Stable on ppc wrt bug 211021
+
+  01 Mar 2008; Christian Faulhammer <opfer@gentoo.org> metadata.xml:
+  adding myself to metadata.xml
+
+  01 Mar 2008; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.19.ebuild:
+  stable x86, bug 211021
+
+  07 Feb 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r2,
+  -tor-0.1.2.17.ebuild:
+  clean up
+
+  07 Feb 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.18.ebuild:
+  sparc stable wrt #208336
+
+  06 Feb 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.18.ebuild:
+  stable on ppc wrt bug #208336
+
+  02 Feb 2008; Richard Freeman <rich0@gentoo.org> tor-0.1.2.18.ebuild:
+  amd64 stable - #208336
+
+  31 Jan 2008; Brent Baude <ranger@gentoo.org> tor-0.1.2.18.ebuild:
+  Marking tor-0.1.2.18 ppc64 stable for bug 208336
+
+  31 Jan 2008; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.18.ebuild:
+  stable x86, bug 208336
+
+*tor-0.1.2.19 (31 Jan 2008)
+
+  31 Jan 2008; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.19.ebuild:
+  version bump
+
+*tor-0.1.2.18 (03 Jan 2008)
+
+  03 Jan 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.16.ebuild,
+  -tor-0.1.2.16-r1.ebuild, +tor-0.1.2.18.ebuild:
+  version bump (bug 199818) and clean up
+
+  03 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.2.17.ebuild:
+  ppc stable, bug #190968
+
+  02 Sep 2007; Jose Luis Rivero <yoswink@gentoo.org> tor-0.1.2.17.ebuild:
+  Stable on sparc wrt security bug #190968
+
+  02 Sep 2007; Markus Rothe <corsair@gentoo.org> tor-0.1.2.17.ebuild:
+  Stable on ppc64; bug #190968
+
+  02 Sep 2007; Christoph Mende <angelos@gentoo.org> tor-0.1.2.17.ebuild:
+  Stable on amd64 wrt security bug #190968
+
+*tor-0.1.2.17 (02 Sep 2007)
+
+  02 Sep 2007; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.17.ebuild:
+  version bump and stable x86, security bug 190968
+
+  29 Aug 2007; Gustavo Felisberto <humpback@gentoo.org> files/tor.initd-r3:
+  Adding correct init script.
+
+*tor-0.1.2.16-r1 (28 Aug 2007)
+
+  28 Aug 2007; Gustavo Felisberto <humpback@gentoo.org>
+  -files/torrc.sample-0.1.0.16.patch, -files/torrc.sample-0.1.1.23.patch,
+  -files/tor.confd, -files/tor.initd, -files/tor.initd-r1,
+  +files/tor.initd-r3, -tor-0.1.1.23.ebuild, -tor-0.1.1.26.ebuild,
+  -tor-0.1.2.14.ebuild, +tor-0.1.2.16-r1.ebuild:
+  Removed older versions and dangled files. Fixed bug with init with
+  baselayout-2 closes 189724. Thanks to Christian Faulhammer (opfer) for the
+  fix.
+
+  09 Aug 2007; Robert Buchholz <rbu@gentoo.org> tor-0.1.2.16.ebuild:
+  Stable on amd64 (bug #186644)
+
+  06 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.2.16.ebuild:
+  Stable on sparc wrt security #186644
+
+  04 Aug 2007; Markus Rothe <corsair@gentoo.org> tor-0.1.2.16.ebuild:
+  Stable on ppc64; bug #186644
+
+  04 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.2.16.ebuild:
+  ppc stable, bug #186644
+
+  03 Aug 2007; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.16.ebuild:
+  stable x86, security bug 186644
+
+*tor-0.1.2.16 (03 Aug 2007)
+
+  03 Aug 2007; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.16.ebuild:
+  version bump, for security bug 186644
+
+  02 Jun 2007; René Nussbaumer <killerfox@gentoo.org> tor-0.1.2.14.ebuild:
+  Stable on ppc. See bug #180139.
+
+  31 May 2007; Christoph Mende <angelos@gentoo.org> tor-0.1.2.14.ebuild:
+  Stable on amd64 wrt security bug 180139
+
+  31 May 2007; Brent Baude <ranger@gentoo.org> tor-0.1.2.14.ebuild:
+  Marking tor-0.1.2.14 ppc64 stable for bug#180139
+
+  31 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.2.14.ebuild:
+  Stable on sparc wrt security #180139
+
+  31 May 2007; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.14.ebuild:
+  stable x86, security bug 180139
+
+*tor-0.1.2.14 (31 May 2007)
+
+  31 May 2007; <humpback@gentoo.org> -tor-0.1.0.18.ebuild,
+  -tor-0.1.0.18-r1.ebuild, -tor-0.1.2.13.ebuild, +tor-0.1.2.14.ebuild:
+  Bumped 0.1.2.13 to 0.1.2.14, removed older versions. Fixed #178975 with idea 
+  from Remy Blank
+
+  15 May 2007; <humpback@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.0.18-r1.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.26.ebuild,
+  tor-0.1.2.13.ebuild:
+  Added keepdir. Close Bug #177590.
+
+  15 May 2007; <humpback@gentoo.org> tor-0.1.1.23.ebuild,
+  tor-0.1.1.26.ebuild:
+  Fixed missing RDEP's. Close Bug #174185.
+
+*tor-0.1.2.13 (15 May 2007)
+
+  15 May 2007; <humpback@gentoo.org> +files/tor.initd-r2,
+  -tor-0.1.2.6_alpha.ebuild, +tor-0.1.2.13.ebuild:
+  Removed alpha 1.2 release and added a bump. Help from all in bug #176018,
+  specially jakub, was very much apretiated.
+
+  29 Apr 2007; Torsten Veller <tove@gentoo.org> tor-0.1.1.23.ebuild,
+  tor-0.1.1.26.ebuild, tor-0.1.2.6_alpha.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
+
+*tor-0.1.2.6_alpha (27 Jan 2007)
+
+  27 Jan 2007; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/torrc.sample-0.1.2.6.patch, +tor-0.1.2.6_alpha.ebuild:
+  Added alpha release of tor at request from Flameeyes. It seems tork needs
+  it. As always, if it is masked and you install and destroy your system dont
+  come complain alot.
+
+*tor-0.1.1.26 (18 Dec 2006)
+
+  18 Dec 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  -tor-0.1.1.24.ebuild, +tor-0.1.1.26.ebuild:
+  Bumped to 0.1.1.26 and removed older version.
+
+*tor-0.1.0.18-r1 (22 Oct 2006)
+
+  22 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.1.0.18.ebuild, +tor-0.1.0.18-r1.ebuild:
+  Small configuration issue in the chroot. Fixes bug #139354.
+
+  21 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.24.ebuild:
+  Added ewarn about the needed dot in the privoxy integration. Closes bug
+  #152137.
+
+*tor-0.1.1.24 (09 Oct 2006)
+
+  09 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +tor-0.1.1.24.ebuild:
+  Bump from 0.1.1.23
+
+  11 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.1.0.18.ebuild:
+  Changed einfo about configuration of chroot. Removes tor from bug #140371
+
+  05 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/torrc.sample-0.1.0.14.patch, -tor-0.1.0.14-r1.ebuild,
+  -tor-0.1.0.16.ebuild, -tor-0.1.0.17.ebuild, -tor-0.1.1.20.ebuild,
+  -tor-0.1.1.22.ebuild:
+  Removed older version that had sec issues.
+
+  30 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.1.23.ebuild:
+  Stable on sparc wrt security #145458
+
+  30 Aug 2006; <blubb@gentoo.org> tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild:
+  stable on amd64 wrt bug 145458
+
+  30 Aug 2006; Joshua Jackson <tsunam@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.1.23.ebuild:
+  Stable x86; security bug #145458
+
+  29 Aug 2006; Markus Rothe <corsair@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.1.23.ebuild:
+  Stable on ppc64; bug #145458
+
+  29 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.1.23.ebuild:
+  ppc stable, bug #145458
+
+*tor-0.1.0.18 (29 Aug 2006)
+
+  29 Aug 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +tor-0.1.0.18.ebuild:
+  Adding 0.1.0.18 that fixes sec issue in the 0.1.0.* series. The 0.1.1.23 is
+  not affected.
+
+*tor-0.1.1.23 (24 Aug 2006)
+
+  24 Aug 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/torrc.sample-0.1.1.23.patch, +tor-0.1.1.23.ebuild:
+  Updated version, bump and small cosmetics. Thanks to Olivier Mondolini in
+  bug #144417.
+
+  16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> tor-0.1.1.22.ebuild:
+  Add ~x86-fbsd keyword.
+
+*tor-0.1.1.22 (08 Jul 2006)
+
+  08 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +tor-0.1.1.22.ebuild:
+  Bump to 0.1.1.22. Closes bug # 138073.
+
+  05 Jun 2006; Simon Stelling <blubb@gentoo.org> tor-0.1.1.20.ebuild:
+  stable on amd64 wrt bug 134329
+
+  01 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.1.20.ebuild:
+  Stable on sparc wrt security #134329
+
+  01 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.1.20.ebuild:
+  ppc stable, bug #134329
+
+  01 Jun 2006; Markus Rothe <corsair@gentoo.org> tor-0.1.1.20.ebuild:
+  Stable on ppc64; bug #134329
+
+  01 Jun 2006; Joshua Jackson <tsunam@gentoo.org> tor-0.1.1.20.ebuild:
+  Stable on x86; security bug #134329
+
+*tor-0.1.1.20 (01 Jun 2006)
+
+  01 Jun 2006; Stefan Cornelius <dercorny@gentoo.org> +tor-0.1.1.20.ebuild:
+  Bumping to version 0.1.1.20 for security bugs #134329 and #118918
+
+  23 Apr 2006; Emanuele Giaquinta <exg@gentoo.org> tor-0.1.0.14-r1.ebuild,
+  tor-0.1.0.16.ebuild, tor-0.1.0.17.ebuild:
+  Move enew{group,user} in pkg_setup.
+
+*tor-0.1.0.17 (28 Feb 2006)
+
+  28 Feb 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +tor-0.1.0.17.ebuild:
+  Bump to 0.1.017. Credits go to Christian Mandery in bug #123530 for
+  reporting this.
+
+*tor-0.1.0.16 (04 Jan 2006)
+
+  04 Jan 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/torrc.sample-0.1.0.16.patch, +files/tor.confd, +files/tor.initd-r1,
+  +tor-0.1.0.16.ebuild:
+  Adding tor 1.0.16 to portage. Arch teams please dont mark stable as the new
+  chroot stuff needs serious testing.
+
+*tor-0.1.0.14-r1 (11 Sep 2005)
+
+  11 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
+  -tor-0.1.0.14.ebuild, +tor-0.1.0.14-r1.ebuild:
+  I was having some strange issues with sending signal 2 to tor. And we do not
+  need a SIGINT, a SIGTERM is fine.
+
+  06 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/torrc.sample.patch-00, -tor-0.0.9.10.ebuild:
+  Removing older version.
+
+  16 Aug 2005; Jason Wever <weeve@gentoo.org> tor-0.1.0.14.ebuild:
+  Stable on SPARC wrt security bug #102245.
+
+  15 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.1.0.14.ebuild:
+  Stable on ppc.
+
+  15 Aug 2005; Markus Rothe <corsair@gentoo.org> tor-0.1.0.14.ebuild:
+  Stable on ppc64 (bug #102245)
+
+*tor-0.1.0.14 (14 Aug 2005)
+
+  14 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/torrc.sample-0.1.0.14.patch, +tor-0.1.0.14.ebuild:
+  Adding new version as amd64 and x86 due to sec bug. See #102245
+
+  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on amd64.
+
+  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on sparc
+
+  21 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on ppc (#96320).
+
+  21 Jun 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on ppc64
+
+*tor-0.0.9.10 (16 Jun 2005)
+
+  16 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -tor-0.0.9.5.ebuild, -tor-0.0.9.6.ebuild, -tor-0.0.9.7.ebuild,
+  -tor-0.0.9.9.ebuild, +tor-0.0.9.10.ebuild:
+  Added version 0.9.0.10 that fixes a security bug, removed older versions
+  that were affected.
+
+  12 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
+  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild, tor-0.0.9.9.ebuild:
+  New HOMEPAGE, thanks to Matteo in bug #95754.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
+  Stable on ppc64
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.5.ebuild:
+  Stable on ppc.
+
+*tor-0.0.9.9 (25 Apr 2005)
+
+  25 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
+  tor-0.0.9.6.ebuild, +tor-0.0.9.9.ebuild:
+  Removing older versions and bumping to 0.9.9 .
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> tor-0.0.9.5.ebuild,
+  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild:
+  net-misc/tsocks -> net-proxy/tsocks
+
+  08 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.7.ebuild:
+  Keyworded ~sparc wrt #88305
+
+*tor-0.0.9.7 (01 Apr 2005)
+
+  01 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.7.ebuild:
+  Bumped
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #86993
+
+*tor-0.0.9.6 (25 Mar 2005)
+
+  25 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.6.ebuild:
+  Bumped to 0.0.9.6
+
+  23 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd:
+  Changed init script to send SIGINT at shutdown. May increase the shutdown time
+  of servers, but will close in a more clean way.
+
+  25 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -tor-0.0.9.4-r1.ebuild, -tor-0.0.9.4-r2.ebuild, tor-0.0.9.5.ebuild:
+  Marking latest as x86 and removing older versions.
+
+*tor-0.0.9.5 (23 Feb 2005)
+
+  23 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.0.9.4-r2.ebuild, +tor-0.0.9.5.ebuild:
+  Adding version 0.0.9.5 and marking 0.0.9.4-r2 as x86.
+
+*tor-0.0.9.4-r2 (13 Feb 2005)
+
+  13 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
+  +files/torrc.sample.patch-00, -tor-0.0.8.1.ebuild, -tor-0.0.9.1.ebuild,
+  -tor-0.0.9.2.ebuild, +tor-0.0.9.4-r2.ebuild, -tor-0.0.9.4.ebuild:
+  Adding new version that properly patches the sample config and deleting older
+  versions. Lost the stable ppc-macos but that arch is lagging way to much.
+
+*tor-0.0.9.4-r1 (10 Feb 2005)
+
+  10 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; +files/tor.initd,
+  +tor-0.0.9.4-r1.ebuild:
+  Using ideas in bug #75381 from Faustus <orlovm@cs.bgu.ac.il> and after talking
+  to latexer i'm commiting this version that can use a init.d script for easier
+  usage.
+
+*tor-0.0.9.4 (04 Feb 2005)
+
+  04 Feb 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.4.ebuild:
+  Bump.
+
+  09 Jan 2005; Marcus Hanwell <cryos@gentoo.org> tor-0.0.9.2.ebuild:
+  Marked ~amd64, closes bug 76780.
+
+*tor-0.0.9.2 (04 Jan 2005)
+
+  04 Jan 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.2.ebuild:
+  Bump.
+
+*tor-0.0.9.1 (16 Dec 2004)
+
+  16 Dec 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.1.ebuild:
+  Bump. Add tsocks dependancy, see bug #70879
+
+  20 Oct 2004; Peter Johanson <latexer@gentoo.org> -tor-0.0.6.1.ebuild,
+  -tor-0.0.6.ebuild, -tor-0.0.7.2.ebuild, -tor-0.0.7.3.ebuild,
+  -tor-0.0.7.ebuild:
+  Remove old vulnerable versions. See bug #67756
+
+  21 Oct 2004; Joseph Jezak <josejx@gentoo.org> tor-0.0.8.1.ebuild:
+  Keyworded ppc-macos and macos due to vulnerability in previous versions.
+  Removed tsocks RDEPEND at the request of latexer. See bug #67756
+
+*tor-0.0.8.1 (17 Oct 2004)
+
+  17 Oct 2004; <peter@gentoo.org> +tor-0.0.8.1.ebuild, -tor-0.0.8.ebuild:
+  Bump and remove 0.0.8 which is vulnerable to a remote DoS. See bug #67756.
+
+*tor-0.0.8 (06 Oct 2004)
+
+  06 Oct 2004; <peter@gentoo.org> tor-0.0.6.1.ebuild, tor-0.0.6.ebuild,
+  tor-0.0.7.2.ebuild, tor-0.0.7.3.ebuild, tor-0.0.7.ebuild, +tor-0.0.8.ebuild:
+  Bump. Also fix the license as this is really under 3-clause BSD.
+
+*tor-0.0.7.3 (15 Aug 2004)
+
+  15 Aug 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.3.ebuild:
+  Bump. Only needed for servers.
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  24 Jul 2004; Erik Swanson <erik@gentoo.org> tor-0.0.7.2.ebuild:
+  Added macos to KEYWORDS
+
+*tor-0.0.7.2 (15 Jul 2004)
+
+  15 Jul 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.2.ebuild:
+  Bump to latest version. tsocks is now a depend for everything but macos, since
+  tsocks no worky there.
+
+*tor-0.0.7 (07 Jun 2004)
+
+  07 Jun 2004; Peter Johanson,,, <peter@gentoo.org> tor-0.0.2_pre27.ebuild,
+  tor-0.0.5.ebuild, tor-0.0.6_rc1.ebuild, tor-0.0.7.ebuild:
+  Bump to lates release, and remove older versions.
+
+*tor-0.0.6.1 (06 May 2004)
+
+  06 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.1.ebuild:
+  Bump.
+
+  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
+  Adding back ~ppc, as dholm wants me to keep it around for future updates.
+
+*tor-0.0.6 (02 May 2004)
+
+  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
+  Bump to latest release.
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> tor-0.0.6_rc1.ebuild:
+  Added to ~ppc.
+
+*tor-0.0.6_rc1 (29 Apr 2004)
+
+  29 Apr 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6_rc1.ebuild:
+  Bump to latest. Beware, this version is not backwards compatible with older
+  versions.
+
+*tor-0.0.5 (30 Mar 2004)
+
+  30 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre21.ebuild,
+  tor-0.0.2_pre22.ebuild, tor-0.0.2_pre23.ebuild, tor-0.0.2_pre24.ebuild,
+  tor-0.0.2_pre25.ebuild, tor-0.0.5.ebuild:
+  Bump to latest release. Removed a bunch of the old stuff. Initscript coming
+  soon, i swear.
+
+*tor-0.0.2_pre27 (15 Mar 2004)
+
+  15 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre27.ebuild:
+  Bump.
+
+*tor-0.0.2_pre25 (04 Mar 2004)
+
+  04 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre25.ebuild:
+  Bump. Fixes a crash due to DNS stuff.
+
+*tor-0.0.2_pre24 (03 Mar 2004)
+
+  03 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre24.ebuild:
+  Bump
+
+*tor-0.0.2_pre23 (29 Feb 2004)
+
+  29 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre23.ebuild:
+  Bump
+
+*tor-0.0.2_pre22 (28 Feb 2004)
+
+  28 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre22.ebuild:
+  Bump
+
+*tor-0.0.2_pre21 (22 Feb 2004)
+
+  22 Feb 2004; Peter Johanson <latexer@gentoo.org> metadata.xml,
+  tor-0.0.2_pre21.ebuild:
+  Initial Commit. Ebuild by yours truly.
+

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
new file mode 100644
index 0000000..ff56277
--- /dev/null
+++ b/net-misc/tor/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
+AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c1819b24c0ab7940 SHA1 4400ed72fa60d04a96c82f0aba7c6eb41e23f5c5 SHA256 4500436719cb96a17bfd4eb67b2ebf2b1db222904bf1b14b75cc17b8f1b41345
+AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
+AUX tor.initd-r4 1553 RMD160 df0fc912c2e36797059de07d15a384d9ffe7d393 SHA1 82323d97b6d790b41027eec01e263d226c5b83e9 SHA256 4bf3c0906b0406564394eb51d47c1b5566904ed459e31ec1b1c1162c3b4aee92
+AUX torrc-r1 150 RMD160 e44d8b4b371978f09c536c234abbe9d8779eda4c SHA1 36c64d7a1ab33931045e77c3738321ab73141d01 SHA256 0283d644362b9fd36d3d21bb1b0c47e9776de15769a445fcc86e1a8fa5abf139
+AUX torrc.sample.patch 1292 RMD160 7199aa35ede10a2cf76e8deea47a7e399c3188f9 SHA1 aec4b133f7472c0a011b0724dafae464c31f3661 SHA256 7c8dcf90eacc25745d26562dd8d6956def92880948e859b5e75c6bea5f35322e
+DIST tor-0.2.2.32.tar.gz 2701371 RMD160 649c21f7ec89e34774c79db6544b612f0895bb61 SHA1 4baddc836931b3e915974c261e405e111636b716 SHA256 8744328c10b54950e08ee404a75a0e76865be0615cad6f7ffc8c75af7151ef4d
+DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
+EBUILD tor-0.2.2.32-r1.ebuild 2381 RMD160 3e8f2666e2f0829450937e1bd587cb48e0ff38fd SHA1 da6f1b7434b8e1f6d16ba8d8eed32f05bd7173d9 SHA256 a4bd4641ada9a06568ba4c48c2daddc49ad6b0db5639e726674454991d1f2cf9
+EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 82238d06d327a8ccabfeb65d3caeff7be5e5be95 SHA1 6e0db3eb3e65c24bb6ca6b249c2b00768bf0ca40 SHA256 a3d6855745bead98ecefec1a6a19b2cdeb35dff7ee03ce9a4b3b8768057b25bc
+MISC ChangeLog 40347 RMD160 5c24f105d438a017ab2269bf298f8afa9454b1d6 SHA1 50ce9dc3e5572191e5822d16fe3d36f3734113e2 SHA256 bf35487d48669fc4532c57738408c45aaee998f13518352b12377f231f146552
+MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk5cWoIACgkQl5yvQNBFVTWbDACfUCNmWhsyRKMR2vT3d99Ut8D/
+eYkAmQE+LH1LrYwcAcL7zfmRMruwXhcm
+=y8Eg
+-----END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
new file mode 100644
index 0000000..86b797b
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
@@ -0,0 +1,24 @@
+diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
+--- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
++++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
+@@ -9,6 +9,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -971,6 +976,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch b/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch
new file mode 100644
index 0000000..75981d5
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch
@@ -0,0 +1,11 @@
+diff --git a/tor-0.2.3.2-alpha.orig/src/tools/tor-fw-helper/Makefile.am b/tor-0.2.3.2-alpha/src/tools/tor-fw-helper/Makefile.am
+index 75878f2..77ff63f 100644
+--- a/tor-0.2.3.2-alpha.orig/src/tools/tor-fw-helper/Makefile.am
++++ b/tor-0.2.3.2-alpha/src/tools/tor-fw-helper/Makefile.am
+@@ -34,5 +34,5 @@ miniupnpc_cppflags =
+ endif
+ 
+ tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags)
+-tor_fw_helper_LDADD = $(nat_pmp_ldadd) $(miniupnpc_ldadd) ../../common/libor.a @TOR_LIB_WS32@
++tor_fw_helper_LDADD = ../../common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) @TOR_LIB_WS32@
+ tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags)

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
new file mode 100644
index 0000000..4195bf3
--- /dev/null
+++ b/net-misc/tor/files/tor.confd
@@ -0,0 +1,3 @@
+#
+# Set the file limit
+rc_ulimit="-n 30000"

diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4
new file mode 100644
index 0000000..597a955
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r4
@@ -0,0 +1,57 @@
+#!/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.7 2011/08/23 12:26:36 blueness 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 --signal HUP --pidfile ${PIDFILE}
+	eend $?
+}

diff --git a/net-misc/tor/files/torrc-r1 b/net-misc/tor/files/torrc-r1
new file mode 100644
index 0000000..fdbc2bd
--- /dev/null
+++ b/net-misc/tor/files/torrc-r1
@@ -0,0 +1,8 @@
+#
+# Minimal torrc so tor will work out of the box
+#
+User tor
+Group tor
+PIDFile /var/run/tor/tor.pid
+Log notice syslog
+DataDirectory /var/lib/tor/data

diff --git a/net-misc/tor/files/torrc.sample.patch b/net-misc/tor/files/torrc.sample.patch
new file mode 100644
index 0000000..2ff13c6
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample.patch
@@ -0,0 +1,31 @@
+diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/torrc.sample.in
+--- tor-0.2.2.32.orig/src/config/torrc.sample.in	2011-08-29 23:13:09.000000000 -0400
++++ tor-0.2.2.32/src/config/torrc.sample.in	2011-08-29 23:14:19.000000000 -0400
+@@ -12,6 +12,11 @@
+ ## Tor will look for this file in various places based on your platform:
+ ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#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
+ ## relay, and not make any local application connections yourself.
+@@ -40,6 +45,7 @@
+ #Log notice syslog
+ ## To send all messages to stderr:
+ #Log debug stderr
++Log notice syslog
+ 
+ ## Uncomment this to start the process in the background... or use
+ ## --runasdaemon 1 on the command line. This is ignored on Windows;
+@@ -49,6 +55,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.

diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
new file mode 100644
index 0000000..4d8f7a1
--- /dev/null
+++ b/net-misc/tor/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer>
+		<email>chiiph@gentoo.org</email>
+		<name>Tomás Touceda</name>
+	</maintainer>
+	<use>
+		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
+		<flag name='transparent-proxy'>Enable transparent proxying</flag>
+		<flag name='bufferevents'>Use Libevent's buffered IO</flag>
+		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
+		<flag name='upnp'>Enable Universal Plug and Play</flag>
+	</use>
+</pkgmetadata>

diff --git a/net-misc/tor/tor-0.2.2.32-r1.ebuild b/net-misc/tor/tor-0.2.2.32-r1.ebuild
new file mode 100644
index 0000000..724709f
--- /dev/null
+++ b/net-misc/tor/tor-0.2.2.32-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.32.ebuild,v 1.1 2011/08/28 11:10:10 blueness Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc tor-hardening +transparent-proxy threads"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+	econf --docdir=/usr/share/doc/${PF}				\
+		$(use_enable doc asciidoc)					\
+		$(use_enable tor-hardening gcc-hardening)	\
+		$(use_enable tor-hardening linker-hardening)\
+		$(use_enable transparent-proxy transparent)	\
+		$(use_enable threads)
+}
+
+src_install() {
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,run}/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/README
+
+	fperms 750 /var/lib/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/run/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}

diff --git a/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild b/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
new file mode 100644
index 0000000..ba6e449
--- /dev/null
+++ b/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild,v 1.2 2011/07/30 10:28:35 blueness Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0
+	nat-pmp? ( net-libs/libnatpmp )
+	upnp? ( <net-libs/miniupnpc-1.6 )"
+
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3.2_alpha-fix-asneeded.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+	econf --docdir=/usr/share/doc/${PF}				\
+		$(use_enable bufferevents)					\
+		$(use_enable doc asciidoc)					\
+		$(use_enable nat-pmp)						\
+		$(use_enable tor-hardening gcc-hardening)	\
+		$(use_enable tor-hardening linker-hardening)\
+		$(use_enable transparent-proxy transparent)	\
+		$(use_enable threads)						\
+		$(use_enable upnp)
+}
+
+src_install() {
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,run}/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/README
+
+	fperms 750 /var/lib/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/run/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-08-30  4:01 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-08-30  4:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1292f642faf27960e3bff954e9dc482beabc17c4
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 04:01:33 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 04:01:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=1292f642

net-misc/tor: check for /var/run/tor on start/reload

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

---
 net-misc/tor/ChangeLog                            |    4 ++++
 net-misc/tor/Manifest                             |   14 +++++++-------
 net-misc/tor/files/{tor.initd-r4 => tor.initd-r5} |    7 +++++++
 net-misc/tor/tor-0.2.2.32-r1.ebuild               |    2 +-
 net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild          |    2 +-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 8c04f9b..e90d114 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.269 2011/08/28 11:15:42 blueness Exp $
 
+  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> tor-0.2.2.32-r1.ebuild,
+  tor-0.2.3.2_alpha-r3.ebuild, +files/tor.initd-r5, -files/tor.initd-r4:
+  Check for /var/run/tor on start/reload
+
   30 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
   +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.2.32-r1.ebuild,
   +tor-0.2.3.2_alpha-r3.ebuild, +files/tor-0.2.3.2_alpha-fix-asneeded.patch,

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index ff56277..513c351 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -4,19 +4,19 @@ Hash: SHA256
 AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
 AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c1819b24c0ab7940 SHA1 4400ed72fa60d04a96c82f0aba7c6eb41e23f5c5 SHA256 4500436719cb96a17bfd4eb67b2ebf2b1db222904bf1b14b75cc17b8f1b41345
 AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
-AUX tor.initd-r4 1553 RMD160 df0fc912c2e36797059de07d15a384d9ffe7d393 SHA1 82323d97b6d790b41027eec01e263d226c5b83e9 SHA256 4bf3c0906b0406564394eb51d47c1b5566904ed459e31ec1b1c1162c3b4aee92
+AUX tor.initd-r5 1733 RMD160 f9c885c699884f5c7c7e0cbae48c4ea6eb6f83a2 SHA1 3db9cf78e8cde3cc0a6d9740ed12ce087acffc75 SHA256 ffd7ce8f5e88c08fa6c1c2e1db0674d5e8452bbc522aa37bad76a41bc332431d
 AUX torrc-r1 150 RMD160 e44d8b4b371978f09c536c234abbe9d8779eda4c SHA1 36c64d7a1ab33931045e77c3738321ab73141d01 SHA256 0283d644362b9fd36d3d21bb1b0c47e9776de15769a445fcc86e1a8fa5abf139
 AUX torrc.sample.patch 1292 RMD160 7199aa35ede10a2cf76e8deea47a7e399c3188f9 SHA1 aec4b133f7472c0a011b0724dafae464c31f3661 SHA256 7c8dcf90eacc25745d26562dd8d6956def92880948e859b5e75c6bea5f35322e
 DIST tor-0.2.2.32.tar.gz 2701371 RMD160 649c21f7ec89e34774c79db6544b612f0895bb61 SHA1 4baddc836931b3e915974c261e405e111636b716 SHA256 8744328c10b54950e08ee404a75a0e76865be0615cad6f7ffc8c75af7151ef4d
 DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
-EBUILD tor-0.2.2.32-r1.ebuild 2381 RMD160 3e8f2666e2f0829450937e1bd587cb48e0ff38fd SHA1 da6f1b7434b8e1f6d16ba8d8eed32f05bd7173d9 SHA256 a4bd4641ada9a06568ba4c48c2daddc49ad6b0db5639e726674454991d1f2cf9
-EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 82238d06d327a8ccabfeb65d3caeff7be5e5be95 SHA1 6e0db3eb3e65c24bb6ca6b249c2b00768bf0ca40 SHA256 a3d6855745bead98ecefec1a6a19b2cdeb35dff7ee03ce9a4b3b8768057b25bc
-MISC ChangeLog 40347 RMD160 5c24f105d438a017ab2269bf298f8afa9454b1d6 SHA1 50ce9dc3e5572191e5822d16fe3d36f3734113e2 SHA256 bf35487d48669fc4532c57738408c45aaee998f13518352b12377f231f146552
+EBUILD tor-0.2.2.32-r1.ebuild 2381 RMD160 0bffd0fbcf2798bbd28d7d0f418ef1b7bfa1bcbe SHA1 67d33f2f8d37a4516b7935f925b697703fb6e735 SHA256 b7a4c3abeafa81c5645d1cbdd69d2200ea6d0d62d0b03ae852789ce296da2c3e
+EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 5283a8a27e751d3275c3a229c92087a58995a5a4 SHA1 71c8257888002c40913d7d34970a7784a78c4b19 SHA256 f752c1911199bf7379b0d3811f1c8e695443086bbe745d8f9c20019136fc37da
+MISC ChangeLog 40541 RMD160 574b49be75e81d1d232868cceb53e0a8f15d8b3a SHA1 ccf5f459bc58b70c333bdb69a373dfd030e525cd SHA256 06dfe0f7d635c352824719ed5823f06439034d397602c8bd52263a4a4f19db38
 MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk5cWoIACgkQl5yvQNBFVTWbDACfUCNmWhsyRKMR2vT3d99Ut8D/
-eYkAmQE+LH1LrYwcAcL7zfmRMruwXhcm
-=y8Eg
+iEYEAREIAAYFAk5cYJ0ACgkQl5yvQNBFVTVnxACfcf4aeZ/gKsbX54kt6fQezH7+
+sLkAn098TMHhE9IgDBBug+7VY7YbAGcV
+=fQ2W
 -----END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r5
similarity index 89%
rename from net-misc/tor/files/tor.initd-r4
rename to net-misc/tor/files/tor.initd-r5
index 597a955..f55fefb 100644
--- a/net-misc/tor/files/tor.initd-r4
+++ b/net-misc/tor/files/tor.initd-r5
@@ -29,6 +29,13 @@ checkconfig() {
 		/usr/bin/tor --verify-config -f ${CONFFILE}
 		return 1
 	fi
+
+	# finally check if /var/run/tor exists and belongs to tor:tor
+	if [ ! -d /var/run/tor ] ; then
+		mkdir -p /var/run/tor
+		chown tor:tor /var/run/tor
+		chmod 0755 /var/run/tor
+	fi
 }
 
 start() {

diff --git a/net-misc/tor/tor-0.2.2.32-r1.ebuild b/net-misc/tor/tor-0.2.2.32-r1.ebuild
index 724709f..5830049 100644
--- a/net-misc/tor/tor-0.2.2.32-r1.ebuild
+++ b/net-misc/tor/tor-0.2.2.32-r1.ebuild
@@ -52,7 +52,7 @@ src_configure() {
 
 src_install() {
 	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	newinitd "${FILESDIR}"/tor.initd-r5 tor
 	emake DESTDIR="${D}" install || die
 	keepdir /var/{lib,run}/tor
 

diff --git a/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild b/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
index ba6e449..494280e 100644
--- a/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
+++ b/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
@@ -58,7 +58,7 @@ src_configure() {
 
 src_install() {
 	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	newinitd "${FILESDIR}"/tor.initd-r5 tor
 	emake DESTDIR="${D}" install || die
 	keepdir /var/{lib,run}/tor
 



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-08-30  4:06 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-08-30  4:06 UTC (permalink / raw
  To: gentoo-commits

commit:     2d450f46f50d182ef373bf8b697520cb5960fb53
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 04:06:08 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 04:06:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=2d450f46

Remove obsolete configuration option 'Group'

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

---
 net-misc/tor/ChangeLog                |    4 ++++
 net-misc/tor/Manifest                 |   12 ++++++------
 net-misc/tor/files/torrc-r1           |    1 -
 net-misc/tor/files/torrc.sample.patch |    7 +++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index e90d114..051ef02 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.269 2011/08/28 11:15:42 blueness Exp $
 
+  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/torrc-r1,
+  files/torrc.sample.patch:
+  Remove obsolete configuration option 'Group'
+
   30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> tor-0.2.2.32-r1.ebuild,
   tor-0.2.3.2_alpha-r3.ebuild, +files/tor.initd-r5, -files/tor.initd-r4:
   Check for /var/run/tor on start/reload

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 513c351..69aa021 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -5,18 +5,18 @@ AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6be
 AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c1819b24c0ab7940 SHA1 4400ed72fa60d04a96c82f0aba7c6eb41e23f5c5 SHA256 4500436719cb96a17bfd4eb67b2ebf2b1db222904bf1b14b75cc17b8f1b41345
 AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
 AUX tor.initd-r5 1733 RMD160 f9c885c699884f5c7c7e0cbae48c4ea6eb6f83a2 SHA1 3db9cf78e8cde3cc0a6d9740ed12ce087acffc75 SHA256 ffd7ce8f5e88c08fa6c1c2e1db0674d5e8452bbc522aa37bad76a41bc332431d
-AUX torrc-r1 150 RMD160 e44d8b4b371978f09c536c234abbe9d8779eda4c SHA1 36c64d7a1ab33931045e77c3738321ab73141d01 SHA256 0283d644362b9fd36d3d21bb1b0c47e9776de15769a445fcc86e1a8fa5abf139
-AUX torrc.sample.patch 1292 RMD160 7199aa35ede10a2cf76e8deea47a7e399c3188f9 SHA1 aec4b133f7472c0a011b0724dafae464c31f3661 SHA256 7c8dcf90eacc25745d26562dd8d6956def92880948e859b5e75c6bea5f35322e
+AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738
+AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14
 DIST tor-0.2.2.32.tar.gz 2701371 RMD160 649c21f7ec89e34774c79db6544b612f0895bb61 SHA1 4baddc836931b3e915974c261e405e111636b716 SHA256 8744328c10b54950e08ee404a75a0e76865be0615cad6f7ffc8c75af7151ef4d
 DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
 EBUILD tor-0.2.2.32-r1.ebuild 2381 RMD160 0bffd0fbcf2798bbd28d7d0f418ef1b7bfa1bcbe SHA1 67d33f2f8d37a4516b7935f925b697703fb6e735 SHA256 b7a4c3abeafa81c5645d1cbdd69d2200ea6d0d62d0b03ae852789ce296da2c3e
 EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 5283a8a27e751d3275c3a229c92087a58995a5a4 SHA1 71c8257888002c40913d7d34970a7784a78c4b19 SHA256 f752c1911199bf7379b0d3811f1c8e695443086bbe745d8f9c20019136fc37da
-MISC ChangeLog 40541 RMD160 574b49be75e81d1d232868cceb53e0a8f15d8b3a SHA1 ccf5f459bc58b70c333bdb69a373dfd030e525cd SHA256 06dfe0f7d635c352824719ed5823f06439034d397602c8bd52263a4a4f19db38
+MISC ChangeLog 40688 RMD160 53704059532036b9cc35b3604f01ca66fcec12ed SHA1 3b8fb9b5fa47bba6aa7364909b4d273031cef84e SHA256 37bb1e58a3afc357838dae3f0238206be99f9eba480108e25bc8754c130a5f6b
 MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk5cYJ0ACgkQl5yvQNBFVTVnxACfcf4aeZ/gKsbX54kt6fQezH7+
-sLkAn098TMHhE9IgDBBug+7VY7YbAGcV
-=fQ2W
+iEYEAREIAAYFAk5cYbAACgkQl5yvQNBFVTWDiQCdE5tJSvKaaJZEj5rk7I2yv4e8
+2u8An0AzKddh295DXXyFMfcfPKntCzFq
+=cvgi
 -----END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/torrc-r1 b/net-misc/tor/files/torrc-r1
index fdbc2bd..322a794 100644
--- a/net-misc/tor/files/torrc-r1
+++ b/net-misc/tor/files/torrc-r1
@@ -2,7 +2,6 @@
 # Minimal torrc so tor will work out of the box
 #
 User tor
-Group tor
 PIDFile /var/run/tor/tor.pid
 Log notice syslog
 DataDirectory /var/lib/tor/data

diff --git a/net-misc/tor/files/torrc.sample.patch b/net-misc/tor/files/torrc.sample.patch
index 2ff13c6..4a1592a 100644
--- a/net-misc/tor/files/torrc.sample.patch
+++ b/net-misc/tor/files/torrc.sample.patch
@@ -1,19 +1,18 @@
 diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/torrc.sample.in
 --- tor-0.2.2.32.orig/src/config/torrc.sample.in	2011-08-29 23:13:09.000000000 -0400
 +++ tor-0.2.2.32/src/config/torrc.sample.in	2011-08-29 23:14:19.000000000 -0400
-@@ -12,6 +12,11 @@
+@@ -12,6 +12,10 @@
  ## Tor will look for this file in various places based on your platform:
  ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#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
  ## relay, and not make any local application connections yourself.
-@@ -40,6 +45,7 @@
+@@ -40,6 +44,7 @@
  #Log notice syslog
  ## To send all messages to stderr:
  #Log debug stderr
@@ -21,7 +20,7 @@ diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/
  
  ## Uncomment this to start the process in the background... or use
  ## --runasdaemon 1 on the command line. This is ignored on Windows;
-@@ -49,6 +55,7 @@
+@@ -49,6 +54,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



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-08-30 11:30 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-08-30 11:30 UTC (permalink / raw
  To: gentoo-commits

commit:     b8a558a87e3b1242cc6c7b746fcf9d2ce70a9b75
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 11:30:15 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 11:30:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=b8a558a8

net-misc/tor: make tor.initd-r5 checkvarrun fool proof

---
 net-misc/tor/ChangeLog          |    3 +++
 net-misc/tor/files/tor.initd-r5 |   33 +++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 051ef02..31c4316 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.269 2011/08/28 11:15:42 blueness Exp $
 
+  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/tor.initd-r5:
+  Make tor.initd-r5 checkvarrun fool proof
+
   30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/torrc-r1,
   files/torrc.sample.patch:
   Remove obsolete configuration option 'Group'

diff --git a/net-misc/tor/files/tor.initd-r5 b/net-misc/tor/files/tor.initd-r5
index f55fefb..d27a411 100644
--- a/net-misc/tor/files/tor.initd-r5
+++ b/net-misc/tor/files/tor.initd-r5
@@ -3,14 +3,33 @@
 # 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.7 2011/08/23 12:26:36 blueness Exp $
 
-opts="${opts} checkconfig reload"
-PIDFILE=/var/run/tor/tor.pid
-CONFFILE=/etc/tor/torrc
+opts="${opts} checkconfig checkvarrun reload"
+PIDDIR="/var/run/tor"
+PIDFILE="${PIDDIR}/tor.pid"
+CONFFILE="/etc/tor/torrc"
 
 depend() {
         need net
 }
 
+checkvarrun()
+{
+	# Check if /var/run/tor exists, create it if it doesn't 
+	[ ! -d /var/run/tor ] && mkdir -p /var/run/tor
+	[ ! -d /var/run/tor ] && return 1
+
+	# The directory definitly exists now, but does it belong to tor?
+	find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor >/dev/null && chown tor:tor ${PIDDIR}
+	find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor >/dev/null && return 1
+
+	# And does it have the right perms?
+	find ${PIDDIR} -maxdepth 0 -perm 0755 >/dev/null && chmod 0755 /var/run/tor
+	find ${PIDDIR} -maxdepth 0 -perm 0755 >/dev/null && return 1
+
+	# If any of the above failed, we would not be here
+	return 0
+}
+
 checkconfig() {
         # first check that it exists
         if [ ! -f ${CONFFILE} ] ; then
@@ -29,17 +48,11 @@ checkconfig() {
 		/usr/bin/tor --verify-config -f ${CONFFILE}
 		return 1
 	fi
-
-	# finally check if /var/run/tor exists and belongs to tor:tor
-	if [ ! -d /var/run/tor ] ; then
-		mkdir -p /var/run/tor
-		chown tor:tor /var/run/tor
-		chmod 0755 /var/run/tor
-	fi
 }
 
 start() {
 	checkconfig || return 1
+	checkvarrun || 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



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-08-30 13:47 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-08-30 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     00d7b8e4b4d7c7a786bb6c9a22eaaeb1b4ac75b4
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 13:47:35 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 13:47:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=00d7b8e4

net-misc/tor: fix logic of find in checkvarrun

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

---
 net-misc/tor/ChangeLog          |    3 +++
 net-misc/tor/Manifest           |   14 ++++++++++++--
 net-misc/tor/files/tor.initd-r5 |   16 ++++++++++------
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 31c4316..c14346b 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.269 2011/08/28 11:15:42 blueness Exp $
 
   30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/tor.initd-r5:
+  Fix logic of find in checkvarrun
+
+  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/tor.initd-r5:
   Make tor.initd-r5 checkvarrun fool proof
 
   30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/torrc-r1,

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index bd92412..1ce83c3 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,12 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
 AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c1819b24c0ab7940 SHA1 4400ed72fa60d04a96c82f0aba7c6eb41e23f5c5 SHA256 4500436719cb96a17bfd4eb67b2ebf2b1db222904bf1b14b75cc17b8f1b41345
 AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
-AUX tor.initd-r5 2251 RMD160 cd0d92439d2b00b0cf24225279ee0bd3ee1be97b SHA1 8e45b1e043135236be3fa549edfcd68a9328c30b SHA256 caaed0d9ad061cb0e131c244e2b96e7c76cd4be356f2acea2fa773d6fca76010
+AUX tor.initd-r5 2299 RMD160 b0d0daf179dda2de496453fa406fcab8831180b4 SHA1 9d53d783a1fb9fa8d368b18fec8c560c7a5e764f SHA256 260ba8f87690b58f2cf08eace8c65ac2e149d4fe87e91f98134585e6a36b45ea
 AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738
 AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14
 DIST tor-0.2.2.32.tar.gz 2701371 RMD160 649c21f7ec89e34774c79db6544b612f0895bb61 SHA1 4baddc836931b3e915974c261e405e111636b716 SHA256 8744328c10b54950e08ee404a75a0e76865be0615cad6f7ffc8c75af7151ef4d
 DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
 EBUILD tor-0.2.2.32-r1.ebuild 2381 RMD160 0bffd0fbcf2798bbd28d7d0f418ef1b7bfa1bcbe SHA1 67d33f2f8d37a4516b7935f925b697703fb6e735 SHA256 b7a4c3abeafa81c5645d1cbdd69d2200ea6d0d62d0b03ae852789ce296da2c3e
 EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 5283a8a27e751d3275c3a229c92087a58995a5a4 SHA1 71c8257888002c40913d7d34970a7784a78c4b19 SHA256 f752c1911199bf7379b0d3811f1c8e695443086bbe745d8f9c20019136fc37da
-MISC ChangeLog 40807 RMD160 ed5e6e91c774062b802da5e05fc4d23311a3d2a5 SHA1 f48cf35caebed892cdc03348c0e9240df3bea4c3 SHA256 ad8138accb19334434992f1dcad9a4bd51b627580370adeb59e683d3728c8cd3
+MISC ChangeLog 40918 RMD160 0a9d2ee9607f942b3ec973e468e88808c035f697 SHA1 ed70761da0e379bcc013d94db459638e5b30034c SHA256 dde05ef6d26ed673c47c6a76558424c6df5b67e9655a8047697c36b05cc3655c
 MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk5c6fcACgkQl5yvQNBFVTVhuACeP/UhrvYPetzy/dM7//oTZB06
+yDYAnA9IY+i+P6KrLBbkHQgblspIowFy
+=PcdQ
+-----END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor.initd-r5 b/net-misc/tor/files/tor.initd-r5
index d27a411..11027e2 100644
--- a/net-misc/tor/files/tor.initd-r5
+++ b/net-misc/tor/files/tor.initd-r5
@@ -15,16 +15,20 @@ depend() {
 checkvarrun()
 {
 	# Check if /var/run/tor exists, create it if it doesn't 
-	[ ! -d /var/run/tor ] && mkdir -p /var/run/tor
+	[ ! -d /var/run/tor ] && mkdir -p ${PIDDIR}
 	[ ! -d /var/run/tor ] && return 1
 
-	# The directory definitly exists now, but does it belong to tor?
-	find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor >/dev/null && chown tor:tor ${PIDDIR}
-	find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor >/dev/null && return 1
+	# The directory definitly exists now, but does it belong to tor:tor?
+	local dir=$(find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor)
+	[ -z "$dir" ] && chown tor:tor ${PIDDIR}
+	dir=$(find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor)
+	[ -z "$dir" ] && return 1
 
 	# And does it have the right perms?
-	find ${PIDDIR} -maxdepth 0 -perm 0755 >/dev/null && chmod 0755 /var/run/tor
-	find ${PIDDIR} -maxdepth 0 -perm 0755 >/dev/null && return 1
+	dir=$(find ${PIDDIR} -maxdepth 0 -perm 0755)
+	[ -z "$dir" ] && chmod 0755 ${PIDDIR}
+	dir=$(find ${PIDDIR} -maxdepth 0 -perm 0755)
+	[ -z "$dir" ] && return 1
 
 	# If any of the above failed, we would not be here
 	return 0



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-08-31 11:46 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-08-31 11:46 UTC (permalink / raw
  To: gentoo-commits

commit:     1291c4fefc4f0f06864d84824ecb731065a76025
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 11:45:57 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 11:45:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=1291c4fe

net-misc/tor: moved to tree, bug #380117

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

---
 net-misc/tor/ChangeLog                             | 1190 --------------------
 net-misc/tor/Manifest                              |   22 -
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 -
 .../tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch |   11 -
 net-misc/tor/files/tor.confd                       |    3 -
 net-misc/tor/files/tor.initd-r5                    |   81 --
 net-misc/tor/files/torrc-r1                        |    7 -
 net-misc/tor/files/torrc.sample.patch              |   30 -
 net-misc/tor/metadata.xml                          |   20 -
 net-misc/tor/tor-0.2.2.32-r1.ebuild                |   82 --
 net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild           |   88 --
 11 files changed, 0 insertions(+), 1558 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
deleted file mode 100644
index c14346b..0000000
--- a/net-misc/tor/ChangeLog
+++ /dev/null
@@ -1,1190 +0,0 @@
-# ChangeLog for net-misc/tor
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.269 2011/08/28 11:15:42 blueness Exp $
-
-  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/tor.initd-r5:
-  Fix logic of find in checkvarrun
-
-  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/tor.initd-r5:
-  Make tor.initd-r5 checkvarrun fool proof
-
-  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/torrc-r1,
-  files/torrc.sample.patch:
-  Remove obsolete configuration option 'Group'
-
-  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org> tor-0.2.2.32-r1.ebuild,
-  tor-0.2.3.2_alpha-r3.ebuild, +files/tor.initd-r5, -files/tor.initd-r4:
-  Check for /var/run/tor on start/reload
-
-  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
-  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.2.32-r1.ebuild,
-  +tor-0.2.3.2_alpha-r3.ebuild, +files/tor-0.2.3.2_alpha-fix-asneeded.patch,
-  +files/tor.confd, +files/tor.initd-r4, +files/torrc-r1,
-  +files/torrc.sample.patch, +metadata.xml:
-  Log to syslog rather than a file, bug #380117
-
-*tor-0.2.3.2_alpha-r3 (30 Aug 2011)
-*tor-0.2.2.32-r1 (30 Aug 2011)
-
-  30 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
-  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.2.32-r1.ebuild,
-  +tor-0.2.3.2_alpha-r3.ebuild, +files/tor-0.2.3.2_alpha-fix-asneeded.patch,
-  +files/tor.confd, +files/tor.initd-r4, +files/torrc-r1,
-  +files/torrc.sample.patch, +metadata.xml:
-  Move logging to syslog, bug #380117
-
-  28 Aug 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.2.31_rc.ebuild:
-  Removed old release candidate
-
-*tor-0.2.2.32 (28 Aug 2011)
-
-  28 Aug 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.2.32.ebuild:
-  Version bump to new stable candidate
-
-  23 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/tor.initd-r4:
-  Removed incorrect --stop from init script, bug #379939
-
-*tor-0.2.2.31_rc (19 Aug 2011)
-
-  19 Aug 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.2.30_rc.ebuild,
-  -tor-0.2.2.30_rc-r1.ebuild, +tor-0.2.2.31_rc.ebuild,
-  -tor-0.2.3.2_alpha.ebuild:
-  Version bump RC and remove deprecated
-
-  05 Aug 2011; Anthony G. Basile <blueness@gentoo.org> files/tor.initd-r4:
-  Removed deprecated -oknodo, bug #377773
-
-  30 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  tor-0.2.3.2_alpha-r2.ebuild:
-  DEPEND only on <net-libs/miniupnpc-1.6, bug #376621
-
-*tor-0.2.3.2_alpha-r2 (22 Jul 2011)
-
-  22 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.3.2_alpha-r1.ebuild, +tor-0.2.3.2_alpha-r2.ebuild,
-  +files/tor-0.2.3.2_alpha-fix-asneeded.patch:
-  Address bug #375955
-
-*tor-0.2.3.2_alpha-r1 (21 Jul 2011)
-*tor-0.2.2.30_rc-r1 (21 Jul 2011)
-
-  21 Jul 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml,
-  +tor-0.2.2.30_rc-r1.ebuild, +tor-0.2.3.2_alpha-r1.ebuild:
-  Removed automatic configuration of features
-
-*tor-0.2.2.30_rc (19 Jul 2011)
-
-  19 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.29_beta.ebuild, +tor-0.2.2.30_rc.ebuild:
-  Beta bumped to first rc and removed deprecated
-
-*tor-0.2.3.2_alpha (19 Jul 2011)
-
-  19 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.3.1_alpha-r1.ebuild, +tor-0.2.3.2_alpha.ebuild:
-  Bumped alpha and removed deprecated
-
-*tor-0.2.2.29_beta (21 Jun 2011)
-
-  21 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.28_beta.ebuild, +tor-0.2.2.29_beta.ebuild:
-  Version bump beta, removed deprecated
-
-*tor-0.2.2.28_beta (10 Jun 2011)
-
-  10 Jun 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.30-r1.ebuild,
-  -tor-0.2.2.27_beta-r1.ebuild, +tor-0.2.2.28_beta.ebuild:
-  Version bump beta, and removed deprecated
-
-*tor-0.2.3.1_alpha-r1 (07 Jun 2011)
-*tor-0.2.2.27_beta-r1 (07 Jun 2011)
-
-  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.27_beta.ebuild, +tor-0.2.2.27_beta-r1.ebuild,
-  -tor-0.2.3.1_alpha.ebuild, +tor-0.2.3.1_alpha-r1.ebuild:
-  Forward ported rc_ulimit fix to beta and alpha, see bug #268396, comment #19
-
-*tor-0.2.1.30-r2 (07 Jun 2011)
-
-  07 Jun 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.30-r2.ebuild,
-  +files/tor.confd:
-  Use rc_ulimit to set file limit, see bug #268396, comment #19
-
-*tor-0.2.2.27_beta (30 May 2011)
-
-  30 May 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.25_alpha.ebuild, +tor-0.2.2.27_beta.ebuild:
-  Version bump and removed deprecated
-
-*tor-0.2.3.1_alpha (08 May 2011)
-
-  08 May 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.24_alpha.ebuild, +tor-0.2.3.1_alpha.ebuild:
-  Added new alpha 0.2.3.1 and removed older alpha 0.2.2.24
-
-  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.23_alpha.ebuild, -tor-0.2.2.23_alpha-r1.ebuild,
-  -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
-  Removed deprecated alpha
-
-*tor-0.2.2.25_alpha (29 Apr 2011)
-
-  29 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.25_alpha.ebuild:
-  Version bump
-
-*tor-0.2.2.24_alpha (18 Apr 2011)
-
-  18 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.24_alpha.ebuild,
-  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch:
-  Version bump
-
-*tor-0.2.1.30-r1 (10 Apr 2011)
-
-  10 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch,
-  files/torrc:
-  Backport of improved build system, see bug #360765
-
-  02 Apr 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.29.ebuild,
-  -tor-0.2.1.29-r1.ebuild:
-  Removed vulnerable versions, bug #359789
-
-  02 Apr 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.30.ebuild:
-  arm/sparc stable wrt #359789
-
-  28 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
-  Improved fix to build system, see bug #360765
-
-*tor-0.2.2.23_alpha-r1 (25 Mar 2011)
-
-  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.23_alpha-r1.ebuild,
-  +files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
-  Fixed build system to fully respect CFLAGS
-
-  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  tor-0.2.2.23_alpha.ebuild:
-  Removed superfluous USE flag
-
-  25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.22_alpha-r1.ebuild:
-  Removed outdated alpha
-
-  22 Mar 2011; Thomas Kahle <tomka@gentoo.org> tor-0.2.1.30.ebuild:
-  x86 stable per bug 359789
-
-  21 Mar 2011; Christoph Mende <angelos@gentoo.org> tor-0.2.1.30.ebuild:
-  Stable on amd64 wrt bug #359789
-
-  21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> tor-0.2.1.30.ebuild:
-  ppc/ppc64 stable wrt #359789
-
-*tor-0.2.2.23_alpha (11 Mar 2011)
-
-  11 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.23_alpha.ebuild:
-  Version bump on alpha and removal of deprecated vesion.
-
-  27 Feb 2011; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.1.29.ebuild:
-  Reverted removal of only stable ebuild on most arches.
-
-*tor-0.2.1.30 (27 Feb 2011)
-
-  27 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.1.29.ebuild,
-  +tor-0.2.1.30.ebuild:
-  Version bump and clean up.
-
-  12 Feb 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29-r1.ebuild:
-  sparc stable wrt #351920
-
-*tor-0.2.2.22_alpha-r1 (10 Feb 2011)
-
-  10 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
-  -tor-0.2.2.22_alpha.ebuild, +tor-0.2.2.22_alpha-r1.ebuild:
-  Added /etc/tor/torrc for alpha.
-
-*tor-0.2.1.29-r1 (09 Feb 2011)
-
-  09 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.1.29-r1.ebuild, +files/torrc:
-  Added /etc/tor/torrc so tor works out of the box.
-
-*tor-0.2.2.22_alpha (01 Feb 2011)
-
-  01 Feb 2011; Tomas Touceda <chiiph@gentoo.org> -tor-0.2.2.21_alpha.ebuild,
-  +tor-0.2.2.22_alpha.ebuild:
-  Version bump on alpha and cleanup.
-
-  24 Jan 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.28.ebuild:
-  Removed vulnerable version, see bug #351920
-
-  24 Jan 2011; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.29.ebuild:
-  sparc stable
-
-  23 Jan 2011; Markus Meier <maekke@gentoo.org> tor-0.2.1.29.ebuild:
-  arm stable, bug #351920
-
-  18 Jan 2011; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.29.ebuild:
-  stable x86, security bug 351920
-
-  17 Jan 2011; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.29.ebuild:
-  Stable on amd64 wrt bug #351920
-
-  17 Jan 2011; <xarth@gentoo.org> tor-0.2.1.29.ebuild:
-  ppc/ppc64 stable wrt #351920
-
-*tor-0.2.2.21_alpha (17 Jan 2011)
-*tor-0.2.1.29 (17 Jan 2011)
-
-  17 Jan 2011; Tomas Touceda <chiiph@gentoo.org> +tor-0.2.1.29.ebuild,
-  -tor-0.2.2.20_alpha.ebuild, +tor-0.2.2.21_alpha.ebuild:
-  Versiom bump. Clean old alpha.
-
-*tor-0.2.2.20_alpha (10 Jan 2011)
-
-  10 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
-  +tor-0.2.2.20_alpha.ebuild:
-  added alpha branch
-
-  07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.25.ebuild,
-  -tor-0.2.1.26.ebuild, -tor-0.2.1.27.ebuild:
-  clean up vulnerable versions
-
-  07 Jan 2011; Brent Baude <ranger@gentoo.org> tor-0.2.1.28.ebuild:
-  Marking tor-0.2.1.28 ppc for bug 349312
-
-  06 Jan 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
-  Removed fauli and added chiiph as maintainer
-
-  06 Jan 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
-  Added myself as maintainer
-
-  27 Dec 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.28.ebuild:
-  Marking tor-0.2.1.28 ppc64 for bug 349312
-
-  26 Dec 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.28.ebuild:
-  arm/sparc stable wrt #349312
-
-  26 Dec 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.28.ebuild:
-  Stable on amd64 wrt bug #349312
-
-  25 Dec 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.28.ebuild:
-  stable x86, security bug 349312
-
-*tor-0.2.1.28 (23 Dec 2010)
-
-  23 Dec 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.28.ebuild:
-  bump for security bug 349312
-
-  08 Dec 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.27.ebuild:
-  arm stable, bug #346759
-
-  03 Dec 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.27.ebuild:
-  request USE=tordns on net-proxy/tsocks to raise level of anonymity
-
-  28 Nov 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.27.ebuild:
-  Stable on amd64 wrt bug #346759
-
-*tor-0.2.1.27 (25 Nov 2010)
-
-  25 Nov 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.27.ebuild:
-  version bump, fixes OpenSSL issues, see bug 346715
-
-  14 Oct 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.26.ebuild:
-  stable ppc, bug 329879
-
-  30 Sep 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.25.ebuild:
-  stable ppc64, bug 309873
-
-  18 Sep 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.26.ebuild:
-  sparc stable wrt #329879
-
-  18 Aug 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.26.ebuild:
-  arm stable, bug #329879
-
-  30 Jul 2010; Markos Chandras <hwoarang@gentoo.org> tor-0.2.1.26.ebuild:
-  Stable on amd64 wrt bug #329879
-
-  26 Jul 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.26.ebuild:
-  stable x86, bug 329879
-
-*tor-0.2.1.26 (24 Jun 2010)
-
-  24 Jun 2010; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.22.ebuild,
-  +tor-0.2.1.26.ebuild:
-  version bump for bug 325243 by Michael <gentoo AT scribeofthenile DOT
-  com>, and clean up
-
-  06 Jun 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.25.ebuild:
-  arm stable wrt #300830
-
-  23 May 2010; Pacho Ramos <pacho@gentoo.org> tor-0.2.1.25.ebuild:
-  stable amd64, bug 309873
-
-  22 May 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
-  Remove humpback from metadata.xml (#34793)
-
-  17 Apr 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.22.ebuild,
-  tor-0.2.1.25.ebuild:
-  Add ~arm wrt #300830
-
-  05 Apr 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.25.ebuild:
-  sparc stable wrt #309873
-
-  24 Mar 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.25.ebuild:
-  stable ppc, bug 309873
-
-  24 Mar 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.25.ebuild:
-  stable x86, bug 309873
-
-  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
-  -tor-0.2.1.19-r2.ebuild, -files/tor-0.2.1.19-openssl.patch,
-  -tor-0.2.1.20-r1.ebuild, -tor-0.2.1.21.ebuild:
-  clean up
-
-*tor-0.2.1.25 (23 Mar 2010)
-
-  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.25.ebuild:
-  version bump
-
-  10 Feb 2010; Joseph Jezak <josejx@gentoo.org> tor-0.2.1.22.ebuild:
-  Marked ppc stable for bug #301701.
-
-  01 Feb 2010; Markus Meier <maekke@gentoo.org> tor-0.2.1.22.ebuild:
-  amd64 stable, bug #301701
-
-  30 Jan 2010; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.22.ebuild:
-  sparc stable wrt #301701
-
-  22 Jan 2010; Brent Baude <ranger@gentoo.org> tor-0.2.1.22.ebuild:
-  Marking tor-0.2.1.22 ppc64 for bug 301701
-
-  22 Jan 2010; Christian Faulhammer <fauli@gentoo.org> tor-0.2.1.22.ebuild:
-  stable x86, bug 301701
-
-*tor-0.2.1.22 (22 Jan 2010)
-
-  22 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.22.ebuild:
-  version bump for security bug 301701
-
-*tor-0.2.1.21 (16 Jan 2010)
-
-  16 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.21.ebuild:
-  version bump, bug 301169 by Tim O'Kelly <bugs_gentoo_org DOT Tim_OKelly AT
-  neverbox DOT org>
-
-  27 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
-  -files/tor-0.2.0.30-logrotate.patch,
-  -files/tor-0.2.0.33-no-internal-libevent.patch, -tor-0.2.0.35.ebuild,
-  -tor-0.2.1.19.ebuild, -tor-0.2.1.19-r1.ebuild:
-  clean up
-
-  26 Dec 2009; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.19-r2.ebuild:
-  sparc stable wrt #294297
-
-  08 Dec 2009; Brent Baude <ranger@gentoo.org> tor-0.2.1.19-r2.ebuild:
-  Marking tor-0.2.1.19-r2 ppc64 for bug 294297
-
-*tor-0.2.1.20-r1 (06 Dec 2009)
-
-  06 Dec 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.20.ebuild,
-  +tor-0.2.1.20-r1.ebuild:
-  reintroduce OpenSSL patch for bug 292661
-
-*tor-0.2.1.20 (02 Dec 2009)
-
-  02 Dec 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.20.ebuild:
-  version bump
-
-  25 Nov 2009; Markus Meier <maekke@gentoo.org> tor-0.2.1.19-r2.ebuild:
-  amd64 stable, bug #294297
-
-  24 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
-  tor-0.2.1.19-r2.ebuild:
-  stable x86, bug 294297
-
-  21 Nov 2009; nixnut <nixnut@gentoo.org> tor-0.2.1.19-r2.ebuild:
-  ppc stable #292022
-
-*tor-0.2.1.19-r2 (12 Nov 2009)
-
-  12 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
-  +tor-0.2.1.19-r2.ebuild, +files/tor-0.2.1.19-openssl.patch:
-  fix bug 2926611, patch discovered by Aidan Marks <aidan AT cisco DOT com>
-
-  07 Sep 2009; Christian Faulhammer <fauli@gentoo.org> files/tor.initd-r4:
-  respect CONFFILE variable in start calls, reported by Iome <frodone AT
-  gmail DOT com> in bug 283524
-
-*tor-0.2.1.19-r1 (17 Aug 2009)
-
-  17 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
-  +tor-0.2.1.19-r1.ebuild, +files/tor-0.2.1.19-logrotate.patch:
-  fix logrotate support as provided by Martin von Gagern <Martin AT vGagern
-  AT gmx DOT net> in bug 281439
-
-  06 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
-  -tor-0.2.1.16_rc.ebuild:
-  clean up release candidate
-
-*tor-0.2.1.19 (06 Aug 2009)
-
-  06 Aug 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.1.19.ebuild:
-  version bump
-
-  14 Jul 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.34.ebuild:
-  remove vulnerable version
-
-  12 Jul 2009; Joseph Jezak <josejx@gentoo.org> tor-0.2.0.35.ebuild:
-  Marked ppc stable for bug #275628.
-
-  30 Jun 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.35.ebuild:
-  Marking tor-0.2.0.35 ppc64 for bug 275628
-
-  30 Jun 2009; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.35.ebuild:
-  sparc stable wrt #275628
-
-  29 Jun 2009; Christian Faulhammer <fauli@gentoo.org> tor-0.2.0.34.ebuild,
-  tor-0.2.0.35.ebuild, tor-0.2.1.16_rc.ebuild:
-  fix HOMEPAGE entries
-
-  29 Jun 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.35.ebuild:
-  amd64 stable, bug #275628
-
-*tor-0.2.1.16_rc (29 Jun 2009)
-
-  29 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  -tor-0.2.1.15_rc.ebuild, +tor-0.2.1.16_rc.ebuild:
-  extend version bump for security bug 275628 and remove one vulnerable
-  version
-
-*tor-0.2.0.35 (28 Jun 2009)
-
-  28 Jun 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.35.ebuild:
-  version bump for security bug 275628, directly stable for x86
-
-  17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  tor-0.2.1.15_rc.ebuild:
-  remove all occurences of USE=bundledlibevent
-
-*tor-0.2.1.15_rc (17 Jun 2009)
-
-  17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  +tor-0.2.1.15_rc.ebuild:
-  add release candidate for 0.2.1 series
-
-  12 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  files/torrc.sample-0.1.2.6.patch, +tor-0.2.0.34.ebuild,
-  -tor-0.2.0.34-r2.ebuild, +files/tor.initd-r4, -files/tor.initd-r6:
-  revert all my changes for bug 268396 as they will break badly with
-  Baselayout 1, see bug 272527
-
-*tor-0.2.0.34-r2 (03 Jun 2009)
-
-  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org> -files/tor.initd-r5,
-  +files/tor.initd-r6, -tor-0.2.0.34-r1.ebuild, +tor-0.2.0.34-r2.ebuild:
-  revision bump to make it compatible with Baselayout 1, as reported by
-  Stanislav Cymbalov <DummyUnit AT gmail.com> in bug 272404
-
-*tor-0.2.0.34-r1 (03 Jun 2009)
-
-  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  files/torrc.sample-0.1.2.6.patch, -files/tor.initd-r4,
-  +files/tor.initd-r5, -tor-0.2.0.34.ebuild, +tor-0.2.0.34-r1.ebuild:
-  Really respect limits from /etc/limits.d/ by some tweaks: moving user
-  context switch from torrc to init script, including verification of config
-  file in the latter; fixes bug 268396 by W. Elschner <gentoobugzilla_reply AT
-  elschner DOT net>
-
-  19 Feb 2009; nixnut <nixnut@gentoo.org> tor-0.2.0.34.ebuild:
-  ppc stable
-
-  18 Feb 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.33.ebuild:
-  clean up vulnerable versions
-
-  15 Feb 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.34.ebuild:
-  amd64/x86 stable, bug #258833
-
-  13 Feb 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.34.ebuild:
-  Marking tor-0.2.0.34 ppc64 for bug 258833
-
-  13 Feb 2009; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.34.ebuild:
-  Sparc stable --- Security Bug #258833 --- tests good.
-
-*tor-0.2.0.34 (13 Feb 2009)
-
-  13 Feb 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.34.ebuild:
-  version bump for security bug 258833, reported by Jesse Adelman <jesse AT
-  boldandbusted DOT com>
-
-  08 Feb 2009; Christian Faulhammer <fauli@gentoo.org> tor-0.2.0.33.ebuild:
-  kill logrotate USE flag as requested by bangert on bug 258188
-
-  05 Feb 2009; Christian Faulhammer <fauli@gentoo.org>
-  +files/tor-0.2.0.33-no-internal-libevent.patch, metadata.xml,
-  tor-0.2.0.33.ebuild:
-  make use of bundled libevent async DNS part optional via USE=flag, this
-  should fix bug 206969
-
-  26 Jan 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.32.ebuild,
-  -tor-0.2.0.32-r1.ebuild:
-  clean up
-
-  25 Jan 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.33.ebuild:
-  amd64/x86 stable, bug #256078
-
-  24 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.2.0.33.ebuild:
-  ppc stable, bug #256078
-
-  24 Jan 2009; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.33.ebuild:
-  Sparc stable, Security Bug #256078.
-
-  24 Jan 2009; Brent Baude <ranger@gentoo.org> tor-0.2.0.33.ebuild:
-  Marking tor-0.2.0.33 ppc64 for bug 256078
-
-*tor-0.2.0.33 (24 Jan 2009)
-
-  24 Jan 2009; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.33.ebuild:
-  version bump for security bug 256078
-
-*tor-0.2.0.32-r1 (21 Dec 2008)
-
-  21 Dec 2008; Christian Faulhammer <fauli@gentoo.org> +files/tor.conf,
-  +tor-0.2.0.32-r1.ebuild:
-  install limits file so tor can open more files on the system than normally
-  allowed, this fixes bug 251171 reported by candrews AT integralblue DOT
-  com
-
-  10 Dec 2008; Christian Faulhammer <fauli@gentoo.org>
-  -files/tor-0.2.0.31-sparc.patch, -tor-0.2.0.31-r1.ebuild:
-  clean up
-
-  09 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> tor-0.2.0.32.ebuild:
-  Stable on sparc, security bug #250018
-
-  08 Dec 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.32.ebuild:
-  Marking tor-0.2.0.32 ppc64 for bug 250018
-
-  08 Dec 2008; Markus Meier <maekke@gentoo.org> tor-0.2.0.32.ebuild:
-  x86 stable, bug #250018
-
-  07 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.2.0.32.ebuild:
-  ppc stable, bug #250018
-
-  07 Dec 2008; Richard Freeman <rich0@gentoo.org> tor-0.2.0.32.ebuild:
-  amd64 stable - 250018
-
-*tor-0.2.0.32 (06 Dec 2008)
-
-  06 Dec 2008; Christian Faulhammer <fauli@gentoo.org> +tor-0.2.0.32.ebuild:
-  version bump for security bug 250018
-
-  28 Nov 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
-  Change my email address
-
-  22 Nov 2008; Christian Faulhammer <opfer@gentoo.org>
-  -tor-0.2.0.30-r1.ebuild, -tor-0.2.0.31.ebuild, tor-0.2.0.31-r1.ebuild:
-  clean up and add stable KEYWORDS for -r1
-
-  22 Nov 2008; Markus Meier <maekke@gentoo.org> tor-0.2.0.31.ebuild:
-  amd64 stable, bug #244679
-
-  14 Nov 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.31.ebuild,
-  tor-0.2.0.31-r1.ebuild:
-  Address sparc alignment problems reported in Bug #246483 --- this fixes them
-  but is untested on anything else.
-
-*tor-0.2.0.31-r1 (14 Nov 2008)
-
-  14 Nov 2008; Ferris McCormick <fmccor@gentoo.org>
-  +files/tor-0.2.0.31-sparc.patch, +tor-0.2.0.31-r1.ebuild:
-  Add new version to address sparc alignment problem, Bug #246483 which see
-  for details.
-
-  01 Nov 2008; nixnut <nixnut@gentoo.org> tor-0.2.0.31.ebuild:
-  Stable on ppc wrt bug 244679
-
-  30 Oct 2008; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.31.ebuild:
-  x86 stable #244679
-
-  28 Oct 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.31.ebuild:
-  Sparc stable, Bug #244679.
-
-  27 Oct 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.31.ebuild:
-  stable ppc64, bug 244679
-
-*tor-0.2.0.31 (26 Sep 2008)
-
-  26 Sep 2008; Christian Faulhammer <opfer@gentoo.org> +tor-0.2.0.31.ebuild:
-  version bump for bug 238787
-
-  06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> files/tor.initd-r4:
-  remove bashisms from init file, as reported in bug 236857 by Martin Väth
-  <vaeth AT mathematik DOT uni-wuerzburg DOT de>
-
-  06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r3,
-  -files/tor.logrotate.patch, -tor-0.1.2.19-r2.ebuild, -tor-0.2.0.30.ebuild:
-  clean up
-
-  06 Sep 2008; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  x86 stable wrt #236536
-
-  06 Sep 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  stable ppc64, bug 236536
-
-  06 Sep 2008; Richard Freeman <rich0@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  amd64 stable - 236536
-
-  04 Sep 2008; Brent Baude <ranger@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  stable ppc, bug 236536
-
-  03 Sep 2008; Ferris McCormick <fmccor@gentoo.org> tor-0.2.0.30-r1.ebuild:
-  Sparc stable --- Bug #236536 --- test suite passes.
-
-*tor-0.2.0.30-r1 (03 Sep 2008)
-
-  03 Sep 2008; Christian Faulhammer <opfer@gentoo.org> +files/tor.initd-r4,
-  +tor-0.2.0.30-r1.ebuild:
-  update init script to prevent runtime failures as reported in bug 235208
-
-*tor-0.2.0.30 (03 Aug 2008)
-
-  03 Aug 2008; Christian Faulhammer <opfer@gentoo.org>
-  +files/tor-0.2.0.30-logrotate.patch, +tor-0.2.0.30.ebuild:
-  version bump for bug 233612 by puchu <rauchwolke AT gmx DOT net>
-
-  29 May 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.19.ebuild:
-  clean up
-
-  29 May 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.19-r2.ebuild:
-  sparc stable wrt #223705, thanks to Friedrich Oslage for testing
-
-  28 May 2008; Peter Volkov <pva@gentoo.org> tor-0.1.2.19-r2.ebuild:
-  amd64 stable, bug #223705.
-
-  27 May 2008; Markus Rothe <corsair@gentoo.org> tor-0.1.2.19-r2.ebuild:
-  Stable on ppc64; bug #223705
-
-  26 May 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.19-r2.ebuild:
-  Stable on ppc wrt bug 223705
-
-  26 May 2008; Christian Faulhammer <opfer@gentoo.org>
-  tor-0.1.2.19-r2.ebuild:
-  stable x86, bug 223705
-
-*tor-0.1.2.19-r2 (29 Apr 2008)
-
-  29 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
-  -tor-0.1.2.19-r1.ebuild, +tor-0.1.2.19-r2.ebuild:
-  logrotate should now really work again
-
-*tor-0.1.2.19-r1 (25 Apr 2008)
-
-  25 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
-  +tor-0.1.2.19-r1.ebuild:
-  create the logrotate file with the correct permissions as pointed out on bug
-  216298 by Serge Koksharov <gentoosiast AT yandex DOT ru>
-
-  05 Mar 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.18.ebuild:
-  clean up
-
-  04 Mar 2008; Richard Freeman <rich0@gentoo.org> tor-0.1.2.19.ebuild:
-  amd64 stable - 211021
-
-  04 Mar 2008; Brent Baude <ranger@gentoo.org> tor-0.1.2.19.ebuild:
-  stable ppc64, bug 211021
-
-  03 Mar 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.19.ebuild:
-  sparc stable wrt #211021
-
-  02 Mar 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.19.ebuild:
-  Stable on ppc wrt bug 211021
-
-  01 Mar 2008; Christian Faulhammer <opfer@gentoo.org> metadata.xml:
-  adding myself to metadata.xml
-
-  01 Mar 2008; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.19.ebuild:
-  stable x86, bug 211021
-
-  07 Feb 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r2,
-  -tor-0.1.2.17.ebuild:
-  clean up
-
-  07 Feb 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.18.ebuild:
-  sparc stable wrt #208336
-
-  06 Feb 2008; nixnut <nixnut@gentoo.org> tor-0.1.2.18.ebuild:
-  stable on ppc wrt bug #208336
-
-  02 Feb 2008; Richard Freeman <rich0@gentoo.org> tor-0.1.2.18.ebuild:
-  amd64 stable - #208336
-
-  31 Jan 2008; Brent Baude <ranger@gentoo.org> tor-0.1.2.18.ebuild:
-  Marking tor-0.1.2.18 ppc64 stable for bug 208336
-
-  31 Jan 2008; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.18.ebuild:
-  stable x86, bug 208336
-
-*tor-0.1.2.19 (31 Jan 2008)
-
-  31 Jan 2008; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.19.ebuild:
-  version bump
-
-*tor-0.1.2.18 (03 Jan 2008)
-
-  03 Jan 2008; Christian Faulhammer <opfer@gentoo.org> -tor-0.1.2.16.ebuild,
-  -tor-0.1.2.16-r1.ebuild, +tor-0.1.2.18.ebuild:
-  version bump (bug 199818) and clean up
-
-  03 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.2.17.ebuild:
-  ppc stable, bug #190968
-
-  02 Sep 2007; Jose Luis Rivero <yoswink@gentoo.org> tor-0.1.2.17.ebuild:
-  Stable on sparc wrt security bug #190968
-
-  02 Sep 2007; Markus Rothe <corsair@gentoo.org> tor-0.1.2.17.ebuild:
-  Stable on ppc64; bug #190968
-
-  02 Sep 2007; Christoph Mende <angelos@gentoo.org> tor-0.1.2.17.ebuild:
-  Stable on amd64 wrt security bug #190968
-
-*tor-0.1.2.17 (02 Sep 2007)
-
-  02 Sep 2007; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.17.ebuild:
-  version bump and stable x86, security bug 190968
-
-  29 Aug 2007; Gustavo Felisberto <humpback@gentoo.org> files/tor.initd-r3:
-  Adding correct init script.
-
-*tor-0.1.2.16-r1 (28 Aug 2007)
-
-  28 Aug 2007; Gustavo Felisberto <humpback@gentoo.org>
-  -files/torrc.sample-0.1.0.16.patch, -files/torrc.sample-0.1.1.23.patch,
-  -files/tor.confd, -files/tor.initd, -files/tor.initd-r1,
-  +files/tor.initd-r3, -tor-0.1.1.23.ebuild, -tor-0.1.1.26.ebuild,
-  -tor-0.1.2.14.ebuild, +tor-0.1.2.16-r1.ebuild:
-  Removed older versions and dangled files. Fixed bug with init with
-  baselayout-2 closes 189724. Thanks to Christian Faulhammer (opfer) for the
-  fix.
-
-  09 Aug 2007; Robert Buchholz <rbu@gentoo.org> tor-0.1.2.16.ebuild:
-  Stable on amd64 (bug #186644)
-
-  06 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.2.16.ebuild:
-  Stable on sparc wrt security #186644
-
-  04 Aug 2007; Markus Rothe <corsair@gentoo.org> tor-0.1.2.16.ebuild:
-  Stable on ppc64; bug #186644
-
-  04 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.2.16.ebuild:
-  ppc stable, bug #186644
-
-  03 Aug 2007; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.16.ebuild:
-  stable x86, security bug 186644
-
-*tor-0.1.2.16 (03 Aug 2007)
-
-  03 Aug 2007; Christian Faulhammer <opfer@gentoo.org> +tor-0.1.2.16.ebuild:
-  version bump, for security bug 186644
-
-  02 Jun 2007; René Nussbaumer <killerfox@gentoo.org> tor-0.1.2.14.ebuild:
-  Stable on ppc. See bug #180139.
-
-  31 May 2007; Christoph Mende <angelos@gentoo.org> tor-0.1.2.14.ebuild:
-  Stable on amd64 wrt security bug 180139
-
-  31 May 2007; Brent Baude <ranger@gentoo.org> tor-0.1.2.14.ebuild:
-  Marking tor-0.1.2.14 ppc64 stable for bug#180139
-
-  31 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.2.14.ebuild:
-  Stable on sparc wrt security #180139
-
-  31 May 2007; Christian Faulhammer <opfer@gentoo.org> tor-0.1.2.14.ebuild:
-  stable x86, security bug 180139
-
-*tor-0.1.2.14 (31 May 2007)
-
-  31 May 2007; <humpback@gentoo.org> -tor-0.1.0.18.ebuild,
-  -tor-0.1.0.18-r1.ebuild, -tor-0.1.2.13.ebuild, +tor-0.1.2.14.ebuild:
-  Bumped 0.1.2.13 to 0.1.2.14, removed older versions. Fixed #178975 with idea 
-  from Remy Blank
-
-  15 May 2007; <humpback@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.0.18-r1.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.26.ebuild,
-  tor-0.1.2.13.ebuild:
-  Added keepdir. Close Bug #177590.
-
-  15 May 2007; <humpback@gentoo.org> tor-0.1.1.23.ebuild,
-  tor-0.1.1.26.ebuild:
-  Fixed missing RDEP's. Close Bug #174185.
-
-*tor-0.1.2.13 (15 May 2007)
-
-  15 May 2007; <humpback@gentoo.org> +files/tor.initd-r2,
-  -tor-0.1.2.6_alpha.ebuild, +tor-0.1.2.13.ebuild:
-  Removed alpha 1.2 release and added a bump. Help from all in bug #176018,
-  specially jakub, was very much apretiated.
-
-  29 Apr 2007; Torsten Veller <tove@gentoo.org> tor-0.1.1.23.ebuild,
-  tor-0.1.1.26.ebuild, tor-0.1.2.6_alpha.ebuild:
-  Fix *initd, *confd and *envd calls (#173884, #174266)
-
-*tor-0.1.2.6_alpha (27 Jan 2007)
-
-  27 Jan 2007; Gustavo Felisberto <humpback@gentoo.org>;
-  +files/torrc.sample-0.1.2.6.patch, +tor-0.1.2.6_alpha.ebuild:
-  Added alpha release of tor at request from Flameeyes. It seems tork needs
-  it. As always, if it is masked and you install and destroy your system dont
-  come complain alot.
-
-*tor-0.1.1.26 (18 Dec 2006)
-
-  18 Dec 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  -tor-0.1.1.24.ebuild, +tor-0.1.1.26.ebuild:
-  Bumped to 0.1.1.26 and removed older version.
-
-*tor-0.1.0.18-r1 (22 Oct 2006)
-
-  22 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  tor-0.1.0.18.ebuild, +tor-0.1.0.18-r1.ebuild:
-  Small configuration issue in the chroot. Fixes bug #139354.
-
-  21 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.24.ebuild:
-  Added ewarn about the needed dot in the privoxy integration. Closes bug
-  #152137.
-
-*tor-0.1.1.24 (09 Oct 2006)
-
-  09 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +tor-0.1.1.24.ebuild:
-  Bump from 0.1.1.23
-
-  11 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  tor-0.1.0.18.ebuild:
-  Changed einfo about configuration of chroot. Removes tor from bug #140371
-
-  05 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  -files/torrc.sample-0.1.0.14.patch, -tor-0.1.0.14-r1.ebuild,
-  -tor-0.1.0.16.ebuild, -tor-0.1.0.17.ebuild, -tor-0.1.1.20.ebuild,
-  -tor-0.1.1.22.ebuild:
-  Removed older version that had sec issues.
-
-  30 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.1.23.ebuild:
-  Stable on sparc wrt security #145458
-
-  30 Aug 2006; <blubb@gentoo.org> tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild:
-  stable on amd64 wrt bug 145458
-
-  30 Aug 2006; Joshua Jackson <tsunam@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.1.23.ebuild:
-  Stable x86; security bug #145458
-
-  29 Aug 2006; Markus Rothe <corsair@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.1.23.ebuild:
-  Stable on ppc64; bug #145458
-
-  29 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.0.18.ebuild,
-  tor-0.1.1.23.ebuild:
-  ppc stable, bug #145458
-
-*tor-0.1.0.18 (29 Aug 2006)
-
-  29 Aug 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +tor-0.1.0.18.ebuild:
-  Adding 0.1.0.18 that fixes sec issue in the 0.1.0.* series. The 0.1.1.23 is
-  not affected.
-
-*tor-0.1.1.23 (24 Aug 2006)
-
-  24 Aug 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +files/torrc.sample-0.1.1.23.patch, +tor-0.1.1.23.ebuild:
-  Updated version, bump and small cosmetics. Thanks to Olivier Mondolini in
-  bug #144417.
-
-  16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> tor-0.1.1.22.ebuild:
-  Add ~x86-fbsd keyword.
-
-*tor-0.1.1.22 (08 Jul 2006)
-
-  08 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +tor-0.1.1.22.ebuild:
-  Bump to 0.1.1.22. Closes bug # 138073.
-
-  05 Jun 2006; Simon Stelling <blubb@gentoo.org> tor-0.1.1.20.ebuild:
-  stable on amd64 wrt bug 134329
-
-  01 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.1.1.20.ebuild:
-  Stable on sparc wrt security #134329
-
-  01 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> tor-0.1.1.20.ebuild:
-  ppc stable, bug #134329
-
-  01 Jun 2006; Markus Rothe <corsair@gentoo.org> tor-0.1.1.20.ebuild:
-  Stable on ppc64; bug #134329
-
-  01 Jun 2006; Joshua Jackson <tsunam@gentoo.org> tor-0.1.1.20.ebuild:
-  Stable on x86; security bug #134329
-
-*tor-0.1.1.20 (01 Jun 2006)
-
-  01 Jun 2006; Stefan Cornelius <dercorny@gentoo.org> +tor-0.1.1.20.ebuild:
-  Bumping to version 0.1.1.20 for security bugs #134329 and #118918
-
-  23 Apr 2006; Emanuele Giaquinta <exg@gentoo.org> tor-0.1.0.14-r1.ebuild,
-  tor-0.1.0.16.ebuild, tor-0.1.0.17.ebuild:
-  Move enew{group,user} in pkg_setup.
-
-*tor-0.1.0.17 (28 Feb 2006)
-
-  28 Feb 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +tor-0.1.0.17.ebuild:
-  Bump to 0.1.017. Credits go to Christian Mandery in bug #123530 for
-  reporting this.
-
-*tor-0.1.0.16 (04 Jan 2006)
-
-  04 Jan 2006; Gustavo Felisberto <humpback@gentoo.org>;
-  +files/torrc.sample-0.1.0.16.patch, +files/tor.confd, +files/tor.initd-r1,
-  +tor-0.1.0.16.ebuild:
-  Adding tor 1.0.16 to portage. Arch teams please dont mark stable as the new
-  chroot stuff needs serious testing.
-
-*tor-0.1.0.14-r1 (11 Sep 2005)
-
-  11 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
-  -tor-0.1.0.14.ebuild, +tor-0.1.0.14-r1.ebuild:
-  I was having some strange issues with sending signal 2 to tor. And we do not
-  need a SIGINT, a SIGTERM is fine.
-
-  06 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  -files/torrc.sample.patch-00, -tor-0.0.9.10.ebuild:
-  Removing older version.
-
-  16 Aug 2005; Jason Wever <weeve@gentoo.org> tor-0.1.0.14.ebuild:
-  Stable on SPARC wrt security bug #102245.
-
-  15 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.1.0.14.ebuild:
-  Stable on ppc.
-
-  15 Aug 2005; Markus Rothe <corsair@gentoo.org> tor-0.1.0.14.ebuild:
-  Stable on ppc64 (bug #102245)
-
-*tor-0.1.0.14 (14 Aug 2005)
-
-  14 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  +files/torrc.sample-0.1.0.14.patch, +tor-0.1.0.14.ebuild:
-  Adding new version as amd64 and x86 due to sec bug. See #102245
-
-  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> tor-0.0.9.10.ebuild:
-  Stable on amd64.
-
-  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.10.ebuild:
-  Stable on sparc
-
-  21 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.10.ebuild:
-  Stable on ppc (#96320).
-
-  21 Jun 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.10.ebuild:
-  Stable on ppc64
-
-*tor-0.0.9.10 (16 Jun 2005)
-
-  16 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  -tor-0.0.9.5.ebuild, -tor-0.0.9.6.ebuild, -tor-0.0.9.7.ebuild,
-  -tor-0.0.9.9.ebuild, +tor-0.0.9.10.ebuild:
-  Added version 0.9.0.10 that fixes a security bug, removed older versions
-  that were affected.
-
-  12 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
-  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild, tor-0.0.9.9.ebuild:
-  New HOMEPAGE, thanks to Matteo in bug #95754.
-
-  18 May 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
-  Stable on ppc64
-
-  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.5.ebuild:
-  Stable on ppc.
-
-*tor-0.0.9.9 (25 Apr 2005)
-
-  25 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
-  tor-0.0.9.6.ebuild, +tor-0.0.9.9.ebuild:
-  Removing older versions and bumping to 0.9.9 .
-
-  22 Apr 2005; Alin Nastac <mrness@gentoo.org> tor-0.0.9.5.ebuild,
-  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild:
-  net-misc/tsocks -> net-proxy/tsocks
-
-  08 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.7.ebuild:
-  Keyworded ~sparc wrt #88305
-
-*tor-0.0.9.7 (01 Apr 2005)
-
-  01 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.7.ebuild:
-  Bumped
-
-  29 Mar 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
-  Added ~ppc64 to KEYWORDS; bug #86993
-
-*tor-0.0.9.6 (25 Mar 2005)
-
-  25 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.6.ebuild:
-  Bumped to 0.0.9.6
-
-  23 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd:
-  Changed init script to send SIGINT at shutdown. May increase the shutdown time
-  of servers, but will close in a more clean way.
-
-  25 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  -tor-0.0.9.4-r1.ebuild, -tor-0.0.9.4-r2.ebuild, tor-0.0.9.5.ebuild:
-  Marking latest as x86 and removing older versions.
-
-*tor-0.0.9.5 (23 Feb 2005)
-
-  23 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
-  tor-0.0.9.4-r2.ebuild, +tor-0.0.9.5.ebuild:
-  Adding version 0.0.9.5 and marking 0.0.9.4-r2 as x86.
-
-*tor-0.0.9.4-r2 (13 Feb 2005)
-
-  13 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
-  +files/torrc.sample.patch-00, -tor-0.0.8.1.ebuild, -tor-0.0.9.1.ebuild,
-  -tor-0.0.9.2.ebuild, +tor-0.0.9.4-r2.ebuild, -tor-0.0.9.4.ebuild:
-  Adding new version that properly patches the sample config and deleting older
-  versions. Lost the stable ppc-macos but that arch is lagging way to much.
-
-*tor-0.0.9.4-r1 (10 Feb 2005)
-
-  10 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; +files/tor.initd,
-  +tor-0.0.9.4-r1.ebuild:
-  Using ideas in bug #75381 from Faustus <orlovm@cs.bgu.ac.il> and after talking
-  to latexer i'm commiting this version that can use a init.d script for easier
-  usage.
-
-*tor-0.0.9.4 (04 Feb 2005)
-
-  04 Feb 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.4.ebuild:
-  Bump.
-
-  09 Jan 2005; Marcus Hanwell <cryos@gentoo.org> tor-0.0.9.2.ebuild:
-  Marked ~amd64, closes bug 76780.
-
-*tor-0.0.9.2 (04 Jan 2005)
-
-  04 Jan 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.2.ebuild:
-  Bump.
-
-*tor-0.0.9.1 (16 Dec 2004)
-
-  16 Dec 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.1.ebuild:
-  Bump. Add tsocks dependancy, see bug #70879
-
-  20 Oct 2004; Peter Johanson <latexer@gentoo.org> -tor-0.0.6.1.ebuild,
-  -tor-0.0.6.ebuild, -tor-0.0.7.2.ebuild, -tor-0.0.7.3.ebuild,
-  -tor-0.0.7.ebuild:
-  Remove old vulnerable versions. See bug #67756
-
-  21 Oct 2004; Joseph Jezak <josejx@gentoo.org> tor-0.0.8.1.ebuild:
-  Keyworded ppc-macos and macos due to vulnerability in previous versions.
-  Removed tsocks RDEPEND at the request of latexer. See bug #67756
-
-*tor-0.0.8.1 (17 Oct 2004)
-
-  17 Oct 2004; <peter@gentoo.org> +tor-0.0.8.1.ebuild, -tor-0.0.8.ebuild:
-  Bump and remove 0.0.8 which is vulnerable to a remote DoS. See bug #67756.
-
-*tor-0.0.8 (06 Oct 2004)
-
-  06 Oct 2004; <peter@gentoo.org> tor-0.0.6.1.ebuild, tor-0.0.6.ebuild,
-  tor-0.0.7.2.ebuild, tor-0.0.7.3.ebuild, tor-0.0.7.ebuild, +tor-0.0.8.ebuild:
-  Bump. Also fix the license as this is really under 3-clause BSD.
-
-*tor-0.0.7.3 (15 Aug 2004)
-
-  15 Aug 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.3.ebuild:
-  Bump. Only needed for servers.
-
-  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
-  Fixed Manifest.
-
-  24 Jul 2004; Erik Swanson <erik@gentoo.org> tor-0.0.7.2.ebuild:
-  Added macos to KEYWORDS
-
-*tor-0.0.7.2 (15 Jul 2004)
-
-  15 Jul 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.2.ebuild:
-  Bump to latest version. tsocks is now a depend for everything but macos, since
-  tsocks no worky there.
-
-*tor-0.0.7 (07 Jun 2004)
-
-  07 Jun 2004; Peter Johanson,,, <peter@gentoo.org> tor-0.0.2_pre27.ebuild,
-  tor-0.0.5.ebuild, tor-0.0.6_rc1.ebuild, tor-0.0.7.ebuild:
-  Bump to lates release, and remove older versions.
-
-*tor-0.0.6.1 (06 May 2004)
-
-  06 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.1.ebuild:
-  Bump.
-
-  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
-  Adding back ~ppc, as dholm wants me to keep it around for future updates.
-
-*tor-0.0.6 (02 May 2004)
-
-  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
-  Bump to latest release.
-
-  30 Apr 2004; David Holm <dholm@gentoo.org> tor-0.0.6_rc1.ebuild:
-  Added to ~ppc.
-
-*tor-0.0.6_rc1 (29 Apr 2004)
-
-  29 Apr 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6_rc1.ebuild:
-  Bump to latest. Beware, this version is not backwards compatible with older
-  versions.
-
-*tor-0.0.5 (30 Mar 2004)
-
-  30 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre21.ebuild,
-  tor-0.0.2_pre22.ebuild, tor-0.0.2_pre23.ebuild, tor-0.0.2_pre24.ebuild,
-  tor-0.0.2_pre25.ebuild, tor-0.0.5.ebuild:
-  Bump to latest release. Removed a bunch of the old stuff. Initscript coming
-  soon, i swear.
-
-*tor-0.0.2_pre27 (15 Mar 2004)
-
-  15 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre27.ebuild:
-  Bump.
-
-*tor-0.0.2_pre25 (04 Mar 2004)
-
-  04 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre25.ebuild:
-  Bump. Fixes a crash due to DNS stuff.
-
-*tor-0.0.2_pre24 (03 Mar 2004)
-
-  03 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre24.ebuild:
-  Bump
-
-*tor-0.0.2_pre23 (29 Feb 2004)
-
-  29 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre23.ebuild:
-  Bump
-
-*tor-0.0.2_pre22 (28 Feb 2004)
-
-  28 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre22.ebuild:
-  Bump
-
-*tor-0.0.2_pre21 (22 Feb 2004)
-
-  22 Feb 2004; Peter Johanson <latexer@gentoo.org> metadata.xml,
-  tor-0.0.2_pre21.ebuild:
-  Initial Commit. Ebuild by yours truly.
-

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
deleted file mode 100644
index 1ce83c3..0000000
--- a/net-misc/tor/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
-AUX tor-0.2.3.2_alpha-fix-asneeded.patch 654 RMD160 faf9cc37942dfa7f52dbe849c1819b24c0ab7940 SHA1 4400ed72fa60d04a96c82f0aba7c6eb41e23f5c5 SHA256 4500436719cb96a17bfd4eb67b2ebf2b1db222904bf1b14b75cc17b8f1b41345
-AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
-AUX tor.initd-r5 2299 RMD160 b0d0daf179dda2de496453fa406fcab8831180b4 SHA1 9d53d783a1fb9fa8d368b18fec8c560c7a5e764f SHA256 260ba8f87690b58f2cf08eace8c65ac2e149d4fe87e91f98134585e6a36b45ea
-AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738
-AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14
-DIST tor-0.2.2.32.tar.gz 2701371 RMD160 649c21f7ec89e34774c79db6544b612f0895bb61 SHA1 4baddc836931b3e915974c261e405e111636b716 SHA256 8744328c10b54950e08ee404a75a0e76865be0615cad6f7ffc8c75af7151ef4d
-DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
-EBUILD tor-0.2.2.32-r1.ebuild 2381 RMD160 0bffd0fbcf2798bbd28d7d0f418ef1b7bfa1bcbe SHA1 67d33f2f8d37a4516b7935f925b697703fb6e735 SHA256 b7a4c3abeafa81c5645d1cbdd69d2200ea6d0d62d0b03ae852789ce296da2c3e
-EBUILD tor-0.2.3.2_alpha-r3.ebuild 2638 RMD160 5283a8a27e751d3275c3a229c92087a58995a5a4 SHA1 71c8257888002c40913d7d34970a7784a78c4b19 SHA256 f752c1911199bf7379b0d3811f1c8e695443086bbe745d8f9c20019136fc37da
-MISC ChangeLog 40918 RMD160 0a9d2ee9607f942b3ec973e468e88808c035f697 SHA1 ed70761da0e379bcc013d94db459638e5b30034c SHA256 dde05ef6d26ed673c47c6a76558424c6df5b67e9655a8047697c36b05cc3655c
-MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk5c6fcACgkQl5yvQNBFVTVhuACeP/UhrvYPetzy/dM7//oTZB06
-yDYAnA9IY+i+P6KrLBbkHQgblspIowFy
-=PcdQ
------END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
deleted file mode 100644
index 86b797b..0000000
--- a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
---- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
-+++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
-@@ -9,6 +9,11 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+CFLAGS=
-+LDFLAGS=
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -971,6 +976,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

diff --git a/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch b/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch
deleted file mode 100644
index 75981d5..0000000
--- a/net-misc/tor/files/tor-0.2.3.2_alpha-fix-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/tor-0.2.3.2-alpha.orig/src/tools/tor-fw-helper/Makefile.am b/tor-0.2.3.2-alpha/src/tools/tor-fw-helper/Makefile.am
-index 75878f2..77ff63f 100644
---- a/tor-0.2.3.2-alpha.orig/src/tools/tor-fw-helper/Makefile.am
-+++ b/tor-0.2.3.2-alpha/src/tools/tor-fw-helper/Makefile.am
-@@ -34,5 +34,5 @@ miniupnpc_cppflags =
- endif
- 
- tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags)
--tor_fw_helper_LDADD = $(nat_pmp_ldadd) $(miniupnpc_ldadd) ../../common/libor.a @TOR_LIB_WS32@
-+tor_fw_helper_LDADD = ../../common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) @TOR_LIB_WS32@
- tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags)

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
deleted file mode 100644
index 4195bf3..0000000
--- a/net-misc/tor/files/tor.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Set the file limit
-rc_ulimit="-n 30000"

diff --git a/net-misc/tor/files/tor.initd-r5 b/net-misc/tor/files/tor.initd-r5
deleted file mode 100644
index 11027e2..0000000
--- a/net-misc/tor/files/tor.initd-r5
+++ /dev/null
@@ -1,81 +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.7 2011/08/23 12:26:36 blueness Exp $
-
-opts="${opts} checkconfig checkvarrun reload"
-PIDDIR="/var/run/tor"
-PIDFILE="${PIDDIR}/tor.pid"
-CONFFILE="/etc/tor/torrc"
-
-depend() {
-        need net
-}
-
-checkvarrun()
-{
-	# Check if /var/run/tor exists, create it if it doesn't 
-	[ ! -d /var/run/tor ] && mkdir -p ${PIDDIR}
-	[ ! -d /var/run/tor ] && return 1
-
-	# The directory definitly exists now, but does it belong to tor:tor?
-	local dir=$(find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor)
-	[ -z "$dir" ] && chown tor:tor ${PIDDIR}
-	dir=$(find ${PIDDIR} -maxdepth 0 -a -user tor -a -group tor)
-	[ -z "$dir" ] && return 1
-
-	# And does it have the right perms?
-	dir=$(find ${PIDDIR} -maxdepth 0 -perm 0755)
-	[ -z "$dir" ] && chmod 0755 ${PIDDIR}
-	dir=$(find ${PIDDIR} -maxdepth 0 -perm 0755)
-	[ -z "$dir" ] && return 1
-
-	# If any of the above failed, we would not be here
-	return 0
-}
-
-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
-	checkvarrun || 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 --signal HUP --pidfile ${PIDFILE}
-	eend $?
-}

diff --git a/net-misc/tor/files/torrc-r1 b/net-misc/tor/files/torrc-r1
deleted file mode 100644
index 322a794..0000000
--- a/net-misc/tor/files/torrc-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Minimal torrc so tor will work out of the box
-#
-User tor
-PIDFile /var/run/tor/tor.pid
-Log notice syslog
-DataDirectory /var/lib/tor/data

diff --git a/net-misc/tor/files/torrc.sample.patch b/net-misc/tor/files/torrc.sample.patch
deleted file mode 100644
index 4a1592a..0000000
--- a/net-misc/tor/files/torrc.sample.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/torrc.sample.in
---- tor-0.2.2.32.orig/src/config/torrc.sample.in	2011-08-29 23:13:09.000000000 -0400
-+++ tor-0.2.2.32/src/config/torrc.sample.in	2011-08-29 23:14:19.000000000 -0400
-@@ -12,6 +12,10 @@
- ## Tor will look for this file in various places based on your platform:
- ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc
- 
-+## Default username and group the server will run as
-+User tor
-+
-+PIDFile /var/run/tor/tor.pid
- 
- ## Replace this with "SocksPort 0" if you plan to run Tor only as a
- ## relay, and not make any local application connections yourself.
-@@ -40,6 +44,7 @@
- #Log notice syslog
- ## To send all messages to stderr:
- #Log debug stderr
-+Log notice syslog
- 
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line. This is ignored on Windows;
-@@ -49,6 +54,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.

diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
deleted file mode 100644
index 4d8f7a1..0000000
--- a/net-misc/tor/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer>
-		<email>chiiph@gentoo.org</email>
-		<name>Tomás Touceda</name>
-	</maintainer>
-	<use>
-		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
-		<flag name='transparent-proxy'>Enable transparent proxying</flag>
-		<flag name='bufferevents'>Use Libevent's buffered IO</flag>
-		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
-		<flag name='upnp'>Enable Universal Plug and Play</flag>
-	</use>
-</pkgmetadata>

diff --git a/net-misc/tor/tor-0.2.2.32-r1.ebuild b/net-misc/tor/tor-0.2.2.32-r1.ebuild
deleted file mode 100644
index 5830049..0000000
--- a/net-misc/tor/tor-0.2.2.32-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.32.ebuild,v 1.1 2011/08/28 11:10:10 blueness Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc tor-hardening +transparent-proxy threads"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0"
-# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
-RDEPEND="${DEPEND}
-	net-proxy/tsocks[tordns]"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf --docdir=/usr/share/doc/${PF}				\
-		$(use_enable doc asciidoc)					\
-		$(use_enable tor-hardening gcc-hardening)	\
-		$(use_enable tor-hardening linker-hardening)\
-		$(use_enable transparent-proxy transparent)	\
-		$(use_enable threads)
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r5 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,run}/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/run/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}

diff --git a/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild b/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
deleted file mode 100644
index 494280e..0000000
--- a/net-misc/tor/tor-0.2.3.2_alpha-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild,v 1.2 2011/07/30 10:28:35 blueness Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0
-	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( <net-libs/miniupnpc-1.6 )"
-
-# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
-RDEPEND="${DEPEND}
-	net-proxy/tsocks[tordns]"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample.patch
-	epatch "${FILESDIR}"/${PN}-0.2.3.2_alpha-fix-asneeded.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf --docdir=/usr/share/doc/${PF}				\
-		$(use_enable bufferevents)					\
-		$(use_enable doc asciidoc)					\
-		$(use_enable nat-pmp)						\
-		$(use_enable tor-hardening gcc-hardening)	\
-		$(use_enable tor-hardening linker-hardening)\
-		$(use_enable transparent-proxy transparent)	\
-		$(use_enable threads)						\
-		$(use_enable upnp)
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r5 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,run}/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/run/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-11-25 13:01 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-11-25 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     ce4fa3a917b8f7a8bf660b9cba286c75f67623db
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 13:01:19 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 13:01:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=ce4fa3a9

net-misc/tor: testing a link error

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

---
 net-misc/tor/ChangeLog                             |   10 +++
 net-misc/tor/Manifest                              |   19 +++++
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 ++++++
 net-misc/tor/files/tor.confd                       |    3 +
 net-misc/tor/files/tor.initd-r6                    |   58 ++++++++++++++
 net-misc/tor/files/torrc-r1                        |    7 ++
 net-misc/tor/files/torrc.sample.patch              |   30 +++++++
 net-misc/tor/metadata.xml                          |   19 +++++
 net-misc/tor/tor-0.2.3.8_alpha.ebuild              |   84 ++++++++++++++++++++
 9 files changed, 254 insertions(+), 0 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
new file mode 100644
index 0000000..26927a3
--- /dev/null
+++ b/net-misc/tor/ChangeLog
@@ -0,0 +1,10 @@
+
+
+*tor-0.2.3.8_alpha (25 Nov 2011)
+
+  25 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.3.8_alpha.ebuild,
+  +files/tor.confd, +files/tor.initd-r6, +files/torrc-r1,
+  +files/torrc.sample.patch, +metadata.xml:
+  testing because of link failure
+

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
new file mode 100644
index 0000000..bb62441
--- /dev/null
+++ b/net-misc/tor/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
+AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
+AUX tor.initd-r6 1601 RMD160 f1ef0dd197f051a826e3785348a2a8cc490c04eb SHA1 ee9f5116c3a69a7adb2be15ce14e3904261e84c4 SHA256 67d5bb618cfbc4d4c05e5589bfd2e24f6563c4e3c6ba1d6c472b285b4480e20d
+AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738
+AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14
+DIST tor-0.2.3.8-alpha.tar.gz 2909997 RMD160 eec1f3b549b1513d2c39791c79a18496d97a4809 SHA1 7ca5c1cfa5a1a3d1c923298a47fe2430495bedcc SHA256 b7c40f5f4fbd0a42b6863c29a69cc7b06d9e1cc9609f934a550f2019426d8dc4
+EBUILD tor-0.2.3.8_alpha.ebuild 2364 RMD160 ffb1a886a8f3afd50448da52899ab29e4a3a8150 SHA1 010227d454fe0ff6691447ebbddf25fee097a9a4 SHA256 43cfd7470c48c1232556b1fcac24f029356643a66e930c7948bb45aacabab923
+MISC ChangeLog 305 RMD160 1946e00c0b3eba0f187616b56b2588f8982b0bd3 SHA1 e6e7591a5ee45a288ac4f313942c5973506b77d0 SHA256 6c5edbd4f0db80cf5a3b06ea533187f9df1596ff2d86774a61280d16a2ff476e
+MISC metadata.xml 690 RMD160 1ae6238c81555b6b4bf2f11479e18a5acdb7b418 SHA1 920cafba2dacb7a034e32f782467c96532465434 SHA256 117ed70261e343abf65a93351f6ba7a5bca941c183bf79168953a3efc5afb0b5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk7PkZ8ACgkQl5yvQNBFVTVY8QCcC0Z4VgYfJA2CB4b2c3GEpv+Z
+sewAnjC4Sp1NHnMKMZdAXta+bPkNcHkB
+=Swca
+-----END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
new file mode 100644
index 0000000..86b797b
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
@@ -0,0 +1,24 @@
+diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
+--- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
++++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
+@@ -9,6 +9,11 @@
+ 
+ AC_CANONICAL_HOST
+ 
++GENTOO_CFLAGS="$CFLAGS"
++GENTOO_LDFLAGS="$LDFLAGS"
++CFLAGS=
++LDFLAGS=
++
+ if test -f /etc/redhat-release ; then
+   if test -f /usr/kerberos/include ; then
+     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+@@ -971,6 +976,8 @@
+ 
+ 
+ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
++CFLAGS="$CFLAGS $GENTOO_CFLAGS"
++LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+ AC_OUTPUT

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
new file mode 100644
index 0000000..4195bf3
--- /dev/null
+++ b/net-misc/tor/files/tor.confd
@@ -0,0 +1,3 @@
+#
+# Set the file limit
+rc_ulimit="-n 30000"

diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.initd-r6
new file mode 100644
index 0000000..55204cc
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r6
@@ -0,0 +1,58 @@
+#!/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-r6,v 1.5 2011/09/14 10:53:02 blueness Exp $
+
+extra_commands="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
+	checkpath -d -m 0755 -o tor:tor /var/run/tor
+        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 --signal HUP --pidfile ${PIDFILE}
+	eend $?
+}

diff --git a/net-misc/tor/files/torrc-r1 b/net-misc/tor/files/torrc-r1
new file mode 100644
index 0000000..322a794
--- /dev/null
+++ b/net-misc/tor/files/torrc-r1
@@ -0,0 +1,7 @@
+#
+# Minimal torrc so tor will work out of the box
+#
+User tor
+PIDFile /var/run/tor/tor.pid
+Log notice syslog
+DataDirectory /var/lib/tor/data

diff --git a/net-misc/tor/files/torrc.sample.patch b/net-misc/tor/files/torrc.sample.patch
new file mode 100644
index 0000000..4a1592a
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample.patch
@@ -0,0 +1,30 @@
+diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/torrc.sample.in
+--- tor-0.2.2.32.orig/src/config/torrc.sample.in	2011-08-29 23:13:09.000000000 -0400
++++ tor-0.2.2.32/src/config/torrc.sample.in	2011-08-29 23:14:19.000000000 -0400
+@@ -12,6 +12,10 @@
+ ## Tor will look for this file in various places based on your platform:
+ ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc
+ 
++## Default username and group the server will run as
++User tor
++
++PIDFile /var/run/tor/tor.pid
+ 
+ ## Replace this with "SocksPort 0" if you plan to run Tor only as a
+ ## relay, and not make any local application connections yourself.
+@@ -40,6 +44,7 @@
+ #Log notice syslog
+ ## To send all messages to stderr:
+ #Log debug stderr
++Log notice syslog
+ 
+ ## Uncomment this to start the process in the background... or use
+ ## --runasdaemon 1 on the command line. This is ignored on Windows;
+@@ -49,6 +54,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.

diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
new file mode 100644
index 0000000..9381df6
--- /dev/null
+++ b/net-misc/tor/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer>
+		<email>chiiph@gentoo.org</email>
+		<name>Tomás Touceda</name>
+	</maintainer>
+	<use>
+		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
+		<flag name='transparent-proxy'>Enable transparent proxying</flag>
+		<flag name='bufferevents'>Use Libevent's buffered IO</flag>
+		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
+		<flag name='upnp'>Enable Universal Plug and Play</flag>
+	</use>
+</pkgmetadata>

diff --git a/net-misc/tor/tor-0.2.3.8_alpha.ebuild b/net-misc/tor/tor-0.2.3.8_alpha.ebuild
new file mode 100644
index 0000000..3d77e62
--- /dev/null
+++ b/net-misc/tor/tor-0.2.3.8_alpha.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.7_alpha.ebuild,v 1.1 2011/10/31 10:16:33 blueness Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0.14
+	nat-pmp? ( net-libs/libnatpmp )
+	upnp? ( <net-libs/miniupnpc-1.6 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
+	eautoreconf
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+	econf --docdir=/usr/share/doc/${PF} \
+		$(use_enable bufferevents) \
+		$(use_enable doc asciidoc) \
+		$(use_enable nat-pmp) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable threads) \
+		$(use_enable upnp)
+}
+
+src_install() {
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/README
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/
@ 2011-11-26 15:19 Anthony G. Basile
  0 siblings, 0 replies; 27+ messages in thread
From: Anthony G. Basile @ 2011-11-26 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     8b4712ad2dbf7b5faee3d56a4832cfe487f9c700
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 15:19:38 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 15:19:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=8b4712ad

net-misc/tor: link error fixed, moved to tree

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

---
 net-misc/tor/ChangeLog                             |   10 ---
 net-misc/tor/Manifest                              |   19 -----
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 ------
 net-misc/tor/files/tor.confd                       |    3 -
 net-misc/tor/files/tor.initd-r6                    |   58 --------------
 net-misc/tor/files/torrc-r1                        |    7 --
 net-misc/tor/files/torrc.sample.patch              |   30 -------
 net-misc/tor/metadata.xml                          |   19 -----
 net-misc/tor/tor-0.2.3.8_alpha.ebuild              |   84 --------------------
 9 files changed, 0 insertions(+), 254 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
deleted file mode 100644
index 26927a3..0000000
--- a/net-misc/tor/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-*tor-0.2.3.8_alpha (25 Nov 2011)
-
-  25 Nov 2011; Anthony G. Basile <blueness@gentoo.org>
-  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.3.8_alpha.ebuild,
-  +files/tor.confd, +files/tor.initd-r6, +files/torrc-r1,
-  +files/torrc.sample.patch, +metadata.xml:
-  testing because of link failure
-

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
deleted file mode 100644
index bb62441..0000000
--- a/net-misc/tor/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
-AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
-AUX tor.initd-r6 1601 RMD160 f1ef0dd197f051a826e3785348a2a8cc490c04eb SHA1 ee9f5116c3a69a7adb2be15ce14e3904261e84c4 SHA256 67d5bb618cfbc4d4c05e5589bfd2e24f6563c4e3c6ba1d6c472b285b4480e20d
-AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738
-AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14
-DIST tor-0.2.3.8-alpha.tar.gz 2909997 RMD160 eec1f3b549b1513d2c39791c79a18496d97a4809 SHA1 7ca5c1cfa5a1a3d1c923298a47fe2430495bedcc SHA256 b7c40f5f4fbd0a42b6863c29a69cc7b06d9e1cc9609f934a550f2019426d8dc4
-EBUILD tor-0.2.3.8_alpha.ebuild 2364 RMD160 ffb1a886a8f3afd50448da52899ab29e4a3a8150 SHA1 010227d454fe0ff6691447ebbddf25fee097a9a4 SHA256 43cfd7470c48c1232556b1fcac24f029356643a66e930c7948bb45aacabab923
-MISC ChangeLog 305 RMD160 1946e00c0b3eba0f187616b56b2588f8982b0bd3 SHA1 e6e7591a5ee45a288ac4f313942c5973506b77d0 SHA256 6c5edbd4f0db80cf5a3b06ea533187f9df1596ff2d86774a61280d16a2ff476e
-MISC metadata.xml 690 RMD160 1ae6238c81555b6b4bf2f11479e18a5acdb7b418 SHA1 920cafba2dacb7a034e32f782467c96532465434 SHA256 117ed70261e343abf65a93351f6ba7a5bca941c183bf79168953a3efc5afb0b5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk7PkZ8ACgkQl5yvQNBFVTVY8QCcC0Z4VgYfJA2CB4b2c3GEpv+Z
-sewAnjC4Sp1NHnMKMZdAXta+bPkNcHkB
-=Swca
------END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
deleted file mode 100644
index 86b797b..0000000
--- a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
---- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
-+++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
-@@ -9,6 +9,11 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+CFLAGS=
-+LDFLAGS=
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -971,6 +976,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
deleted file mode 100644
index 4195bf3..0000000
--- a/net-misc/tor/files/tor.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Set the file limit
-rc_ulimit="-n 30000"

diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.initd-r6
deleted file mode 100644
index 55204cc..0000000
--- a/net-misc/tor/files/tor.initd-r6
+++ /dev/null
@@ -1,58 +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-r6,v 1.5 2011/09/14 10:53:02 blueness Exp $
-
-extra_commands="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
-	checkpath -d -m 0755 -o tor:tor /var/run/tor
-        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 --signal HUP --pidfile ${PIDFILE}
-	eend $?
-}

diff --git a/net-misc/tor/files/torrc-r1 b/net-misc/tor/files/torrc-r1
deleted file mode 100644
index 322a794..0000000
--- a/net-misc/tor/files/torrc-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Minimal torrc so tor will work out of the box
-#
-User tor
-PIDFile /var/run/tor/tor.pid
-Log notice syslog
-DataDirectory /var/lib/tor/data

diff --git a/net-misc/tor/files/torrc.sample.patch b/net-misc/tor/files/torrc.sample.patch
deleted file mode 100644
index 4a1592a..0000000
--- a/net-misc/tor/files/torrc.sample.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/torrc.sample.in
---- tor-0.2.2.32.orig/src/config/torrc.sample.in	2011-08-29 23:13:09.000000000 -0400
-+++ tor-0.2.2.32/src/config/torrc.sample.in	2011-08-29 23:14:19.000000000 -0400
-@@ -12,6 +12,10 @@
- ## Tor will look for this file in various places based on your platform:
- ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc
- 
-+## Default username and group the server will run as
-+User tor
-+
-+PIDFile /var/run/tor/tor.pid
- 
- ## Replace this with "SocksPort 0" if you plan to run Tor only as a
- ## relay, and not make any local application connections yourself.
-@@ -40,6 +44,7 @@
- #Log notice syslog
- ## To send all messages to stderr:
- #Log debug stderr
-+Log notice syslog
- 
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line. This is ignored on Windows;
-@@ -49,6 +54,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.

diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
deleted file mode 100644
index 9381df6..0000000
--- a/net-misc/tor/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer>
-		<email>chiiph@gentoo.org</email>
-		<name>Tomás Touceda</name>
-	</maintainer>
-	<use>
-		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
-		<flag name='transparent-proxy'>Enable transparent proxying</flag>
-		<flag name='bufferevents'>Use Libevent's buffered IO</flag>
-		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
-		<flag name='upnp'>Enable Universal Plug and Play</flag>
-	</use>
-</pkgmetadata>

diff --git a/net-misc/tor/tor-0.2.3.8_alpha.ebuild b/net-misc/tor/tor-0.2.3.8_alpha.ebuild
deleted file mode 100644
index 3d77e62..0000000
--- a/net-misc/tor/tor-0.2.3.8_alpha.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.7_alpha.ebuild,v 1.1 2011/10/31 10:16:33 blueness Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0.14
-	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( <net-libs/miniupnpc-1.6 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
-	eautoreconf
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf --docdir=/usr/share/doc/${PF} \
-		$(use_enable bufferevents) \
-		$(use_enable doc asciidoc) \
-		$(use_enable nat-pmp) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable threads) \
-		$(use_enable upnp)
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r6 tor
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}



^ permalink raw reply related	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2011-11-26 15:19 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-09 23:29 [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2011-02-09 23:55 Anthony G. Basile
2011-02-10  0:02 Anthony G. Basile
2011-03-25  0:14 Anthony G. Basile
2011-03-27  4:01 Anthony G. Basile
2011-03-27  4:39 Anthony G. Basile
2011-04-05 11:57 Anthony G. Basile
2011-04-09 17:39 Anthony G. Basile
2011-04-11  0:48 Anthony G. Basile
2011-05-07 19:29 Anthony G. Basile
2011-05-10 11:37 Anthony G. Basile
2011-05-30 20:48 Anthony G. Basile
2011-05-30 20:49 Anthony G. Basile
2011-06-06 16:54 Anthony G. Basile
2011-06-06 17:27 Anthony G. Basile
2011-06-07 21:00 Anthony G. Basile
2011-06-07 21:16 Anthony G. Basile
2011-07-22 17:30 Anthony G. Basile
2011-07-23 11:29 Anthony G. Basile
2011-08-30  3:35 Anthony G. Basile
2011-08-30  4:01 Anthony G. Basile
2011-08-30  4:06 Anthony G. Basile
2011-08-30 11:30 Anthony G. Basile
2011-08-30 13:47 Anthony G. Basile
2011-08-31 11:46 Anthony G. Basile
2011-11-25 13:01 Anthony G. Basile
2011-11-26 15:19 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox