Removed automatic configuration of features
authorAnthony G. Basile <blueness@gentoo.org>
Thu, 21 Jul 2011 14:20:02 +0000 (14:20 +0000)
committerAnthony G. Basile <blueness@gentoo.org>
Thu, 21 Jul 2011 14:20:02 +0000 (14:20 +0000)
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

net-misc/tor/ChangeLog
net-misc/tor/Manifest
net-misc/tor/metadata.xml
net-misc/tor/tor-0.2.2.30_rc-r1.ebuild [new file with mode: 0644]
net-misc/tor/tor-0.2.3.2_alpha-r1.ebuild [new file with mode: 0644]

index 4a7c7f0f87fa3afbf5af2160cadcee6b97a7563c..954fa4096b2167c45e883e6ad0260776e4cc1dcd 100644 (file)
@@ -1,6 +1,13 @@
 # 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.261 2011/07/19 09:39:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.262 2011/07/21 14:20:02 blueness Exp $
+
+*tor-0.2.3.2_alpha-r1 (21 Jul 2011)
+*tor-0.2.2.30_rc-r1 (21 Jul 2011)
+
+  21 Jul 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml,
+  +tor-0.2.2.30_rc-r1.ebuild, +tor-0.2.3.2_alpha-r1.ebuild:
+  Removed automatic configuration of features
 
 *tor-0.2.2.30_rc (19 Jul 2011)
 
index b6f556082b31706f774375f3a1f347be8d0b2912..5621063bcaff268bd72f0d19b2be78c38f55e013 100644 (file)
@@ -14,14 +14,16 @@ DIST tor-0.2.2.30-rc.tar.gz 2672619 RMD160 7a363a07a9fa42e9e4b4c64637145e0082b0c
 DIST tor-0.2.3.2-alpha.tar.gz 2755750 RMD160 d34ac6b45360af873202a6884ce12ccf0420adee SHA1 020eb00aaaafa1e7102ae8fd95d3d6a719a61289 SHA256 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
 EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 bce113cab2f227bf7437adb2b9723425845eca3c SHA1 75b4f871d4936576c7645042a226b814f7be2c86 SHA256 53f7482a36cc6a8009f813cd4754756c224daaa787ed666eff2dc7be640caacc
 EBUILD tor-0.2.1.30.ebuild 2646 RMD160 507a8939e024a5c9829e4ad5b598945fb8f26014 SHA1 5b2246b1f1b7db206558157801fe58b72cf6165a SHA256 e3e386af1fb917b2da75f45e110176b4fc2cfc776df98fac45719f9827f028ff
+EBUILD tor-0.2.2.30_rc-r1.ebuild 2529 RMD160 d2b3f181132cb07622016499088e7d63ff6aea9d SHA1 246b32130e9391beae8792766d9920d3413ebff9 SHA256 f8f423a53cf84305c61a700000883d73fe4733ff3272be04abd515bfd17e0ecb
 EBUILD tor-0.2.2.30_rc.ebuild 2276 RMD160 08be078f18c4f56f49e9ca0a5d3a5f85b4033472 SHA1 3dddb58a8db41d3f37abeba15c5c7660549a54a8 SHA256 87df4451ab880514cc59b88a3f691a26642f59a4a28e801f17f583e3201e46ac
+EBUILD tor-0.2.3.2_alpha-r1.ebuild 2651 RMD160 f371c016cae47ed64969db444396672affc3abec SHA1 9366a367b71a76e2dcda9a0d3d3f184bac741bad SHA256 7584fef8de50ea575fded60fd2e51515ba26856a8f07f5dee3d69bc74871073b
 EBUILD tor-0.2.3.2_alpha.ebuild 2278 RMD160 6790cc3b919f2e4d4c6c6f43fce61717929b6e96 SHA1 66a741da725045da1b8e27eb4887d5c722a592fc SHA256 6006f37703315df65c12e339f1e8e758811766986b3b87325127d4f6e99ac6d6
