bump and close #176018

Package-Manager: portage-2.1.2.2

7 files changed, 151 insertions, 82 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index e5e22e86410f..7eae622a0282 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,13 @@
 # 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.77 2007/04/29 17:48:03 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.78 2007/05/15 15:57:21 humpback Exp $
+
+*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:
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index ca846d5286a0..368d22ed75fe 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,6 +1,3 @@
------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
@@ -13,6 +10,10 @@ AUX tor.initd-r1 1236 RMD160 bc7ba95f5e2a61f10e893800cf8edd02375101ab SHA1 8f391
 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 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
@@ -28,7 +29,7 @@ SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1 files/to
 DIST tor-0.1.0.18.tar.gz 633222 RMD160 5bb12bbc808c08026098410657785ab61f4efd43 SHA1 cac98320fe14d195c261aa577cd0b2324f157351 SHA256 bc815e1b12e9eab1a03a9c83aa7169820bf250a8fce445c533996293e9e01cf6
 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.6-alpha.tar.gz 1078819 RMD160 7686d576cecfee166a1c303b87bb56b4ebb420df SHA1 d568378d97e3337d79fac636cd9e4ea4f1b3d64f SHA256 617e154bef5a9e6aa76a0c0cad64a7002e440711e24dec54115960f72bfbff76
+DIST tor-0.1.2.13.tar.gz 1181719 RMD160 8364e35a1b2580ff5d02081757c0550bbf13e8cb SHA1 d90a999bdce1c4abce16b31211918a755dfdcf6a SHA256 c8a33521b32e04b00ce97c4ab980a4232b4029284cd2944f496609a9797ba21b
 EBUILD tor-0.1.0.18-r1.ebuild 4005 RMD160 c8a036cb3ece4ef917ead9dd082880db34a65f46 SHA1 962c1910cf3bc414f959bac645bbad724893dac0 SHA256 cfe363b490a4405f587e932b8b7a56694905d7a8f45b2979e361778182e77629
 MD5 44089e8b967ce4c2ae32d3d277787b2a tor-0.1.0.18-r1.ebuild 4005
 RMD160 c8a036cb3ece4ef917ead9dd082880db34a65f46 tor-0.1.0.18-r1.ebuild 4005
@@ -45,14 +46,14 @@ EBUILD tor-0.1.1.26.ebuild 1387 RMD160 5aed2710419ae44457b4d07978715e603ceb7974
 MD5 eb29aa0dd8e4616fa8c22745782723f0 tor-0.1.1.26.ebuild 1387
 RMD160 5aed2710419ae44457b4d07978715e603ceb7974 tor-0.1.1.26.ebuild 1387
 SHA256 f09d43f4eda05900c517c42c27d15e2ec7141cb03454709aab660041e6769d55 tor-0.1.1.26.ebuild 1387
-EBUILD tor-0.1.2.6_alpha.ebuild 1458 RMD160 d5968f309516f989f26aa0fbc477970197d838f1 SHA1 e1c3c0c5431e148799056c3e8962905a40fc44fb SHA256 a252087d5693e5f1cdf9d665b086f33624b5c5a1f747dbedafaccb0ad5f31a61
-MD5 1a2ec9ad13b01d83b78503100faf7239 tor-0.1.2.6_alpha.ebuild 1458
-RMD160 d5968f309516f989f26aa0fbc477970197d838f1 tor-0.1.2.6_alpha.ebuild 1458
-SHA256 a252087d5693e5f1cdf9d665b086f33624b5c5a1f747dbedafaccb0ad5f31a61 tor-0.1.2.6_alpha.ebuild 1458
-MISC ChangeLog 12359 RMD160 aea809e1e0968dbf47a4e8a14039a94a1d001970 SHA1 2d3639f0805bb5e6b4ff739911cff8090127752f SHA256 ff446a067898200f756ba217340d65551a8164d6be13ad8b27960968a07334e1
-MD5 aaf7cd1aff2442c820bc409879caadbd ChangeLog 12359
-RMD160 aea809e1e0968dbf47a4e8a14039a94a1d001970 ChangeLog 12359
-SHA256 ff446a067898200f756ba217340d65551a8164d6be13ad8b27960968a07334e1 ChangeLog 12359
+EBUILD tor-0.1.2.13.ebuild 1637 RMD160 dedbf0b6eccceddb3d6e5cf5692f1204eb5ddc99 SHA1 761d63c0b28ddb34009ac16fb5c1fe8518d83f7f SHA256 bf88a5d376e4a15103b06ef04cb401d0dd835abe4a1c2e6bd77a6a62cb7e51fb
+MD5 403bfcee4653cca0b0e6dac3adbeb382 tor-0.1.2.13.ebuild 1637
+RMD160 dedbf0b6eccceddb3d6e5cf5692f1204eb5ddc99 tor-0.1.2.13.ebuild 1637
+SHA256 bf88a5d376e4a15103b06ef04cb401d0dd835abe4a1c2e6bd77a6a62cb7e51fb tor-0.1.2.13.ebuild 1637
+MISC ChangeLog 12623 RMD160 f918994dc4e948bb5bc31df6874e2fa3d707069e SHA1 0847d29bba2afede97fdc88a5e78ef0be4705fe9 SHA256 0f2677ec2604be323df5f67c7e4e287b302417e6305402013257b3d8226a0387
+MD5 71d1ad1fc5f4d777794db362d0039bd4 ChangeLog 12623
+RMD160 f918994dc4e948bb5bc31df6874e2fa3d707069e ChangeLog 12623
+SHA256 0f2677ec2604be323df5f67c7e4e287b302417e6305402013257b3d8226a0387 ChangeLog 12623
 MISC metadata.xml 224 RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 SHA1 76b617d1cccc3a09fc6995f19e800d99775064c7 SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6
 MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
 RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 metadata.xml 224
