new revision better init script

Package-Manager: portage-2.0.51-r15

14 files changed, 105 insertions, 117 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index e885306b41ad..54b2bd06ccb0 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,14 @@
 # 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.27 2005/02/10 21:12:02 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.28 2005/02/14 14:24:01 humpback Exp $
+
+*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)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 973ce1863e98..f479947ac905 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,23 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 774d17b560f304aef7d4ebe933d292a2 ChangeLog 4276
-MD5 b5865f551fa6dd21658e0f8349638c9f metadata.xml 223
-MD5 38895f540946b4eb54ec8d057a756634 tor-0.0.8.1.ebuild 668
-MD5 745b12e968ec391563269494b605d01f tor-0.0.9.1.ebuild 642
-MD5 f5c7bfadb9ef2707896da811543f07a0 tor-0.0.9.2.ebuild 647
+MD5 102726d26e9db8c36ea4756a7849fce5 ChangeLog 4680
+MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
 MD5 239fe62a415b2bd1482d41eb660fee4b tor-0.0.9.4-r1.ebuild 1292
-MD5 53f9537e997679f73928328731c2d753 tor-0.0.9.4.ebuild 649
-MD5 362a9474c51233cada80f970f45d67fa files/digest-tor-0.0.8.1 63
-MD5 4be2cfc0de3dfbaf2afd6fa845201334 files/digest-tor-0.0.9.1 63
-MD5 85bb8fc46ff4ad9f1ae8b6929e72e789 files/digest-tor-0.0.9.2 63
-MD5 599eb69429f64d9001e57f8341fe150f files/digest-tor-0.0.9.4 63
-MD5 599eb69429f64d9001e57f8341fe150f files/digest-tor-0.0.9.4-r1 63
-MD5 6f6b61fd9dbc8423f43e2fb497ab017f files/tor.initd 894
+MD5 ffbafbce4f384a1168aab4a2ea34e201 tor-0.0.9.4-r2.ebuild 1284
+MD5 599eb69429f64d9001e57f8341fe150f files/digest-tor-0.0.9.4-r2 63
+MD5 f5a560f2b3f911080e830e354fd65e59 files/tor.initd 856
+MD5 485b6c84e589898a922507f1f6df2c78 files/torrc.sample.patch-00 1349
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCC89I8zY1VwezZiERAirEAKCCsmwT+jb0AunnmK6SsUGIcSHXOACeNvtV
-ti1CchOYP6uCrA011w4wMrc=
-=1gsZ
+iD8DBQFCELR88zY1VwezZiERArYEAJ0Q5qzJZ/6twKrsr7rvP9fNd4em/QCaA6tp
+kdKBc8Ws7X2KWRZ1xdCMQrY=
+=ZS5Y
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/digest-tor-0.0.8.1 b/net-misc/tor/files/digest-tor-0.0.8.1
deleted file mode 100644
index a3cf2d730f86..000000000000
--- a/net-misc/tor/files/digest-tor-0.0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e81be93cfadeccf82c5f6a066adbaa4 tor-0.0.8.1.tar.gz 442666
diff --git a/net-misc/tor/files/digest-tor-0.0.9.1 b/net-misc/tor/files/digest-tor-0.0.9.1
deleted file mode 100644
index 74cde028f46a..000000000000
--- a/net-misc/tor/files/digest-tor-0.0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a79e653bcb99a19baf7221405ebf0faa tor-0.0.9.1.tar.gz 518594
diff --git a/net-misc/tor/files/digest-tor-0.0.9.2 b/net-misc/tor/files/digest-tor-0.0.9.2
deleted file mode 100644
index 4610397cee8f..000000000000
--- a/net-misc/tor/files/digest-tor-0.0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 65fe27324904c350be555e4eb0ae9fcd tor-0.0.9.2.tar.gz 539296
diff --git a/net-misc/tor/files/digest-tor-0.0.9.4 b/net-misc/tor/files/digest-tor-0.0.9.4-r2
index 6ede64b3f96e..6ede64b3f96e 100644
--- a/net-misc/tor/files/digest-tor-0.0.9.4
+++ b/net-misc/tor/files/digest-tor-0.0.9.4-r2
diff --git a/net-misc/tor/files/tor.initd b/net-misc/tor/files/tor.initd
index b714ee56fde8..8cee5b35e84f 100644
--- a/net-misc/tor/files/tor.initd
+++ b/net-misc/tor/files/tor.initd
@@ -1,7 +1,7 @@
 #!/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,v 1.1 2005/02/10 21:12:02 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd,v 1.2 2005/02/14 14:24:01 humpback Exp $
 
 depend() {
         need net
@@ -11,8 +11,7 @@ checkconfig() {
         # first check that it exists
         if [ ! -f /etc/tor/torrc ] ; then
                 eerror "You need to setup /etc/tor/torrc first"
-                eerror "Example is in /etc/tor"
-                eerror "for info: info sockd.conf"
+                eerror "Example is in /etc/tor/torrc.sample"
                 return 1
         fi
 }
diff --git a/net-misc/tor/files/torrc.sample.patch-00 b/net-misc/tor/files/torrc.sample.patch-00
new file mode 100644
index 000000000000..71655303e024
--- /dev/null
+++ b/net-misc/tor/files/torrc.sample.patch-00
@@ -0,0 +1,38 @@
+--- torrc.sample.in.orig	2005-02-11 12:40:47.633092872 +0000
++++ torrc.sample.in	2005-02-11 12:47:01.107316160 +0000
+@@ -6,6 +6,10 @@
+ # On Windows, Tor will look for the configuration file in someplace like
+ # "Application Data\tor\torrc" or "Application Data\<username>\tor\torrc"
+ 
++## Default username and group the server will run as
++User tor
++Group tor
++
+ ## Replace this with "SocksPort 0" if you don't want clients to connect.
+ SocksPort 9050 # what port to advertise for application connections
+ SocksBindAddress 127.0.0.1 # accept connections only from localhost
+@@ -36,6 +40,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.
+@@ -53,6 +58,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
+ 
+ ############### This section is just for location-hidden services ###
+ 
+@@ -106,3 +112,8 @@
+ #ExitPolicy reject 192.168.0.1:*
+ #ExitPolicy reject *:*
+ 
++##Banwidth policies, see 
++##http://wiki.noreply.org/wiki/TheOnionRouter/TorFAQ for more info
++#BandwidthRate 25 kb
++#BandwidthBurst 50 mb
++
diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
index f5461571b386..30876e851586 100644
--- a/net-misc/tor/metadata.xml
+++ b/net-misc/tor/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>latexer@gentoo.org</email>
+  <email>humpback@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-misc/tor/tor-0.0.8.1.ebuild b/net-misc/tor/tor-0.0.8.1.ebuild
deleted file mode 100644
index 596daf256862..000000000000
--- a/net-misc/tor/tor-0.0.8.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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.0.8.1.ebuild,v 1.4 2005/01/04 18:50:58 latexer Exp $
-
-MY_P=${P/_rc/rc}
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.freehaven.net/tor/"
-SRC_URI="http://www.freehaven.net/tor/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ppc-macos"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc README ChangeLog AUTHORS \
-		doc/{CLIENTS,FAQ,HACKING,TODO} \
-		doc/{rendezvous.txt,tor-design.tex,tor-spec.txt}
-}
diff --git a/net-misc/tor/tor-0.0.9.1.ebuild b/net-misc/tor/tor-0.0.9.1.ebuild
deleted file mode 100644
index ca5d55b0c734..000000000000
--- a/net-misc/tor/tor-0.0.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.0.9.1.ebuild,v 1.2 2005/01/04 18:50:58 latexer Exp $
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.freehaven.net/tor/"
-SRC_URI="http://www.freehaven.net/tor/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="net-misc/tsocks"
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc README ChangeLog AUTHORS \
-		doc/{CLIENTS,FAQ,HACKING,TODO} \
-		doc/{rendezvous.txt,tor-design.tex,tor-spec.txt}
-}
diff --git a/net-misc/tor/tor-0.0.9.2.ebuild b/net-misc/tor/tor-0.0.9.2.ebuild
deleted file mode 100644
index fa0e5bcc80bb..000000000000
--- a/net-misc/tor/tor-0.0.9.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.0.9.2.ebuild,v 1.2 2005/01/09 16:07:27 cryos Exp $
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.freehaven.net/tor/"
-SRC_URI="http://www.freehaven.net/tor/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="net-misc/tsocks"
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc README ChangeLog AUTHORS \
-		doc/{CLIENTS,FAQ,HACKING,TODO} \
-		doc/{rendezvous.txt,tor-design.tex,tor-spec.txt}
-}
diff --git a/net-misc/tor/tor-0.0.9.4-r2.ebuild b/net-misc/tor/tor-0.0.9.4-r2.ebuild
new file mode 100644
index 000000000000..6badedcf2d19
--- /dev/null
+++ b/net-misc/tor/tor-0.0.9.4-r2.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.0.9.4-r2.ebuild,v 1.1 2005/02/14 14:24:01 humpback Exp $
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.freehaven.net/tor/"
+SRC_URI="http://www.freehaven.net/tor/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+DEPEND="dev-libs/openssl"
+RDEPEND="net-misc/tsocks"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src/config
+	epatch ${FILESDIR}/torrc.sample.patch-00
+}
+
+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"
+}
diff --git a/net-misc/tor/tor-0.0.9.4.ebuild b/net-misc/tor/tor-0.0.9.4.ebuild
deleted file mode 100644
index c185e0b7588c..000000000000
--- a/net-misc/tor/tor-0.0.9.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.0.9.4.ebuild,v 1.1 2005/02/04 16:32:40 latexer Exp $
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.freehaven.net/tor/"
-SRC_URI="http://www.freehaven.net/tor/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="net-misc/tsocks"
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc README ChangeLog AUTHORS \
-		doc/{CLIENTS,FAQ,HACKING,TODO} \
-		doc/{rendezvous.txt,tor-design.tex,tor-spec.txt}
-}