update to solve sec bug

(Portage version: 2.0.51.22-r2)

5 files changed, 85 insertions, 11 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 5d4f3acf4b54..22924e6cae77 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.45 2005/07/20 21:03:47 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.46 2005/08/14 22:26:16 humpback Exp $
+
+*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.
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 4a6597199617..9f3cf5c6a77e 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 81e9bb6d95a3b15486264d4b7c8a25b3 tor-0.1.0.14.ebuild 1276
 MD5 5254a4effd12ce24284e8cae736bfd2f tor-0.0.9.10.ebuild 1268
 MD5 0b1dfcb11963f3f604f29e14943dad8f ChangeLog 7092
 MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
+MD5 ef65448a33725bf0e7f4d02d5e0b8fb1 files/torrc.sample-0.1.0.14.patch 1120
 MD5 485b6c84e589898a922507f1f6df2c78 files/torrc.sample.patch-00 1349
 MD5 7587786181f235b77608c5db7fc1a033 files/tor.initd 867
 MD5 70977176fc7a478dc75f6eadef340545 files/digest-tor-0.0.9.10 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3rxP2G5bA0cA/ScRAjgbAJ942VpIoUGRRqvMZwcZev7a09d3TwCgqEAu
-6zieyV8vjVgvBsR0NyhZPjs=
-=ozYP
------END PGP SIGNATURE-----
+MD5 ddb143bc03f010846dd1c1a12c80ec04 files/digest-tor-0.1.0.14 64
diff --git a/net-misc/tor/files/digest-tor-0.1.0.14 b/net-misc/tor/files/digest-tor-0.1.0.14
new file mode 100644
index 000000000000..5f29882dfc55
--- /dev/null
+++ b/net-misc/tor/files/digest-tor-0.1.0.14
@@ -0,0 +1 @@
+MD5 a3698218371ed0e647886fef0545bb44 tor-0.1.0.14.tar.gz 631723
diff --git a/net-misc/tor/files/torrc.sample-0.1.0.14.patch b/net-misc/tor/files/torrc.sample-0.1.0.14.patch
new file mode 100644
index 000000000000..750465208fe6
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample-0.1.0.14.patch
@@ -0,0 +1,28 @@
+--- tor-orig/src/config/torrc.sample.in	2005-08-13 19:07:33.969978500 +0200
++++ tor-0.1.0.14/src/config/torrc.sample.in	2005-08-13 19:08:47.902599000 +0200
+@@ -14,6 +14,9 @@
+ # 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
+ 
+ ## 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 +49,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.
+@@ -63,6 +67,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.  NB: this feature is
diff --git a/net-misc/tor/tor-0.1.0.14.ebuild b/net-misc/tor/tor-0.1.0.14.ebuild
new file mode 100644
index 000000000000..d62ef6a720e5
--- /dev/null
+++ b/net-misc/tor/tor-0.1.0.14.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.0.14.ebuild,v 1.1 2005/08/14 22:26:16 humpback Exp $
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://tor.eff.org"
+SRC_URI="http://tor.eff.org/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	dev-libs/libevent"
+RDEPEND="net-proxy/tsocks"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/torrc.sample-0.1.0.14.patch
+}
+
+src_install() {
+	exeinto /etc/init.d ; newexe ${FILESDIR}/tor.initd tor
+	make DESTDIR=${D} install || die
+
+	dodoc README ChangeLog AUTHORS INSTALL \
+		doc/{CLIENTS,FAQ,HACKING,TODO} \
+		doc/{control-spec.txt,rend-spec.txt,tor-doc.css,tor-doc.html,tor-spec.txt}
+
+	enewgroup tor
+	enewuser tor -1 /bin/false /var/lib/tor tor
+	dodir /var/lib/tor
+	dodir /var/log/tor
+	fperms 750 /var/lib/tor /var/log/tor
+	fowners tor:tor /var/lib/tor /var/log/tor
+}
+
+pkg_postinst() {
+	einfo "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	einfo "To have privoxy and tor working together you must add:"
+	einfo "forward-socks4a / localhost:9050 ."
+	einfo "to /etc/privoxy/config"
+}