summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/tor/ChangeLog6
-rw-r--r--net-misc/tor/files/tor.initd-r357
-rw-r--r--net-misc/tor/files/tor.logrotate.patch10
-rw-r--r--net-misc/tor/tor-0.1.2.19-r2.ebuild69
-rw-r--r--net-misc/tor/tor-0.2.0.30.ebuild69
5 files changed, 5 insertions, 206 deletions
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 3fae5b541144..7bab0360be13 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/tor
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.129 2008/09/06 15:16:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.130 2008/09/06 19:30:07 opfer Exp $
+
+ 06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r3,
+ -files/tor.logrotate.patch, -tor-0.1.2.19-r2.ebuild, -tor-0.2.0.30.ebuild:
+ clean up
06 Sep 2008; Raúl Porcel <armin76@gentoo.org> tor-0.2.0.30-r1.ebuild:
x86 stable wrt #236536
diff --git a/net-misc/tor/files/tor.initd-r3 b/net-misc/tor/files/tor.initd-r3
deleted file mode 100644
index b2fad4893a9e..000000000000
--- a/net-misc/tor/files/tor.initd-r3
+++ /dev/null
@@ -1,57 +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-r3,v 1.2 2007/08/29 11:49:42 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 --pidfile "${PIDFILE}" --quiet --chuid tor --exec /usr/bin/tor -- --runasdaemon 1 --PidFile "${PIDFILE}" &> /dev/null
- eend $?
-}
-
-stop() {
- ebegin "Stopping Tor"
- start-stop-daemon --stop --pidfile "${PIDFILE}" --chuid tor --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
- 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/tor.logrotate.patch b/net-misc/tor/files/tor.logrotate.patch
deleted file mode 100644
index fb3d37d607c5..000000000000
--- a/net-misc/tor/files/tor.logrotate.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- contrib/tor.logrotate.in.ori 2007-05-31 10:38:24.774901656 +0100
-+++ contrib/tor.logrotate.in 2007-05-31 10:38:52.189956005 +0100
-@@ -7,6 +7,6 @@
- notifempty
- sharedscripts
- postrotate
-- /etc/rc.d/init.d/tor reload > /dev/null
-+ /etc/rc.d/init.d/tor reload > /dev/null || true
- endscript
- }
diff --git a/net-misc/tor/tor-0.1.2.19-r2.ebuild b/net-misc/tor/tor-0.1.2.19-r2.ebuild
deleted file mode 100644
index abda9702ef19..000000000000
--- a/net-misc/tor/tor-0.1.2.19-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 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.19-r2.ebuild,v 1.6 2008/05/29 09:51:08 armin76 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 logrotate"
-
-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
- epatch "${FILESDIR}"/tor.logrotate.patch
-}
-
-src_compile() {
- econf $(use_enable debug)
- emake || die
-}
-
-src_install() {
- newinitd "${FILESDIR}"/tor.initd-r3 tor
- emake DESTDIR="${D}" install || die
- keepdir /var/{lib,log,run}/tor
-
- dodoc README ChangeLog AUTHORS ReleaseNotes \
- doc/{HACKING,TODO} \
- doc/spec/*.txt
-
- 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
-
- if use logrotate; then
- sed -e "s:/lib::" \
- -e "s:/rc.d::" \
- -e "s:\\*:\\*.:" \
- -e "s:sharedscripts:create 0640 tor tor\n\tsharedscripts:" -i contrib/tor.logrotate || die
- insinto /etc/logrotate.d
- newins contrib/tor.logrotate tor
- fi
-}
-
-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.2.0.30.ebuild b/net-misc/tor/tor-0.2.0.30.ebuild
deleted file mode 100644
index ee4726c3a6ab..000000000000
--- a/net-misc/tor/tor-0.2.0.30.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.0.30.ebuild,v 1.1 2008/08/03 16:28:10 opfer 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 logrotate"
-
-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
- epatch "${FILESDIR}"/${P}-logrotate.patch
-}
-
-src_compile() {
- econf $(use_enable debug)
- emake || die
-}
-
-src_install() {
- newinitd "${FILESDIR}"/tor.initd-r3 tor
- emake DESTDIR="${D}" install || die
- keepdir /var/{lib,log,run}/tor
-
- dodoc README ChangeLog AUTHORS ReleaseNotes \
- doc/{HACKING,TODO} \
- doc/spec/*.txt
-
- 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
-
- if use logrotate; then
- sed -e "s:/lib::" \
- -e "s:/rc.d::" \
- -e "s:\\*:\\*.:" \
- -e "s:sharedscripts:create 0640 tor tor\n\tsharedscripts:" -i contrib/tor.logrotate || die
- insinto /etc/logrotate.d
- newins contrib/tor.logrotate tor
- fi
-}
-
-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"
-}