bump and close #176018

(Portage version: 2.1.2.2)

6 files changed, 135 insertions, 60 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/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"
-}