From 945324e48cdfcf2fa1cdcf05e3770cab409a3b9a Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Fri, 16 Dec 2011 20:58:08 +0000 Subject: [PATCH] Removed older 0.2.1 version Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- net-misc/tor/ChangeLog | 7 +- .../tor/files/tor-0.2.1.19-logrotate.patch | 28 ------ net-misc/tor/files/torrc | 8 -- net-misc/tor/files/torrc.sample-0.1.2.6.patch | 30 ------ net-misc/tor/tor-0.2.1.31-r1.ebuild | 92 ------------------- 5 files changed, 6 insertions(+), 159 deletions(-) delete mode 100644 net-misc/tor/files/tor-0.2.1.19-logrotate.patch delete mode 100644 net-misc/tor/files/torrc delete mode 100644 net-misc/tor/files/torrc.sample-0.1.2.6.patch delete mode 100644 net-misc/tor/tor-0.2.1.31-r1.ebuild diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog index 9537e4d73eb9..56520fadef23 100644 --- a/net-misc/tor/ChangeLog +++ b/net-misc/tor/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/tor # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.302 2011/12/16 20:51:37 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.303 2011/12/16 20:58:08 blueness Exp $ + + 16 Dec 2011; Anthony G. Basile + -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch, + -tor-0.2.1.31-r1.ebuild, -files/torrc: + Removed older 0.2.1 version *tor-0.2.1.32 (16 Dec 2011) diff --git a/net-misc/tor/files/tor-0.2.1.19-logrotate.patch b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch deleted file mode 100644 index 3eadcaa8f167..000000000000 --- a/net-misc/tor/files/tor-0.2.1.19-logrotate.patch +++ /dev/null @@ -1,28 +0,0 @@ -* Change log dir from /var/lib/log to /var/log (#281439, Martin von Gagern) -* Change user and group name from _tor to tor (#281439, Martin von Gagern) -* Avoid error if tor is not running (#178975, Gustavo Felisberto) - -References: -http://bugs.gentoo.org/281439 -http://bugs.gentoo.org/178975 - ---- tor-0.2.1.19/contrib/tor.logrotate.in -+++ tor-0.2.1.19/contrib/tor.logrotate.in -@@ -1,4 +1,4 @@ --@LOCALSTATEDIR@/log/tor/*log { -+/var/log/tor/*.log { - daily - rotate 5 - compress -@@ -6,9 +6,9 @@ - missingok - notifempty - # you may need to change the username/groupname below -- create 0640 _tor _tor -+ create 0640 tor tor - sharedscripts - postrotate -- /etc/init.d/tor reload > /dev/null -+ /etc/init.d/tor reload > /dev/null || true - endscript - } diff --git a/net-misc/tor/files/torrc b/net-misc/tor/files/torrc deleted file mode 100644 index dc2dea3a637f..000000000000 --- a/net-misc/tor/files/torrc +++ /dev/null @@ -1,8 +0,0 @@ -# -# Minimal torrc so tor will work out of the box -# -User tor -Group tor -PIDFile /var/run/tor/tor.pid -Log notice file /var/log/tor/tor.log -DataDirectory /var/lib/tor/data diff --git a/net-misc/tor/files/torrc.sample-0.1.2.6.patch b/net-misc/tor/files/torrc.sample-0.1.2.6.patch deleted file mode 100644 index 7317552c237f..000000000000 --- a/net-misc/tor/files/torrc.sample-0.1.2.6.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- src/config/torrc.sample.in.orig 2007-01-27 23:41:23.000000000 +0000 -+++ src/config/torrc.sample.in 2007-01-27 23:43:47.000000000 +0000 -@@ -18,6 +18,11 @@ - ## 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 +51,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. This is ignored on Windows; -@@ -55,6 +61,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. diff --git a/net-misc/tor/tor-0.2.1.31-r1.ebuild b/net-misc/tor/tor-0.2.1.31-r1.ebuild deleted file mode 100644 index a5048f9a67e3..000000000000 --- a/net-misc/tor/tor-0.2.1.31-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.31-r1.ebuild,v 1.1 2011/11/26 15:44:00 blueness Exp $ - -EAPI=4 - -inherit autotools eutils flag-o-matic - -DESCRIPTION="Anonymizing overlay network for TCP" -HOMEPAGE="http://www.torproject.org/" -MY_PV=${PV/_/-} -SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug" - -DEPEND="dev-libs/openssl - >=dev-libs/libevent-1.2" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup tor - enewuser tor -1 -1 /var/lib/tor tor -} - -src_prepare() { - epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch - epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch - - einfo "Regenerating autotools files ..." - epatch "${FILESDIR}"/${PN}-0.2.1.30-respect-CFLAGS.patch - eautoreconf - - # Normally tor uses a bundled libevent fragment to provide - # asynchronous DNS requests. This is generally a bad idea, but at - # the moment the official libevent does not have the 0x20 hack, so - # anonymity is higher with the bundled variant. Remove patch as - # soon as upstream has installed the autoconf option to use - # system's libevent. This hasn't happened, so we - # have to live with the bundled libevent for this release, as the - # current version in tree won't suffice for tor to build - # See http://bugs.noreply.org/flyspray/index.php?do=details&id=920 - # for upstream's report - # Let's revisit this when libevent-2* is unmasked - # use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch -} - -src_configure() { - # Upstream isn't sure of all the user provided CFLAGS that - # will break tor, but does recommend against -fstrict-aliasing. - # We'll filter-flags them here as we encounter them. - filter-flags -fstrict-aliasing - econf $(use_enable debug) -} - -src_install() { - # allow the tor user more open files to avoid errors, see bug 251171 - newconfd "${FILESDIR}"/tor.confd tor - - newinitd "${FILESDIR}"/tor.initd-r6 tor - emake DESTDIR="${D}" install - keepdir /var/{lib,log,run}/tor - - dodoc README ChangeLog AUTHORS ReleaseNotes \ - doc/{HACKING,TODO} - - 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 - - insinto /etc/tor/ - doins "${FILESDIR}"/torrc - - insinto /etc/logrotate.d - newins contrib/tor.logrotate tor -} - -pkg_postinst() { - elog - elog "We created a configuration file for tor, /etc/tor/torrc, but you can" - elog "change it according to your needs. Use the torrc.sample that is in" - elog "that directory as a guide. Also, to have privoxy work with tor" - elog "just add the following line" - elog - elog "forward-socks4a / localhost:9050 ." - elog - elog "to /etc/privoxy/config. Notice the . at the end!" - elog -} -- 2.26.2