From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PnJzB-000657-8b for garchives@archives.gentoo.org; Thu, 10 Feb 2011 00:02:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30A9F1C00E; Thu, 10 Feb 2011 00:02:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C31561C00E for ; Thu, 10 Feb 2011 00:02:05 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4EE831B410B for ; Thu, 10 Feb 2011 00:02:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 643E18006D for ; Thu, 10 Feb 2011 00:02:04 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <0549374e344213f6f8d70c8c2fc6a1593d0b99a0.blueness@gentoo> Subject: [gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/ X-VCS-Repository: dev/blueness X-VCS-Files: net-misc/tor/ChangeLog net-misc/tor/Manifest net-misc/tor/files/tor-0.2.1.19-logrotate.patch net-misc/tor/files/tor.conf net-misc/tor/files/tor.initd-r4 net-misc/tor/files/torrc net-misc/tor/files/torrc.sample-0.1.2.6.patch net-misc/tor/tor-0.2.1.29-r1.ebuild X-VCS-Directories: net-misc/tor/files/ net-misc/tor/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 0549374e344213f6f8d70c8c2fc6a1593d0b99a0 Date: Thu, 10 Feb 2011 00:02:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b85a5e51edb10a22451ba554437615fd commit: 0549374e344213f6f8d70c8c2fc6a1593d0b99a0 Author: Anthony G. Basile opensource dyc edu= > AuthorDate: Thu Feb 10 00:01:58 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Thu Feb 10 00:01:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3D0549374e net-misc/tor: moved to the tree (Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit) --- net-misc/tor/ChangeLog | 6 ++ net-misc/tor/Manifest | 9 +-- net-misc/tor/files/tor-0.2.1.19-logrotate.patch | 28 ------- net-misc/tor/files/tor.conf | 3 - net-misc/tor/files/tor.initd-r4 | 57 --------------- net-misc/tor/files/torrc | 5 -- net-misc/tor/files/torrc.sample-0.1.2.6.patch | 30 -------- net-misc/tor/tor-0.2.1.29-r1.ebuild | 87 -----------------= ------ 8 files changed, 7 insertions(+), 218 deletions(-) diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog index bbd1547..d1f2c38 100644 --- a/net-misc/tor/ChangeLog +++ b/net-misc/tor/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/0= 1/07 23:54:09 fauli Exp $ =20 + 10 Feb 2011; Anthony G. Basile + -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch= , + -tor-0.2.1.29-r1.ebuild, -files/tor.conf, -files/tor.initd-r4, + -files/torrc: + Moved to the tree. + 09 Feb 2011; Anthony G. Basile tor-0.2.1.29-r1.ebuild: Fixed pkg_postinst() message. diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index 5b1a9bb..07dc985 100644 --- a/net-misc/tor/Manifest +++ b/net-misc/tor/Manifest @@ -1,9 +1,2 @@ -AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16= feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb= 70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3 -AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2= a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a6= 45d67c660e2930a9dbadf010803b8fd095a0 -AUX tor.initd-r4 1566 RMD160 410611175c20425f48d340216ef680650bf6fa3d SH= A1 dbdfd68db76871be8606d1196c0c2a7ba257aac0 SHA256 095334e62ee28d3346f848= 31015dc9c45f7224d8a6f3588974de7b26352e2824 -AUX torrc 119 RMD160 3b7ec5a87893d371b2659bb49ac77cf3deff0f38 SHA1 c573f= 42578261ccc7b223261d5083cdff5afe095 SHA256 97a80a09bb3d615b93947f0d1a9c18= 83ef340860e89b879f2247d61b1c2476f0 -AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d= 437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8= c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1 -DIST tor-0.2.1.29.tar.gz 2521399 RMD160 2587fc9162852434a395ec796ebdcee1= 972d9aa9 SHA1 cd534b99c91070504f4e70008ab8940a816b5bc6 SHA256 070d314effd= 6c08f8b5a8a1ebb4f5c3af644d48a9e38e9cba34fd3f2e981ec64 -EBUILD tor-0.2.1.29-r1.ebuild 2671 RMD160 e6b289a66b855cea8b18a888f1190e= 6e1a65c1e1 SHA1 eb0943be1c443455d11685a8efdded1318df5fdb SHA256 57a8ba1af= ab0681ed948165720eaf4107b1c112c575aae3f4fd618bb0e6b3e4f -MISC ChangeLog 33771 RMD160 6ce73c54cdfad784f502116603dfe652ea4fb7a0 SHA= 1 4a3be85a0c3c413c66ea3000c4868105ccf7bcef SHA256 7a32da00c42f8325a017b81= 24b838678e630b0faf42ec9ce5c242b99c93d5c59 +MISC ChangeLog 34003 RMD160 2b3395100dba60c23e674a23f9ca9e99fc8fa765 SHA= 1 920c47031bdc31c0bb00a5cdb75cafb2285bffb1 SHA256 f60e358137bfd287748d04e= 9d9a1ea8aaa27b1191c01ae1699bfb9d465f3830d MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SH= A1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcd= b3d600d98eb58bae0d98c021dc6ff5ec774d77a142 diff --git a/net-misc/tor/files/tor-0.2.1.19-logrotate.patch b/net-misc/t= or/files/tor-0.2.1.19-logrotate.patch deleted file mode 100644 index 3eadcaa..0000000 --- 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 Gage= rn) -* Change user and group name from _tor to tor (#281439, Martin von Gager= n) -* 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/tor.conf b/net-misc/tor/files/tor.conf deleted file mode 100644 index 4e4c639..0000000 --- a/net-misc/tor/files/tor.conf +++ /dev/null @@ -1,3 +0,0 @@ -tor hard nofile 30000 -tor soft nofile 30000 - diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.ini= td-r4 deleted file mode 100644 index c95ef19..0000000 --- a/net-misc/tor/files/tor.initd-r4 +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.5= 2009/09/07 11:23:31 fauli Exp $ - -opts=3D"${opts} checkconfig reload" -PIDFILE=3D/var/run/tor/tor.pid -CONFFILE=3D/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 2>&1 - 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=3D/var/lib/tor - start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bi= n/tor -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/= null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping Tor" - start-stop-daemon --stop --pidfile "${PIDFILE}" --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/torrc b/net-misc/tor/files/torrc deleted file mode 100644 index 640fea1..0000000 --- a/net-misc/tor/files/torrc +++ /dev/null @@ -1,5 +0,0 @@ -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 7317552..0000000 --- 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 o= r - ## /Library/Tor/torrc -=20 -+## Default username and group the server will run as -+User tor -+Group tor -+ -+PIDFile /var/run/tor/tor.pid -=20 - ## 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 -=20 - ## 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 -=20 - ## 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.29-r1.ebuild b/net-misc/tor/tor-0.2.1= .29-r1.ebuild deleted file mode 100644 index c63644e..0000000 --- a/net-misc/tor/tor-0.2.1.29-r1.ebuild +++ /dev/null @@ -1,87 +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.29.ebuild,v 1.= 6 2011/01/24 21:12:49 armin76 Exp $ - -EAPI=3D2 - -inherit eutils - -DESCRIPTION=3D"Anonymizing overlay network for TCP" -HOMEPAGE=3D"http://www.torproject.org/" -MY_PV=3D${PV/_/-} -SRC_URI=3D"http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz" -S=3D"${WORKDIR}/${PN}-${MY_PV}" - -LICENSE=3D"BSD" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE=3D"debug" - -DEPEND=3D"dev-libs/openssl - >=3Ddev-libs/libevent-1.2" -# The tordns patch for tsocks avoids some leakage of information thus ra= ising anonymity -RDEPEND=3D"${DEPEND} - net-proxy/tsocks[tordns]" - -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 - # 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=3Ddetails&id=3D920 - # 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() { - econf $(use_enable debug) -} - -src_install() { - newinitd "${FILESDIR}"/tor.initd-r4 tor - emake DESTDIR=3D"${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 - - insinto /etc/tor/ - doins "${FILESDIR}"/torrc - - insinto /etc/logrotate.d - newins contrib/tor.logrotate tor - - # allow the tor user more open files to avoid errors, see bug 251171 - insinto /etc/security/limits.d/ - doins "${FILESDIR}"/tor.conf -} - -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 -}