-MISC ChangeLog 38214 RMD160 40388b812f4f13ad6905dd02b9b661add885b37c SHA1 fc98f3989e5665d6bce248e3bc101d48413847a3 SHA256 0fe04bcb8861c3e9c2534d70161ebcc03dace7623ef76c1743aa3016d1ac231e
-MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
+MISC ChangeLog 38461 RMD160 2f7c3a9f360687edca62961e2fde9370b2dbf32f SHA1 8b51b3d525f458d3289187254aa6c2825bd6dc6b SHA256 eac284daa09ff41232863f090efbc37943c0bc94003a76ff08d5f3217a60340b
+MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk4lUMwACgkQl5yvQNBFVTWRhACfc01WCB6K4jAh/f2ez2nXjg75
-D1sAmgMphBVSeU9i9yEhLQ6v2PNc/OXl
-=U6vH
+iEYEAREIAAYFAk4oNaAACgkQl5yvQNBFVTXApwCfQ3eDA5qJaykV7u6/JgvvJmMg
+B0cAn0QMk+lL1npwUIV7hAO0KC16cAKi
+=lYq3
 -----END PGP SIGNATURE-----
index a4e6b5de12e3f753fdd7c3d719599655f911b4ce..4d8f7a1000ccfaf0b050eb2bed74d8fec65d3050 100644 (file)
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-       <email>blueness@gentoo.org</email>
-       <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer>
-       <email>chiiph@gentoo.org</email>
-       <name>Tomás Touceda</name>
-  </maintainer>
+       <herd>no-herd</herd>
+       <maintainer>
+               <email>blueness@gentoo.org</email>
+               <name>Anthony G. Basile</name>
+       </maintainer>
+       <maintainer>
+               <email>chiiph@gentoo.org</email>
+               <name>Tomás Touceda</name>
+       </maintainer>
+       <use>
+               <flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
+               <flag name='transparent-proxy'>Enable transparent proxying</flag>
+               <flag name='bufferevents'>Use Libevent's buffered IO</flag>
+               <flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
+               <flag name='upnp'>Enable Universal Plug and Play</flag>
+       </use>
 </pkgmetadata>
diff --git a/net-misc/tor/tor-0.2.2.30_rc-r1.ebuild b/net-misc/tor/tor-0.2.2.30_rc-r1.ebuild
new file mode 100644 (file)
index 0000000..b47a47a
--- /dev/null
@@ -0,0 +1,86 @@
+# 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.30_rc-r1.ebuild,v 1.1 2011/07/21 14:20:02 blueness Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc tor-hardening +transparent-proxy threads"
+
+DEPEND="dev-libs/openssl
+       >=dev-libs/libevent-2.0"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${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=/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-r4 tor
+       emake DESTDIR="${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
+}
+
+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.2_alpha-r1.ebuild b/net-misc/tor/tor-0.2.3.2_alpha-r1.ebuild
new file mode 100644 (file)
index 0000000..5e5ba3a
--- /dev/null
@@ -0,0 +1,89 @@
+# 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.2_alpha-r1.ebuild,v 1.1 2011/07/21 14:20:02 blueness Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+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"
+
+DEPEND="dev-libs/openssl
+       >=dev-libs/libevent-2.0"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${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=/usr/share/doc/${PF}                             \
+               $(use_enable bufferevents)                                      \
+               $(use_enable doc asciidoc)                                      \
+               $(use_enable nat-pmp)                                           \
+               $(use_enable tor-hardening gcc-hardening)       \
+               $(use_enable tor-hardening linker-hardening)\
+               $(use_enable transparent-proxy transparent)     \
+               $(use_enable threads)                                           \
+               $(use_enable upnp)
+}
+
+src_install() {
+       newconfd "${FILESDIR}"/tor.confd tor
+       newinitd "${FILESDIR}"/tor.initd-r4 tor
+       emake DESTDIR="${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
+}
+
+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
+}