fixed init issue close 189724

Package-Manager: portage-2.1.3.7

15 files changed, 90 insertions, 326 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 3ee57217034f..66554053875b 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.91 2007/08/09 17:37:37 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.92 2007/08/28 23:31:14 humpback Exp $
+
+*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)
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 2ff3a4d5626a..dff44cb920c3 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,82 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX tor.confd 321 RMD160 e31d2f03bf979bef19895b4206f82f77cab09661 SHA1 3afa0332f8ca90d87524b0060a49aa5928116139 SHA256 1e4fa4c700620d70d96ebcbe337adad5839829d148c76c69c39b2b3a2ff58e76
-MD5 46b3d14e606aace36decc6497dfc0b00 files/tor.confd 321
-RMD160 e31d2f03bf979bef19895b4206f82f77cab09661 files/tor.confd 321
-SHA256 1e4fa4c700620d70d96ebcbe337adad5839829d148c76c69c39b2b3a2ff58e76 files/tor.confd 321
-AUX tor.initd 856 RMD160 a7da05532322a2d0ce147741137de7b6ed3d8074 SHA1 88c42307f91bcbeebe6971628cbaa46dd5531d56 SHA256 f5a5cf73164d2ecd9b33193071958d6371dd9000922a8624aedd6b8eda4ab9c5
-MD5 3321d3725a619e687d9bb7e2fb97d6c1 files/tor.initd 856
-RMD160 a7da05532322a2d0ce147741137de7b6ed3d8074 files/tor.initd 856
-SHA256 f5a5cf73164d2ecd9b33193071958d6371dd9000922a8624aedd6b8eda4ab9c5 files/tor.initd 856
-AUX tor.initd-r1 1236 RMD160 bc7ba95f5e2a61f10e893800cf8edd02375101ab SHA1 8f3911012c9981188684bf5d38312c7109e68c37 SHA256 53a79dbe8419396fbe19968d94722a209fee83cfcb5d01d8153be7ca5295c7ee
-MD5 bb2e1c6fc3298733ed0880793777533d files/tor.initd-r1 1236
-RMD160 bc7ba95f5e2a61f10e893800cf8edd02375101ab files/tor.initd-r1 1236
-SHA256 53a79dbe8419396fbe19968d94722a209fee83cfcb5d01d8153be7ca5295c7ee files/tor.initd-r1 1236
 AUX tor.initd-r2 1494 RMD160 56ac023f10e4a170daa8ec29c854968e1320107c SHA1 e76e069ce828c2a21cef0450033056d8e4e604dd SHA256 51fd05cb4c079fcb392459d066a7505de9f57f9f10b7ad5b274edcd1fe9cd1e4
 MD5 560d45ac7d56dda6c184f93c13124329 files/tor.initd-r2 1494
 RMD160 56ac023f10e4a170daa8ec29c854968e1320107c files/tor.initd-r2 1494
 SHA256 51fd05cb4c079fcb392459d066a7505de9f57f9f10b7ad5b274edcd1fe9cd1e4 files/tor.initd-r2 1494
+AUX tor.initd-r3 1480 RMD160 bea01b51344728325d3afd0c56dae490dd0fab4c SHA1 0c8e7014f5b0219cb2cc89b15cef73ebcc428f46 SHA256 57ba9d74235ae186cb7761773b7efa367f1db3f7b64a2f49285c812b6f33f7a0
+MD5 3d86dfd2b6fd888e6807200785cd4f96 files/tor.initd-r3 1480
+RMD160 bea01b51344728325d3afd0c56dae490dd0fab4c files/tor.initd-r3 1480
+SHA256 57ba9d74235ae186cb7761773b7efa367f1db3f7b64a2f49285c812b6f33f7a0 files/tor.initd-r3 1480
 AUX tor.logrotate.patch 301 RMD160 47a096ae4e7ddabdd5974df3c8cd1b221641edbb SHA1 b3c158d27b23600cc87f5e0a2ebba732e5fe3f69 SHA256 e64ff0f7442a180bcc8f9bd5fc258058ceae227847e32b69de39b589236f09dc
 MD5 63047059d12800aefe0998218de099af files/tor.logrotate.patch 301
 RMD160 47a096ae4e7ddabdd5974df3c8cd1b221641edbb files/tor.logrotate.patch 301
 SHA256 e64ff0f7442a180bcc8f9bd5fc258058ceae227847e32b69de39b589236f09dc files/tor.logrotate.patch 301