@@ -69,13 +70,6 @@ SHA256 133ea58018c050b70d4ed06c314062e5113f2480518627481f101ce70ed35479 files/di
 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 ada9733f0128b4ed365ba59657f46887 files/digest-tor-0.1.2.6_alpha 256
-RMD160 ef17d7947a95b621d70004b9b0b49f4fe47dd82f files/digest-tor-0.1.2.6_alpha 256
-SHA256 2b59262565f66cf8ab0f5ac97bb09278d073d2f1815bb9c8455b119819a32286 files/digest-tor-0.1.2.6_alpha 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGNNpbV3J2n04EauwRAvFWAKCnex23s6YGObz3VfXu217nqu+HlQCggHW4
-4xtJqw51r5xwHbrJvcAduvU=
-=VMuz
------END PGP SIGNATURE-----
+MD5 ffabe39b7ad5aea86a29e2bdc2ec1f0d files/digest-tor-0.1.2.13 241
+RMD160 a256a2c66e79d5418dfa91b124f176a0d3508751 files/digest-tor-0.1.2.13 241
+SHA256 ba619d0acbd6589627b731656132f17e99757ab9f177def7acf5eb61e9af8589 files/digest-tor-0.1.2.13 241
diff --git a/net-misc/tor/files/digest-tor-0.1.2.13 b/net-misc/tor/files/digest-tor-0.1.2.13
new file mode 100644
index 000000000000..80357acabf3f
--- /dev/null
+++ b/net-misc/tor/files/digest-tor-0.1.2.13
@@ -0,0 +1,3 @@
+MD5 db54abdddf7eb5859b6e1bdf5f7ece00 tor-0.1.2.13.tar.gz 1181719
+RMD160 8364e35a1b2580ff5d02081757c0550bbf13e8cb tor-0.1.2.13.tar.gz 1181719
+SHA256 c8a33521b32e04b00ce97c4ab980a4232b4029284cd2944f496609a9797ba21b tor-0.1.2.13.tar.gz 1181719
diff --git a/net-misc/tor/files/digest-tor-0.1.2.6_alpha b/net-misc/tor/files/digest-tor-0.1.2.6_alpha
deleted file mode 100644
index 6c6650819207..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.2.6_alpha
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 62d3fb8a96937d7d5de653a653acb671 tor-0.1.2.6-alpha.tar.gz 1078819
-RMD160 7686d576cecfee166a1c303b87bb56b4ebb420df tor-0.1.2.6-alpha.tar.gz 1078819
-SHA256 617e154bef5a9e6aa76a0c0cad64a7002e440711e24dec54115960f72bfbff76 tor-0.1.2.6-alpha.tar.gz 1078819
diff --git a/net-misc/tor/files/tor.initd-r2 b/net-misc/tor/files/tor.initd-r2
new file mode 100644
index 000000000000..df4f8ad652a0
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r2
@@ -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-r2,v 1.1 2007/05/15 15:57:21 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/tor-0.1.2.13.ebuild b/net-misc/tor/tor-0.1.2.13.ebuild
new file mode 100644
index 000000000000..39804213c76f
--- /dev/null
+++ b/net-misc/tor/tor-0.1.2.13.ebuild
@@ -0,0 +1,67 @@
+# 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.13.ebuild,v 1.1 2007/05/15 15:57:21 humpback Exp $
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://tor.eff.org"
+MY_PV=${PV/_/-}
+SRC_URI="http://tor.eff.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+RDEPEND="${DEPEND}
+	net-proxy/tsocks"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+}
+
+src_compile() {
+	econf $(use_enable debug)
+	emake || die "emake failed"
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r2 tor
+	emake DESTDIR="${D}" install || die
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	keepdir /var/lib/tor
+	keepdir /var/log/tor
+	keepdir /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
+
+	sed -i -e "s:/lib::" \
+		-e "s:/rc.d::" \
+		-e "s:\\*:\\*.:" contrib/tor.logrotate
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+}
+
+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"
+}
diff --git a/net-misc/tor/tor-0.1.2.6_alpha.ebuild b/net-misc/tor/tor-0.1.2.6_alpha.ebuild
deleted file mode 100644
index 21bdc922902d..000000000000
--- a/net-misc/tor/tor-0.1.2.6_alpha.ebuild
+++ /dev/null
@@ -1,56 +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.2.6_alpha.ebuild,v 1.2 2007/04/29 17:48:03 tove Exp $
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://tor.eff.org"
-MY_PV=${PV/_/-}
-SRC_URI="http://tor.eff.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	dev-libs/libevent"
-RDEPEND="net-proxy/tsocks"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_unpack() {
-	unpack ${A}
-	echo ${P}
-	cd ${S}
-	epatch ${FILESDIR}/torrc.sample-0.1.2.6.patch
-}
-
-src_install() {
-	newinitd ${FILESDIR}/tor.initd tor
-	make DESTDIR=${D} install || die
-
-	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"
-}