Added DEPEND on sec-policy/selinux-tor for selinux systems

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 100 insertions, 14 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index af231e61a3e4..844dd42d37c6 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.316 2012/01/24 13:06:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.317 2012/02/07 21:11:21 blueness Exp $
+
+*tor-0.2.2.35-r1 (07 Feb 2012)
+
+  07 Feb 2012; Anthony G. Basile <blueness@gentoo.org> tor-0.2.1.32.ebuild,
+  +tor-0.2.2.35-r1.ebuild, tor-0.2.3.11_alpha.ebuild:
+  Added DEPEND on sec-policy/selinux-tor for selinux systems
 
 *tor-0.2.3.11_alpha (24 Jan 2012)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 10e4c6b4e387..bcd94f76ade3 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -12,16 +12,17 @@ DIST tor-0.2.1.32.tar.gz 2592736 RMD160 1aebc22936e1ec13d18bf4ff19a51c6c1ffd4ec1
 DIST tor-0.2.2.35.tar.gz 2787536 RMD160 9986f0892d410de9f3d496a5db6de29288295e92 SHA1 98408e08c0c616c4c7669d018a66c55fc660cad3 SHA256 f141a41fffd31494a0f96ebbb6b999eab33ce62d5c31f81222a0acd034adbf3a
 DIST tor-0.2.3.10-alpha.tar.gz 2950344 RMD160 26fd5a9388fb90c923d1b885c85651d411e73371 SHA1 fcb9412c8e81540a643dc574f8266beaacf387a9 SHA256 d5634364b2ad9bbdacca45e30ae7cdc86153d714c128eedb36644c4d184cb032
 DIST tor-0.2.3.11-alpha.tar.gz 2979008 RMD160 669385496cef14775e7d1093dac65d7e02429fbd SHA1 a88819f8f4be434f453682a1e4a8910034bc5cbd SHA256 65a760d805ca672fb6a5bda71906759d7dcc1ac1d2f2336e4039c0460d334131
-EBUILD tor-0.2.1.32.ebuild 1824 RMD160 bf35dbca3099ec1657646f4d8eaa8053a2a31ca7 SHA1 b70f0a9cab8fa9318e555f2bd620d89e5ae725b2 SHA256 92096e0c90cf502e2c326b3e23b0108934886f0271924c15f080f83c6c4d00b8
+EBUILD tor-0.2.1.32.ebuild 1869 RMD160 7fc89d9ad42bd0d04de5be6dc9d532dcfa623cb9 SHA1 9a7287f5c0d771f109f114450b1b8ce0fa251637 SHA256 2c24e7be86cdd4c04b3195fb198f69033c33637f184199d1e38bb9466d8be92b
+EBUILD tor-0.2.2.35-r1.ebuild 2139 RMD160 735870c2a1a7460e3c5e1fe23efb6880ada7e551 SHA1 a978cd9012263b8a565964ee3d891d5416657090 SHA256 9dfbf19e896d1fbf082fee1ecdf2fc0077a1da6463b75c233146f5472ad0a194
 EBUILD tor-0.2.2.35.ebuild 2084 RMD160 320d0efbc050065e19f1e5f6538ae50bed45caec SHA1 45a7ee02a309f55edd46c346ec45ca8f90efdb3c SHA256 2048e4950cbf4c5e3a72bb0ba3838b48824ed8cb78073fd91e2ef210882625dc
 EBUILD tor-0.2.3.10_alpha.ebuild 2235 RMD160 c285bf6b77f26a07702b92cec2fa43f27bef8886 SHA1 3988a0a43376ae2225af616560cfba09f32ddc13 SHA256 4a1b65966109205874f569cd18886445bc9971552bc381d387b9e983f5ea22ca