-AUX torrc.sample-0.1.0.16.patch 1134 RMD160 ad432e115b9610e139315f3908f4622702b84f7a SHA1 8b3f02b07c43e56ddce3b14f7a084329b332f793 SHA256 3174ef12c8d15486b9bd872a72030367023e0f81639659ecb48204160705d6da
-MD5 ab82c91feb4f7eceb4d1ed496a17f928 files/torrc.sample-0.1.0.16.patch 1134
-RMD160 ad432e115b9610e139315f3908f4622702b84f7a files/torrc.sample-0.1.0.16.patch 1134
-SHA256 3174ef12c8d15486b9bd872a72030367023e0f81639659ecb48204160705d6da files/torrc.sample-0.1.0.16.patch 1134
-AUX torrc.sample-0.1.1.23.patch 1138 RMD160 33c67ce315a5e41be4e68fe3bb76ca39121e5929 SHA1 760b35aca8e55010603ea8d4177706144b42e09a SHA256 df93f901e5c0d19da37fc9b5f2a8651451338851221c390d1e4961ab1f6c2226
-MD5 c3e48aec7c1425e059956aa1a486e465 files/torrc.sample-0.1.1.23.patch 1138
-RMD160 33c67ce315a5e41be4e68fe3bb76ca39121e5929 files/torrc.sample-0.1.1.23.patch 1138
-SHA256 df93f901e5c0d19da37fc9b5f2a8651451338851221c390d1e4961ab1f6c2226 files/torrc.sample-0.1.1.23.patch 1138
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 MD5 b9cf2eb98b62197faa6cc2b57c81d547 files/torrc.sample-0.1.2.6.patch 1145
 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 files/torrc.sample-0.1.2.6.patch 1145
 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1 files/torrc.sample-0.1.2.6.patch 1145
-DIST tor-0.1.1.23.tar.gz 847906 RMD160 e958ed22f44e5f06736cadb5406dad04510a69f5 SHA1 d3f0120f5a18658231127281343aafb6c06aed70 SHA256 a2ac0b10089902c2de8649e07823dc46b8876cd3e0236505e5e7f1f49ee11025
-DIST tor-0.1.1.26.tar.gz 893367 RMD160 cc1ce91d96dc25a963d1f49f7965db106890949a SHA1 4d754ee52e20ae99179a74245a5288527c179ab6 SHA256 3be8c89be5b927e73b77a82ca3d83f0f162fceea2d6a14ce1c0cf5333b36cd1c
-DIST tor-0.1.2.14.tar.gz 1225040 RMD160 f7ce98688519bd2d41bc0dd95fb90a120eae4207 SHA1 94140509bf158d2cab265e5193067f335d2a3cce SHA256 bc23e6f826f1f736e9d5e56ba79195099882aef2029a63dd667915bc1eb836a6
 DIST tor-0.1.2.16.tar.gz 1254796 RMD160 813a8726470361ee6629e71a10be67be9cfdd325 SHA1 f8eb950612db49b2f7176c068ca69e0091950bdb SHA256 1083bd4fef643880eb5eaa7deb0bb45a42c9700a1905c6cd2057de97849f067b
-EBUILD tor-0.1.1.23.ebuild 1430 RMD160 6cc2dfa9a85dfd359201a79c89d09b6c04e79058 SHA1 9d141d461ad1f5dee34aa4b08bb145b6bb8046a1 SHA256 4f3bf8576510196edfb0749cf315a7e9ac0d502b14cc7cf1c3ead205e74ddcef
-MD5 d38eb8246a60bd26fab7858d8e9ba9f8 tor-0.1.1.23.ebuild 1430
-RMD160 6cc2dfa9a85dfd359201a79c89d09b6c04e79058 tor-0.1.1.23.ebuild 1430
-SHA256 4f3bf8576510196edfb0749cf315a7e9ac0d502b14cc7cf1c3ead205e74ddcef tor-0.1.1.23.ebuild 1430
-EBUILD tor-0.1.1.26.ebuild 1435 RMD160 d1720708e867fa6d6b702f73c92128554d04c042 SHA1 37b2cdc1bec88f7ed4e5bf1d7e492e3e39c66cea SHA256 28bdedcc86b39adc74f5de299c698ceac255dd617d02ff59a7c1412d9f9a9298
-MD5 d05cf4614af8bde0f5f23a3c1c967784 tor-0.1.1.26.ebuild 1435
-RMD160 d1720708e867fa6d6b702f73c92128554d04c042 tor-0.1.1.26.ebuild 1435
-SHA256 28bdedcc86b39adc74f5de299c698ceac255dd617d02ff59a7c1412d9f9a9298 tor-0.1.1.26.ebuild 1435
-EBUILD tor-0.1.2.14.ebuild 1641 RMD160 f9469e7071022aa6d026239396d199b9fce18bba SHA1 bdbaaadd44e6e39cff7bd39050316832868a015e SHA256 1e73606fcc9c19184cef1a27a05a38141792ccdda8b7dc5f277804ac42341bd4
-MD5 b77528184f243c2dd442da6139384657 tor-0.1.2.14.ebuild 1641
-RMD160 f9469e7071022aa6d026239396d199b9fce18bba tor-0.1.2.14.ebuild 1641
-SHA256 1e73606fcc9c19184cef1a27a05a38141792ccdda8b7dc5f277804ac42341bd4 tor-0.1.2.14.ebuild 1641
+EBUILD tor-0.1.2.16-r1.ebuild 1648 RMD160 46a30d3dc0fc8eb54cea5f6a17d30876fa3b0c8b SHA1 970d0de7bd22abd299dc19df64af4d1f48188636 SHA256 ec8393788f57f99b523036571845fabdbb725ee3ee53ae8596cdd13e2295875d
+MD5 3c6a5fcc8eb49d8d29c08b66d4a53b15 tor-0.1.2.16-r1.ebuild 1648
+RMD160 46a30d3dc0fc8eb54cea5f6a17d30876fa3b0c8b tor-0.1.2.16-r1.ebuild 1648
+SHA256 ec8393788f57f99b523036571845fabdbb725ee3ee53ae8596cdd13e2295875d tor-0.1.2.16-r1.ebuild 1648
 EBUILD tor-0.1.2.16.ebuild 1635 RMD160 b6406d674ee2b09c081044014babae2a29e0cb62 SHA1 fa037a850b04c9aa5f8d8ea193e0d27113c58ac1 SHA256 da0fc4f316beea7c315353bd99d5590457106c95a14003d48523fc3211b3621b
 MD5 4a0739e359fbc817782dbe3a08749460 tor-0.1.2.16.ebuild 1635
 RMD160 b6406d674ee2b09c081044014babae2a29e0cb62 tor-0.1.2.16.ebuild 1635
 SHA256 da0fc4f316beea7c315353bd99d5590457106c95a14003d48523fc3211b3621b tor-0.1.2.16.ebuild 1635
-MISC ChangeLog 14441 RMD160 06724e5ab9429c0b6b6a951b6e4dfa076eef9557 SHA1 27346e3e2fee9c23a71c98867b5c8e83bc65fa2f SHA256 16895ebaccb5425afc6f9dc5865eeecf8e8d4cc3bd352a54aa67cf731b2d0525
-MD5 ab2545130c1fbb81e62faa4492989bf6 ChangeLog 14441
-RMD160 06724e5ab9429c0b6b6a951b6e4dfa076eef9557 ChangeLog 14441
-SHA256 16895ebaccb5425afc6f9dc5865eeecf8e8d4cc3bd352a54aa67cf731b2d0525 ChangeLog 14441
+MISC ChangeLog 14937 RMD160 f7f42461bda0b04486d3ad03f4059d589e06596c SHA1 e2c3d1be64b0d40d4b830db9e50b98be89f9a9ec SHA256 b69d9854b2a92d4ab7116fb53f1244332da97a584bc0ac622cbdbdc29d168f79
+MD5 4d5e95d85f4534f1a8b4834ab28487ba ChangeLog 14937
+RMD160 f7f42461bda0b04486d3ad03f4059d589e06596c ChangeLog 14937
+SHA256 b69d9854b2a92d4ab7116fb53f1244332da97a584bc0ac622cbdbdc29d168f79 ChangeLog 14937
 MISC metadata.xml 224 RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 SHA1 76b617d1cccc3a09fc6995f19e800d99775064c7 SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6
 MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
 RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 metadata.xml 224
 SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6 metadata.xml 224
-MD5 45b101c447f3c43d0d427f1d04dcb67d files/digest-tor-0.1.1.23 238
-RMD160 8a83d2c6e85d54c22b013b76f047f809981328c4 files/digest-tor-0.1.1.23 238
-SHA256 133ea58018c050b70d4ed06c314062e5113f2480518627481f101ce70ed35479 files/digest-tor-0.1.1.23 238
-MD5 ccf051565823b020b41076c5d00708b3 files/digest-tor-0.1.1.26 238
-RMD160 4eb63ec2810b1b2c1d9cb0edf270ae0c0d41f6fd files/digest-tor-0.1.1.26 238
-SHA256 a8803b5105cc7b4afb3a0d9894e11946a85373a06c84cd9402801d1ab86cdf50 files/digest-tor-0.1.1.26 238
-MD5 f56d672ceed2f7b1fb2a9e3682c2110c files/digest-tor-0.1.2.14 241
-RMD160 146c55e3b0cc0ab50a88230b2c152bfc4ce6327a files/digest-tor-0.1.2.14 241
-SHA256 09a1ebf3d3edc1fcd1af6ca5a2d19a9e9324b24ffd4c132b09b676cba2dea724 files/digest-tor-0.1.2.14 241
 MD5 03b9f4929b4bfa786434fddd2b67f516 files/digest-tor-0.1.2.16 241
 RMD160 cf2de4f9e2f05f0f7c589899d003a5471248521f files/digest-tor-0.1.2.16 241
 SHA256 8a70f509f9b916417eaefd78ecacd938cea77c7a40176b377f6eb67a470b6bd0 files/digest-tor-0.1.2.16 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGu1DlyZx3L/ph1soRAuQqAKDPpI4eqrU0asbaCTLGmFpgUGizEwCg7+0N
