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 1RTvPL-0008O5-Hw for garchives@archives.gentoo.org; Fri, 25 Nov 2011 13:01:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40EF1E002D; Fri, 25 Nov 2011 13:01:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EFE54E002D for ; Fri, 25 Nov 2011 13:01:25 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64F441B4022 for ; Fri, 25 Nov 2011 13:01:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CE22780042 for ; Fri, 25 Nov 2011 13:01:24 +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: 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.2.24_alpha-respect-CFLAGS.patch net-misc/tor/files/tor.confd net-misc/tor/files/tor.initd-r6 net-misc/tor/files/torrc-r1 net-misc/tor/files/torrc.sample.patch net-misc/tor/metadata.xml net-misc/tor/tor-0.2.3.8_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: ce4fa3a917b8f7a8bf660b9cba286c75f67623db Date: Fri, 25 Nov 2011 13:01:24 +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: bec6d7c0-2eaa-42d3-ae5d-b5aa7faf1f87 X-Archives-Hash: 6d94a50a1afe68726317f914a9c1082f commit: ce4fa3a917b8f7a8bf660b9cba286c75f67623db Author: Anthony G. Basile gentoo org> AuthorDate: Fri Nov 25 13:01:19 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Nov 25 13:01:19 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3Dce4fa3a9 net-misc/tor: testing a link error (Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with= key 0xD0455535) --- net-misc/tor/ChangeLog | 10 +++ net-misc/tor/Manifest | 19 +++++ .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch | 24 ++++++ net-misc/tor/files/tor.confd | 3 + net-misc/tor/files/tor.initd-r6 | 58 ++++++++++++++ net-misc/tor/files/torrc-r1 | 7 ++ net-misc/tor/files/torrc.sample.patch | 30 +++++++ net-misc/tor/metadata.xml | 19 +++++ net-misc/tor/tor-0.2.3.8_alpha.ebuild | 84 ++++++++++++++= ++++++ 9 files changed, 254 insertions(+), 0 deletions(-) diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog new file mode 100644 index 0000000..26927a3 --- /dev/null +++ b/net-misc/tor/ChangeLog @@ -0,0 +1,10 @@ + + +*tor-0.2.3.8_alpha (25 Nov 2011) + + 25 Nov 2011; Anthony G. Basile + +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.3.8_alpha.ebu= ild, + +files/tor.confd, +files/tor.initd-r6, +files/torrc-r1, + +files/torrc.sample.patch, +metadata.xml: + testing because of link failure + diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest new file mode 100644 index 0000000..bb62441 --- /dev/null +++ b/net-misc/tor/Manifest @@ -0,0 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175= c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SH= A256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8 +AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9= a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf2= 7c3f289414afd237546d2974da1b75384c25c +AUX tor.initd-r6 1601 RMD160 f1ef0dd197f051a826e3785348a2a8cc490c04eb SH= A1 ee9f5116c3a69a7adb2be15ce14e3904261e84c4 SHA256 67d5bb618cfbc4d4c05e55= 89bfd2e24f6563c4e3c6ba1d6c472b285b4480e20d +AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52= e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74= b8eb9345f878ef4eb36edab34bbf649ef2738 +AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d4= 6a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475= c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14 +DIST tor-0.2.3.8-alpha.tar.gz 2909997 RMD160 eec1f3b549b1513d2c39791c79a= 18496d97a4809 SHA1 7ca5c1cfa5a1a3d1c923298a47fe2430495bedcc SHA256 b7c40f= 5f4fbd0a42b6863c29a69cc7b06d9e1cc9609f934a550f2019426d8dc4 +EBUILD tor-0.2.3.8_alpha.ebuild 2364 RMD160 ffb1a886a8f3afd50448da52899a= b29e4a3a8150 SHA1 010227d454fe0ff6691447ebbddf25fee097a9a4 SHA256 43cfd74= 70c48c1232556b1fcac24f029356643a66e930c7948bb45aacabab923 +MISC ChangeLog 305 RMD160 1946e00c0b3eba0f187616b56b2588f8982b0bd3 SHA1 = e6e7591a5ee45a288ac4f313942c5973506b77d0 SHA256 6c5edbd4f0db80cf5a3b06ea5= 33187f9df1596ff2d86774a61280d16a2ff476e +MISC metadata.xml 690 RMD160 1ae6238c81555b6b4bf2f11479e18a5acdb7b418 SH= A1 920cafba2dacb7a034e32f782467c96532465434 SHA256 117ed70261e343abf65a93= 351f6ba7a5bca941c183bf79168953a3efc5afb0b5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEAREIAAYFAk7PkZ8ACgkQl5yvQNBFVTVY8QCcC0Z4VgYfJA2CB4b2c3GEpv+Z +sewAnjC4Sp1NHnMKMZdAXta+bPkNcHkB +=3DSwca +-----END PGP SIGNATURE----- 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.confd b/net-misc/tor/files/tor.confd new file mode 100644 index 0000000..4195bf3 --- /dev/null +++ b/net-misc/tor/files/tor.confd @@ -0,0 +1,3 @@ +# +# Set the file limit +rc_ulimit=3D"-n 30000" diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.ini= td-r6 new file mode 100644 index 0000000..55204cc --- /dev/null +++ b/net-misc/tor/files/tor.initd-r6 @@ -0,0 +1,58 @@ +#!/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-r6,v 1.5= 2011/09/14 10:53:02 blueness Exp $ + +extra_commands=3D"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 + checkpath -d -m 0755 -o tor:tor /var/run/tor + 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 --signal HUP --pidfile ${PIDFILE} + eend $? +} diff --git a/net-misc/tor/files/torrc-r1 b/net-misc/tor/files/torrc-r1 new file mode 100644 index 0000000..322a794 --- /dev/null +++ b/net-misc/tor/files/torrc-r1 @@ -0,0 +1,7 @@ +# +# Minimal torrc so tor will work out of the box +# +User tor +PIDFile /var/run/tor/tor.pid +Log notice syslog +DataDirectory /var/lib/tor/data diff --git a/net-misc/tor/files/torrc.sample.patch b/net-misc/tor/files/t= orrc.sample.patch new file mode 100644 index 0000000..4a1592a --- /dev/null +++ b/net-misc/tor/files/torrc.sample.patch @@ -0,0 +1,30 @@ +diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src= /config/torrc.sample.in +--- tor-0.2.2.32.orig/src/config/torrc.sample.in 2011-08-29 23:13:09.000= 000000 -0400 ++++ tor-0.2.2.32/src/config/torrc.sample.in 2011-08-29 23:14:19.00000000= 0 -0400 +@@ -12,6 +12,10 @@ + ## Tor will look for this file in various places based on your platform= : + ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc +=20 ++## Default username and group the server will run as ++User tor ++ ++PIDFile /var/run/tor/tor.pid +=20 + ## Replace this with "SocksPort 0" if you plan to run Tor only as a + ## relay, and not make any local application connections yourself. +@@ -40,6 +44,7 @@ + #Log notice syslog + ## To send all messages to stderr: + #Log debug stderr ++Log notice syslog +=20 + ## Uncomment this to start the process in the background... or use + ## --runasdaemon 1 on the command line. This is ignored on Windows; +@@ -49,6 +54,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/metadata.xml b/net-misc/tor/metadata.xml new file mode 100644 index 0000000..9381df6 --- /dev/null +++ b/net-misc/tor/metadata.xml @@ -0,0 +1,19 @@ + + + + + blueness@gentoo.org + Anthony G. Basile + + + chiiph@gentoo.org + Tom=C3=A1s Touceda + + + Compile tor with hardening on vanilla com= pilers/linkers + Enable transparent proxying + Use Libevent's buffered IO + Enable NAT Port Mapping Protocol + Enable Universal Plug and Play + + diff --git a/net-misc/tor/tor-0.2.3.8_alpha.ebuild b/net-misc/tor/tor-0.2= .3.8_alpha.ebuild new file mode 100644 index 0000000..3d77e62 --- /dev/null +++ b/net-misc/tor/tor-0.2.3.8_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.3.7_alpha.ebuild= ,v 1.1 2011/10/31 10:16:33 blueness Exp $ + +EAPI=3D4 + +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"+bufferevents doc nat-pmp tor-hardening transparent-proxy thread= s upnp" + +DEPEND=3D"dev-libs/openssl + >=3Ddev-libs/libevent-2.0.14 + nat-pmp? ( net-libs/libnatpmp ) + upnp? (