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 1QInC6-0001SR-PZ for garchives@archives.gentoo.org; Sat, 07 May 2011 19:29:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D73B71C009; Sat, 7 May 2011 19:29:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 756541C009 for ; Sat, 7 May 2011 19:29:31 +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 E004F1B404E for ; Sat, 7 May 2011 19:29:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0C08680504 for ; Sat, 7 May 2011 19:29:30 +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: <1094c6ee41bc70b41a64ca79ddf5d49e6ee19e16.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-0.2.2.24_alpha-respect-CFLAGS.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.3.1_alpha.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: 1094c6ee41bc70b41a64ca79ddf5d49e6ee19e16 Date: Sat, 7 May 2011 19:29:30 +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: da55c24b3ac646d4058bf900c774c132 commit: 1094c6ee41bc70b41a64ca79ddf5d49e6ee19e16 Author: Anthony G. Basile gentoo org> AuthorDate: Sat May 7 19:29:23 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat May 7 19:29:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3D1094c6ee net-misc/tor: bump alpha to 0.2.3.1 --- net-misc/tor/ChangeLog | 154 ++++++++++++++= ------ net-misc/tor/Manifest | 20 +-- net-misc/tor/files/tor-0.2.1.19-logrotate.patch | 28 ++++ .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch | 24 +++ net-misc/tor/files/tor.conf | 3 + net-misc/tor/files/tor.initd-r4 | 57 +++++++ net-misc/tor/files/torrc | 8 + net-misc/tor/files/torrc.sample-0.1.2.6.patch | 30 ++++ net-misc/tor/tor-0.2.3.1_alpha.ebuild | 84 +++++++++++ 9 files changed, 353 insertions(+), 55 deletions(-) diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog index 7cf4914..4f37d99 100644 --- a/net-misc/tor/ChangeLog +++ b/net-misc/tor/ChangeLog @@ -1,75 +1,141 @@ # 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.225 2011/0= 1/07 23:54:09 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.253 2011/0= 4/29 20:15:56 blueness Exp $ + +*tor-0.2.3.1_alpha (07 May 2011) + + 07 May 2011; Anthony G. Basile + +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch= , + +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.3.1_alpha.ebu= ild, + +files/tor.conf, +files/tor.initd-r4, +files/torrc: + Bump alpha + + 29 Apr 2011; Anthony G. Basile + -tor-0.2.2.23_alpha.ebuild, -tor-0.2.2.23_alpha-r1.ebuild, + -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch: + Removed deprecated alpha + +*tor-0.2.2.25_alpha (29 Apr 2011) + + 29 Apr 2011; Anthony G. Basile + +tor-0.2.2.25_alpha.ebuild: + Version bump =20 *tor-0.2.2.24_alpha (18 Apr 2011) =20 18 Apr 2011; Anthony G. Basile - +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch= , - +files/tor-0.2.1.30-respect-CFLAGS.patch, +tor-0.2.2.24_alpha.ebuild, - +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +files/CVS/Entries, - +files/CVS/Repository, +files/CVS/Root, +files/tor.conf, - +files/tor.initd-r4, +files/torrc: + +tor-0.2.2.24_alpha.ebuild, + +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch: Version bump =20 +*tor-0.2.1.30-r1 (10 Apr 2011) + 10 Apr 2011; Anthony G. Basile - -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch= , - -tor-0.2.1.30-r1.ebuild, -files/tor-0.2.1.30-respect-CFLAGS.patch, - -files/tor-0.2.2.23_alpha-respect-CFLAGS.patch, -files/tor.conf, - -files/tor.initd-r4, -files/torrc: - moved to tree + +tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch, + files/torrc: + Backport of improved build system, see bug #360765 + + 02 Apr 2011; Anthony G. Basile -tor-0.2.1.29.ebu= ild, + -tor-0.2.1.29-r1.ebuild: + Removed vulnerable versions, bug #359789 =20 - 09 Apr 2011; Anthony G. Basile - tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch: - backport of tor-0.2.2.23_alpha-respect-CFLAGS.patch + 02 Apr 2011; Ra=C3=BAl Porcel tor-0.2.1.30.ebuild= : + arm/sparc stable wrt #359789 + + 28 Mar 2011; Anthony G. Basile + files/tor-0.2.2.23_alpha-respect-CFLAGS.patch: + Improved fix to build system, see bug #360765 =20 *tor-0.2.2.23_alpha-r1 (25 Mar 2011) =20 25 Mar 2011; Anthony G. Basile - +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch= , +tor-0.2.2.23_alpha-r1.ebuild, - +files/tor-0.2.2.23_alpha-respect-CFLAGS.patch, +files/tor.conf, - +files/tor.initd-r4, +files/torrc: - Added patch against configure.in to completely respect CFLAGS + +files/tor-0.2.2.23_alpha-respect-CFLAGS.patch: + Fixed build system to fully respect CFLAGS =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. + 25 Mar 2011; Anthony G. Basile + tor-0.2.2.23_alpha.ebuild: + Removed superfluous USE flag =20 - 09 Feb 2011; Anthony G. Basile - tor-0.2.1.29-r1.ebuild: - Fixed pkg_postinst() message. + 25 Mar 2011; Anthony G. Basile + -tor-0.2.2.22_alpha-r1.ebuild: + Removed outdated alpha + + 22 Mar 2011; Thomas Kahle tor-0.2.1.30.ebuild: + x86 stable per bug 359789 + + 21 Mar 2011; Christoph Mende tor-0.2.1.30.ebuild: + Stable on amd64 wrt bug #359789 + + 21 Mar 2011; Kacper Kowalik tor-0.2.1.30.ebuil= d: + ppc/ppc64 stable wrt #359789 + +*tor-0.2.2.23_alpha (11 Mar 2011) + + 11 Mar 2011; Anthony G. Basile + +tor-0.2.2.23_alpha.ebuild: + Version bump on alpha and removal of deprecated vesion. + + 27 Feb 2011; Anthony G. Basile +tor-0.2.1.29.ebu= ild: + Reverted removal of only stable ebuild on most arches. + +*tor-0.2.1.30 (27 Feb 2011) + + 27 Feb 2011; Tomas Touceda -tor-0.2.1.29.ebuild, + +tor-0.2.1.30.ebuild: + Version bump and clean up. + + 12 Feb 2011; Ra=C3=BAl Porcel tor-0.2.1.29-r1.ebu= ild: + sparc stable wrt #351920 + +*tor-0.2.2.22_alpha-r1 (10 Feb 2011) + + 10 Feb 2011; Anthony G. Basile + -tor-0.2.2.22_alpha.ebuild, +tor-0.2.2.22_alpha-r1.ebuild: + Added /etc/tor/torrc for alpha. =20 *tor-0.2.1.29-r1 (09 Feb 2011) =20 09 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: - Added /etc/torrc so that tor starts out of the box. - See: http://bugs.sabayon.org/show_bug.cgi?id=3D2135 + +tor-0.2.1.29-r1.ebuild, +files/torrc: + Added /etc/tor/torrc so tor works out of the box. =20 - 17 Jan 2011; Anthony G. Basile - -files/torrc.sample-0.1.2.6.patch, -files/tor-0.2.1.19-logrotate.patch= , - -tor-0.2.2.21_alpha.ebuild, -files/tor.conf, -files/tor.initd-r4: - net-mis/tor: in the tree +*tor-0.2.2.22_alpha (01 Feb 2011) + + 01 Feb 2011; Tomas Touceda -tor-0.2.2.21_alpha.ebu= ild, + +tor-0.2.2.22_alpha.ebuild: + Version bump on alpha and cleanup. + + 24 Jan 2011; Anthony G. Basile -tor-0.2.1.28.ebu= ild: + Removed vulnerable version, see bug #351920 + + 24 Jan 2011; Ra=C3=BAl Porcel tor-0.2.1.29.ebuild= : + sparc stable + + 23 Jan 2011; Markus Meier tor-0.2.1.29.ebuild: + arm stable, bug #351920 + + 18 Jan 2011; Christian Faulhammer tor-0.2.1.29.ebui= ld: + stable x86, security bug 351920 + + 17 Jan 2011; Markos Chandras tor-0.2.1.29.ebuild= : + Stable on amd64 wrt bug #351920 + + 17 Jan 2011; tor-0.2.1.29.ebuild: + ppc/ppc64 stable wrt #351920 =20 *tor-0.2.2.21_alpha (17 Jan 2011) +*tor-0.2.1.29 (17 Jan 2011) =20 - 17 Jan 2011; Anthony G. Basile - +files/torrc.sample-0.1.2.6.patch, +files/tor-0.2.1.19-logrotate.patch= , - +tor-0.2.2.21_alpha.ebuild, +files/tor.conf, +files/tor.initd-r4: - version bump for alpha, address remote exploit via heap overflow + 17 Jan 2011; Tomas Touceda +tor-0.2.1.29.ebuild, + -tor-0.2.2.20_alpha.ebuild, +tor-0.2.2.21_alpha.ebuild: + Versiom bump. Clean old alpha. =20 - 10 Jan 2011; Anthony G. Basile - -tor-0.2.2.20_alpha.ebuild: - net-misc/tor: moved to tree +*tor-0.2.2.20_alpha (10 Jan 2011) =20 10 Jan 2011; Anthony G. Basile - tor-0.2.2.20_alpha.ebuild: - net-misc/tor: updated DEPEND to depend on masked >=3Ddev-libs/libevent= -2.0 + +tor-0.2.2.20_alpha.ebuild: + added alpha branch =20 07 Jan 2011; Christian Faulhammer -tor-0.2.1.25.ebu= ild, -tor-0.2.1.26.ebuild, -tor-0.2.1.27.ebuild: diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index 4037652..733bdbd 100644 --- a/net-misc/tor/Manifest +++ b/net-misc/tor/Manifest @@ -1,12 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -MISC ChangeLog 35287 RMD160 cdfd38e07bc0ca7c719e9ea74866af3a21bf3cb4 SHA= 1 34ad96236fc11b6a538891eebf2e1f7a01adaac0 SHA256 7f7e8ba8341bf46a401ef4b= a51dffeaaae586397b233e47a4e4fc425b392195c +AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16= feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb= 70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3 +AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175= c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SH= A256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8 +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 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061= 474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b= 4bf79bb6324a4c7ab86eeb81cdaec86a97 +AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d= 437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8= c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1 +DIST tor-0.2.3.1-alpha.tar.gz 2686119 RMD160 9f6f69db3541395bb34d3f4b3db= 30577a4cd5f6e SHA1 577d34efa66e5f6ba72d010b38fb48ff5b9796e3 SHA256 8906e8= 0068952a4d3d9f65dfea2f4b0fd76b6b301fd1e62adac6c1b3bebe360e +EBUILD tor-0.2.3.1_alpha.ebuild 2375 RMD160 53f8494ce98a86e56638d152ceee= ac4185a6c1f0 SHA1 d56bf448cfea86d44f90875308795cf40c58c693 SHA256 4351c3c= fcd94fb1919b399d20854a895cfb3792706fecdeff2d1e0c1c0b86c9c +MISC ChangeLog 36826 RMD160 820857019bfb7be1ffa5254582a02048f5338c61 SHA= 1 023e041327fe5224f0a597b6a43e86085f34c166 SHA256 15bcef1e5b066aecb8fe2df= 650ba55a675371e00063557f5ba437715411748f6 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SH= A1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcd= b3d600d98eb58bae0d98c021dc6ff5ec774d77a142 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEAREIAAYFAk2sIXEACgkQl5yvQNBFVTUL3gCdHvVl1G05wzIzCSMgdrmr06oE -HWsAniaTIpTP9LEosqw6jXUrLwVmBVdS -=3DlL1b ------END PGP SIGNATURE----- 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 new file mode 100644 index 0000000..3eadcaa --- /dev/null +++ b/net-misc/tor/files/tor-0.2.1.19-logrotate.patch @@ -0,0 +1,28 @@ +* 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-0.2.2.24_alpha-respect-CFLAGS.patch b= /net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch new file mode 100644 index 0000000..86b797b --- /dev/null +++ b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch @@ -0,0 +1,24 @@ +diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/confi= gure.in +--- tor-0.2.2.24-alpha.orig/configure.in 2011-04-08 16:32:17.000000000 -= 0400 ++++ tor-0.2.2.24-alpha/configure.in 2011-04-18 07:10:57.000000000 -0400 +@@ -9,6 +9,11 @@ +=20 + AC_CANONICAL_HOST +=20 ++GENTOO_CFLAGS=3D"$CFLAGS" ++GENTOO_LDFLAGS=3D"$LDFLAGS" ++CFLAGS=3D ++LDFLAGS=3D ++ + if test -f /etc/redhat-release ; then + if test -f /usr/kerberos/include ; then + CPPFLAGS=3D"$CPPFLAGS -I/usr/kerberos/include" +@@ -971,6 +976,8 @@ +=20 +=20 + CPPFLAGS=3D"$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR= _CPPFLAGS_zlib" ++CFLAGS=3D"$CFLAGS $GENTOO_CFLAGS" ++LDFLAGS=3D"$LDFLAGS $GENTOO_LDFLAGS" +=20 + AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torc= tl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc= .sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile= src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile = contrib/suse/Makefile contrib/suse/tor.sh]) + AC_OUTPUT diff --git a/net-misc/tor/files/tor.conf b/net-misc/tor/files/tor.conf new file mode 100644 index 0000000..4e4c639 --- /dev/null +++ b/net-misc/tor/files/tor.conf @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..c95ef19 --- /dev/null +++ b/net-misc/tor/files/tor.initd-r4 @@ -0,0 +1,57 @@ +#!/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 new file mode 100644 index 0000000..dc2dea3 --- /dev/null +++ b/net-misc/tor/files/torrc @@ -0,0 +1,8 @@ +# +# 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 new file mode 100644 index 0000000..7317552 --- /dev/null +++ b/net-misc/tor/files/torrc.sample-0.1.2.6.patch @@ -0,0 +1,30 @@ +--- 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.3.1_alpha.ebuild b/net-misc/tor/tor-0.2= .3.1_alpha.ebuild new file mode 100644 index 0000000..77b7ee7 --- /dev/null +++ b/net-misc/tor/tor-0.2.3.1_alpha.ebuild @@ -0,0 +1,84 @@ +# 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.2.25_alpha.ebuil= d,v 1.1 2011/04/29 20:11:45 blueness Exp $ + +EAPI=3D3 + +inherit autotools eutils flag-o-matic versionator + +MY_PV=3D"$(replace_version_separator 4 -)" +MY_PF=3D"${PN}-${MY_PV}" +DESCRIPTION=3D"Anonymizing overlay network for TCP" +HOMEPAGE=3D"http://www.torproject.org/" +SRC_URI=3D"http://www.torproject.org/dist/${MY_PF}.tar.gz" +S=3D"${WORKDIR}/${MY_PF}" + +LICENSE=3D"BSD" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE=3D"" + +DEPEND=3D"dev-libs/openssl + >=3Ddev-libs/libevent-2.0" +# 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 + + einfo "Regenerating autotools files ..." + epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch + eautoreconf || die "eautoreconf failed" +} + +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 --docdir=3D/usr/share/doc/${PF} +} + +src_install() { + newinitd "${FILESDIR}"/tor.initd-r4 tor + emake DESTDIR=3D"${D}" install || die + keepdir /var/{lib,log,run}/tor + + dodoc README ChangeLog ReleaseNotes \ + doc/{HACKING,TODO} \ + doc/spec/README + + 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 +}