-X+ajIR2FEt6bo+4CKWFPfiw=
-=ChKR
------END PGP SIGNATURE-----
+MD5 03b9f4929b4bfa786434fddd2b67f516 files/digest-tor-0.1.2.16-r1 241
+RMD160 cf2de4f9e2f05f0f7c589899d003a5471248521f files/digest-tor-0.1.2.16-r1 241
+SHA256 8a70f509f9b916417eaefd78ecacd938cea77c7a40176b377f6eb67a470b6bd0 files/digest-tor-0.1.2.16-r1 241
diff --git a/net-misc/tor/files/digest-tor-0.1.1.23 b/net-misc/tor/files/digest-tor-0.1.1.23
deleted file mode 100644
index 032c6df9d0a9..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.1.23
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 33ce7155f545c4d30cb846d7017cc6c2 tor-0.1.1.23.tar.gz 847906
-RMD160 e958ed22f44e5f06736cadb5406dad04510a69f5 tor-0.1.1.23.tar.gz 847906
-SHA256 a2ac0b10089902c2de8649e07823dc46b8876cd3e0236505e5e7f1f49ee11025 tor-0.1.1.23.tar.gz 847906
diff --git a/net-misc/tor/files/digest-tor-0.1.1.26 b/net-misc/tor/files/digest-tor-0.1.1.26
deleted file mode 100644
index 916d04962bfe..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.1.26
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0667df7a1f670bee5163b607aea172ba tor-0.1.1.26.tar.gz 893367
-RMD160 cc1ce91d96dc25a963d1f49f7965db106890949a tor-0.1.1.26.tar.gz 893367
-SHA256 3be8c89be5b927e73b77a82ca3d83f0f162fceea2d6a14ce1c0cf5333b36cd1c tor-0.1.1.26.tar.gz 893367
diff --git a/net-misc/tor/files/digest-tor-0.1.2.14 b/net-misc/tor/files/digest-tor-0.1.2.14
deleted file mode 100644
index eba8c8ef67cb..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.2.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dc93a52f9c12ec7fe73b3905a28f09ec tor-0.1.2.14.tar.gz 1225040
-RMD160 f7ce98688519bd2d41bc0dd95fb90a120eae4207 tor-0.1.2.14.tar.gz 1225040
-SHA256 bc23e6f826f1f736e9d5e56ba79195099882aef2029a63dd667915bc1eb836a6 tor-0.1.2.14.tar.gz 1225040
diff --git a/net-misc/tor/files/digest-tor-0.1.2.16-r1 b/net-misc/tor/files/digest-tor-0.1.2.16-r1
new file mode 100644
index 000000000000..43a3da1ea29b
--- /dev/null
+++ b/net-misc/tor/files/digest-tor-0.1.2.16-r1
@@ -0,0 +1,3 @@
+MD5 f340777b3f6c3175de976856d2d2e4be tor-0.1.2.16.tar.gz 1254796
+RMD160 813a8726470361ee6629e71a10be67be9cfdd325 tor-0.1.2.16.tar.gz 1254796
+SHA256 1083bd4fef643880eb5eaa7deb0bb45a42c9700a1905c6cd2057de97849f067b tor-0.1.2.16.tar.gz 1254796
diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
deleted file mode 100644
index ae0ce0222502..000000000000
--- a/net-misc/tor/files/tor.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# If you wish to run tor in a chroot, run:
-# ebuild /var/db/pkg/net-misc/<tor-version>/<tor-version>.ebuild config
-# and un-comment the following line.
-# You can specify a different chroot directory but MAKE SURE it's empty.
-# CHROOT="/chroot/tor"
-
-# Location of pid file relative to $CHROOT
-# PIDFILE="/var/run/tor.pid"
diff --git a/net-misc/tor/files/tor.initd b/net-misc/tor/files/tor.initd
deleted file mode 100644
index 02736e8ac7bb..000000000000
--- a/net-misc/tor/files/tor.initd
+++ /dev/null
@@ -1,33 +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,v 1.4 2005/09/11 23:14:16 humpback Exp $
-
-depend() {
-        need net
-}
-
-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/torrc.sample"
-                return 1
-        fi
-}
-
-
-
-start() {
-	checkconfig || return 1
-        ebegin "Starting Tor"
-        HOME=/var/lib/tor
-        start-stop-daemon --start --quiet --chuid tor --exec /usr/bin/tor -- --runasdaemon 1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Tor"
-        start-stop-daemon --stop --quiet --chuid tor --exec /usr/bin/tor
-        eend $?
-}
diff --git a/net-misc/tor/files/tor.initd-r1 b/net-misc/tor/files/tor.initd-r1
deleted file mode 100644
index 2bf4d0f265bf..000000000000
--- a/net-misc/tor/files/tor.initd-r1
+++ /dev/null
@@ -1,42 +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-r1,v 1.1 2006/01/04 03:38:09 humpback Exp $
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f ${CHROOT}/etc/tor/torrc ] ; then
-                eerror "You need to setup ${CHROOT}/etc/tor/torrc first"
-                eerror "Example is in /etc/tor/torrc.sample"
-                return 1
-        fi
-}
-
-start() {
-	checkconfig || return 1
-        ebegin "Starting ${CHROOT:+chrooted }Tor"
-        HOME=/var/lib/tor
-	if [ "x${CHROOT}" == "x" ] ; then
-	        start-stop-daemon --start --quiet --chuid tor --exec /usr/bin/tor -- --runasdaemon 1
-	else
-	        start-stop-daemon --start --quiet --chuid tor --chroot ${CHROOT} \
-			--exec /usr/bin/tor -- --runasdaemon 1
-	fi
-	
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping ${CHROOT:+chrooted }Tor"
-	checkconfig || return 2
-	if [ "x${CHROOT}" == "x" ] ; then
-        	start-stop-daemon --stop --quiet --chuid tor --exec /usr/bin/tor
-	else
-        	start-stop-daemon --stop --quiet --chuid tor --pidfile ${CHROOT}${PIDFILE}
-	fi
-        eend $?
-}
diff --git a/net-misc/tor/files/tor.initd-r3 b/net-misc/tor/files/tor.initd-r3
new file mode 100644
index 000000000000..0bdf9dac5a33
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r3
@@ -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-r3,v 1.1 2007/08/28 23:31:14 humpback 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
+	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 --quiet --chuid tor --exec /usr/bin/tor -- --runasdaemon 1 &> /dev/null
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping Tor"
+	start-stop-daemon --stop --quiet --chuid tor --exec /usr/bin/tor
+        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.sample-0.1.0.16.patch b/net-misc/tor/files/torrc.sample-0.1.0.16.patch
deleted file mode 100644
index 51fcf8c3e580..000000000000
--- a/net-misc/tor/files/torrc.sample-0.1.0.16.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/config/torrc.sample.in.orig	2006-01-04 03:25:18.000000000 +0000
-+++ src/config/torrc.sample.in	2006-01-04 03:26:45.000000000 +0000
-@@ -14,6 +14,12 @@
- # 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.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 +52,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 +70,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/files/torrc.sample-0.1.1.23.patch b/net-misc/tor/files/torrc.sample-0.1.1.23.patch
deleted file mode 100644
index c048b45243a5..000000000000
--- a/net-misc/tor/files/torrc.sample-0.1.1.23.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/config/torrc.sample.in.orig	2006-01-04 03:25:18.000000000 +0000
-+++ src/config/torrc.sample.in	2006-01-04 03:26:45.000000000 +0000
-@@ -14,6 +14,12 @@
- # 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 +52,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 +70,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.1.23.ebuild b/net-misc/tor/tor-0.1.1.23.ebuild
deleted file mode 100644
index 87a2bdf3e3e5..000000000000
--- a/net-misc/tor/tor-0.1.1.23.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.1.23.ebuild,v 1.9 2007/05/15 16:08:36 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 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	dev-libs/libevent"
-RDEPEND="net-proxy/tsocks
-		${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/torrc.sample-0.1.1.23.patch
-}
-
-src_install() {
-	newinitd ${FILESDIR}/tor.initd tor
-	make DESTDIR=${D} install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS INSTALL \
-		doc/{HACKING,TODO} \
-		doc/{control-spec.txt,dir-spec.txt,rend-spec.txt,socks-extensions.txt,tor-spec.txt}
-
-	dodir /var/lib/tor
-	dodir /var/log/tor
-	dodir /var/run/tor
-	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
-}
-
-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 ."
-	ewarn "(notice the . at the end of the line)"
-	einfo "to /etc/privoxy/config"
-}
diff --git a/net-misc/tor/tor-0.1.1.26.ebuild b/net-misc/tor/tor-0.1.1.26.ebuild
deleted file mode 100644
index 9906586f8748..000000000000
--- a/net-misc/tor/tor-0.1.1.26.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.1.26.ebuild,v 1.3 2007/05/15 16:08:36 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 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	dev-libs/libevent"
-RDEPEND="net-proxy/tsocks
-		${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/torrc.sample-0.1.1.23.patch
-}
-
-src_install() {
-	newinitd ${FILESDIR}/tor.initd tor
-	make DESTDIR=${D} install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS INSTALL \
-		doc/{HACKING,TODO} \
-		doc/{control-spec.txt,dir-spec.txt,rend-spec.txt,socks-extensions.txt,tor-spec.txt}
-
-	dodir /var/lib/tor
-	dodir /var/log/tor
-	dodir /var/run/tor
-	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
-}
-
-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 ."
-	ewarn "(notice the . at the end of the line)"
-	einfo "to /etc/privoxy/config"
-}
diff --git a/net-misc/tor/tor-0.1.2.14.ebuild b/net-misc/tor/tor-0.1.2.16-r1.ebuild
index f4d66077779a..38736e9e4a82 100644
--- a/net-misc/tor/tor-0.1.2.14.ebuild
+++ b/net-misc/tor/tor-0.1.2.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.14.ebuild,v 1.6 2007/06/02 19:58:38 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.16-r1.ebuild,v 1.1 2007/08/28 23:31:14 humpback Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug"
 
 DEPEND="dev-libs/openssl
@@ -38,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r2 tor
+	newinitd "${FILESDIR}"/tor.initd-r3 tor
 	emake DESTDIR="${D}" install || die
 	keepdir /var/{lib,log,run}/tor