-EBUILD tor-0.2.3.11_alpha.ebuild 2295 RMD160 74fa080e498c0c3d605323152879cf502e311e86 SHA1 9b7ae75715d952fdff2473ebd0100e842e7948d1 SHA256 5105fd1fd35f71a3942446b2696ead1c6cbd9b010c84de866f4e76b65eff91a7
-MISC ChangeLog 46731 RMD160 05aa7fa37803304ef8660e83ef81385f3130ab4a SHA1 409b2051bf6abdf6ef63aff0d856562590d376f4 SHA256 7ec5fbb121bced5656250e135229feb370175e8d05995067215b4ec37f317f0a
+EBUILD tor-0.2.3.11_alpha.ebuild 2340 RMD160 3d6484781ddd64d623bff047c53c9dd0ac565afd SHA1 1b1c6470d8091a1f148d6701dd9c00abafc11695 SHA256 2a8789aa7b4fd0ffe06276d310d0fedef784630451f9f376fe257ee95607606e
+MISC ChangeLog 46955 RMD160 c42b00047508a5bcb1e4c254f67e449fb4b8c6f8 SHA1 11fef0cc74acdb6e1434f26b9bef72025f51d181 SHA256 98e96d0d94e972fbf86cad15104cac4aa00fed7db5815c4efda589ce3651b703
 MISC metadata.xml 596 RMD160 2527172185bb74e5ea6167d56b2e3476c48eb078 SHA1 93be4ae496f77aa63bb77d720f51bf3510798daa SHA256 c7622b255363171fd1b351e14e592beb901d332f976a2e77c409e14ef5ed20bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8erPgACgkQl5yvQNBFVTWz6ACcDf+h4dwunmhB8BAzyvKVEV68
-HdUAn08kne8Cqvstuy7kRtJck7OlkdB2
-=N1/R
+iEYEAREIAAYFAk8xk4MACgkQl5yvQNBFVTWroQCdFxJY0wiW7TGdlCYikjF4kyFR
+am4AoJ0Q1v/KzgCIvweQJvygyIBTMKKz
+=QWkG
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.1.32.ebuild b/net-misc/tor/tor-0.2.1.32.ebuild
index eb1f9bb3b67c..53ca42c2b02a 100644
--- a/net-misc/tor/tor-0.2.1.32.ebuild
+++ b/net-misc/tor/tor-0.2.1.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.32.ebuild,v 1.2 2011/12/17 00:06:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.32.ebuild,v 1.3 2012/02/07 21:11:21 blueness Exp $
 
 EAPI=4
 
@@ -13,10 +13,11 @@ SRC_URI="http://www.torproject.org/dist/${PN}-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
+IUSE="debug selinux"
 
 DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0"
+	>=dev-libs/libevent-2.0
+	selinux? ( sec-policy/selinux-tor )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
diff --git a/net-misc/tor/tor-0.2.2.35-r1.ebuild b/net-misc/tor/tor-0.2.2.35-r1.ebuild
new file mode 100644
index 000000000000..2428570a51b6
--- /dev/null
+++ b/net-misc/tor/tor-0.2.2.35-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 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.35-r1.ebuild,v 1.1 2012/02/07 21:11:21 blueness Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc tor-hardening +transparent-proxy threads selinux"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0
+	selinux? ( sec-policy/selinux-tor )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample.patch
+
+	einfo "Regenerating autotools files ..."
+	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
+	eautoreconf
+}
+
+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=/usr/share/doc/${PF}				\
+		$(use_enable doc asciidoc)					\
+		$(use_enable tor-hardening gcc-hardening)	\
+		$(use_enable tor-hardening linker-hardening)\
+		$(use_enable transparent-proxy transparent)	\
+		$(use_enable threads)
+}
+
+src_install() {
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/README
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+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
+}
diff --git a/net-misc/tor/tor-0.2.3.11_alpha.ebuild b/net-misc/tor/tor-0.2.3.11_alpha.ebuild
index 4d81f6850f76..168a5bd8cc2c 100644
--- a/net-misc/tor/tor-0.2.3.11_alpha.ebuild
+++ b/net-misc/tor/tor-0.2.3.11_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.11_alpha.ebuild,v 1.1 2012/01/24 13:06:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.11_alpha.ebuild,v 1.2 2012/02/07 21:11:21 blueness Exp $
 
 EAPI="4"
 
@@ -16,12 +16,13 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
+IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp selinux"
 
 DEPEND="dev-libs/openssl
 	>=dev-libs/libevent-2.0.14
 	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( <net-libs/miniupnpc-1.6 )"
+	upnp? ( <net-libs/miniupnpc-1.6 )
+	selinux? ( sec-policy/selinux-tor )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {