summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2010-03-23 22:49:47 +0000
committerChristian Faulhammer <fauli@gentoo.org>2010-03-23 22:49:47 +0000
commit94de0da18f16b0ecc1268993b0aa3b3bbf62fb63 (patch)
tree30a37adaef73d12c989c957e18b99cde7454697a /net-misc/tor
parentversion bump (diff)
downloadhistorical-94de0da18f16b0ecc1268993b0aa3b3bbf62fb63.tar.gz
historical-94de0da18f16b0ecc1268993b0aa3b3bbf62fb63.tar.bz2
historical-94de0da18f16b0ecc1268993b0aa3b3bbf62fb63.zip
clean up
Package-Manager: portage-2.1.7.17/cvs/Linux i686
Diffstat (limited to 'net-misc/tor')
-rw-r--r--net-misc/tor/ChangeLog7
-rw-r--r--net-misc/tor/Manifest15
-rw-r--r--net-misc/tor/files/tor-0.2.1.19-openssl.patch93
-rw-r--r--net-misc/tor/tor-0.2.1.19-r2.ebuild79
-rw-r--r--net-misc/tor/tor-0.2.1.20-r1.ebuild79
-rw-r--r--net-misc/tor/tor-0.2.1.21.ebuild78
6 files changed, 10 insertions, 341 deletions
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 6c6156e99ba2..6d269def6d04 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/tor
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.197 2010/03/23 22:46:05 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.198 2010/03/23 22:49:47 fauli Exp $
+
+ 23 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
+ -tor-0.2.1.19-r2.ebuild, -files/tor-0.2.1.19-openssl.patch,
+ -tor-0.2.1.20-r1.ebuild, -tor-0.2.1.21.ebuild:
+ clean up
*tor-0.2.1.25 (23 Mar 2010)
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 6ccc6f7a6b77..96b903500fc6 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -2,26 +2,19 @@
Hash: SHA1
AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
-AUX tor-0.2.1.19-openssl.patch 3573 RMD160 be6a0d1186e433646b0286082b75d4dd4f4cf764 SHA1 879ecc0dbdf6e0deb72e865120b75eabddfc4933 SHA256 2ff2c5655fc2c454984aebc46b26aa35537db265bdeefd5d3f0f680f730729ce
AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-DIST tor-0.2.1.19.tar.gz 2409484 RMD160 3606cc574ade12adfa8f3c7a180958865be077e8 SHA1 8a8af1354ab5b3fea58e2bbffeddc05e3dfedb17 SHA256 cb4f88ad30d6ba4c015734f3058a6e35151cff586f7708691d52d289ee78d183
-DIST tor-0.2.1.20.tar.gz 2412059 RMD160 ae4a4ab22fa9eb5c011c652ddd13033407f48e5a SHA1 bfc6c7e9ccee23abc4e97ca4ba98aa3ad7784262 SHA256 0fa268ef7904dd4e4456525285d49ed3d3ac6fd6df4686de20d9077c05ae0f60
-DIST tor-0.2.1.21.tar.gz 2408983 RMD160 da240ad348acaf88d4b13a4f441523299feecd75 SHA1 51c3a093d14b992dd6330783b38b09f8684ac89e SHA256 7e05ccebb91cbf1fa226a6e77d21901d32dd3c0f59eb9eea5a87e559962a940d
DIST tor-0.2.1.22.tar.gz 2408280 RMD160 382829f8772a16fb94883b9a88e1f3e3ff0f16a6 SHA1 bf6114592570e0a0d0d8b23de991ecc03bfc6633 SHA256 c6f9340bcbae3a033bfac215ad9e6df80e4ee814a880b9755bddfa3a266f3e18
DIST tor-0.2.1.25.tar.gz 2406985 RMD160 e691b904e0d447b3f590f1e9e71b4daad020bd8d SHA1 11c176374be47825b4b7fa00b5654277d0838022 SHA256 8758b489ea5686fa09cdc50850116031178fa7429b63d3f37d74d588e9b6179e
-EBUILD tor-0.2.1.19-r2.ebuild 2438 RMD160 0671bf53f61281c85922ddaec76c3323fc14ad62 SHA1 8cb9398a93d227afa248c2675cfbbfb4339ed5de SHA256 e7abdfeb3fcfdf3617f4e53caa0d31fc898547097db963cbdaa381a2ee042550
-EBUILD tor-0.2.1.20-r1.ebuild 2461 RMD160 e21a870a04210a336e5943f5abf58afa31ca9343 SHA1 ff7311ba01776d076bac97df2d73913803660887 SHA256 8fd11448ffd1995d895b21a2d06420fb9693286909b201cf490ed309eb621464
-EBUILD tor-0.2.1.21.ebuild 2407 RMD160 2893f3510da24f0d2fd2c0c6bdb3a6eea3974691 SHA1 6a9676f2d4ce58cf0078a62c5343b925f6d4d132 SHA256 e27269ca47d256bf53a59e44442672e50526e4fea262dee7b33942dec2ebd685
EBUILD tor-0.2.1.22.ebuild 2403 RMD160 ce902a62a3c559aad4092c94a2dfe28ffee0ddb8 SHA1 e8df3d502f623da9e1741f5de68f9cd5166b1980 SHA256 8a58949661c334ed9657b8b90f5a314563fe148a259b159da474eb3305f3f058
EBUILD tor-0.2.1.25.ebuild 2407 RMD160 7fa74e2e2fa26a440e96452df05b41f40acaec61 SHA1 313a5a6cdfe3138a19642075aa936cbe15ad4a54 SHA256 02ce2a806e0ab21053d851e2a836114b4beeccc4e15c78aebda9ba7374208673
-MISC ChangeLog 29234 RMD160 b4794d0a615ff4682e7c4612f3b507ac13f9809d SHA1 c548240d5e1400e0764234e845a22c41ac5f9270 SHA256 71521681f14d27e385beb6b5f1da0bfac9710b2371a468ce4e0d5ef6c2b28f72
+MISC ChangeLog 29412 RMD160 7a59fb0efc670ad8b67a010f19c41fdda6bf187f SHA1 12bc840ee459e611dee183ac33402384315e6eee SHA256 7a931da13f006e643188da3094cf89603aa82a3e7665e1de164c07179118246a
MISC metadata.xml 337 RMD160 b52d36bd15113f023f57553c8861d2f3b83c4e30 SHA1 c50a51c903062f5b6ab7eafc567f03efc7e09c6d SHA256 0fedec8d7503c31d7bd78b32c29c8984b042761af32b7e36864b42451a7f32e7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkupRLMACgkQNQqtfCuFneOIOACghERMX/HxRtlhj0ZOE1ZGVYlJ
-vP8An37iIykTADdEQKjEpNLdI4t7nIXd
-=so1B
+iEYEARECAAYFAkupRZEACgkQNQqtfCuFnePCpwCffbwmlxPZbz7XEJzORLvgOcrA
+GtMAnRtOUPvDDCZ/tVf0s8WwihQvokgy
+=WOFs
-----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor-0.2.1.19-openssl.patch b/net-misc/tor/files/tor-0.2.1.19-openssl.patch
deleted file mode 100644
index 73ac476329ba..000000000000
--- a/net-misc/tor/files/tor-0.2.1.19-openssl.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/src/common/tortls.c b/src/common/tortls.c
-index c6b11e9..bcc6780 100644
---- a/src/common/tortls.c
-+++ b/src/common/tortls.c
-@@ -154,6 +154,7 @@ static X509* tor_tls_create_certificate(crypto_pk_env_t *rsa,
- const char *cname,
- const char *cname_sign,
- unsigned int lifetime);
-+static void tor_tls_unblock_renegotiation(tor_tls_t *tls);
-
- /** Global tls context. We keep it here because nobody else needs to
- * touch it. */
-@@ -904,6 +905,36 @@ tor_tls_set_renegotiate_callback(tor_tls_t *tls,
- #endif
- }
-
-+/** If this version of openssl requires it, turn on renegotiation on
-+ * <b>tls</b>. (Our protocol never requires this for security, but it's nice
-+ * to use belt-and-suspenders here.)
-+ */
-+static void
-+tor_tls_unblock_renegotiation(tor_tls_t *tls)
-+{
-+#ifdef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
-+ /* Yes, we know what we are doing here. No, we do not treat a renegotiation
-+ * as authenticating any earlier-received data. */
-+ tls->ssl->s3->flags |= SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
-+#else
-+ (void)tls;
-+#endif
-+}
-+
-+/** If this version of openssl supports it, turn off renegotiation on
-+ * <b>tls</b>. (Our protocol never requires this for security, but it's nice
-+ * to use belt-and-suspenders here.)
-+ */
-+void
-+tor_tls_block_renegotiation(tor_tls_t *tls)
-+{
-+#ifdef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
-+ tls->ssl->s3->flags &= ~SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
-+#else
-+ (void)tls;
-+#endif
-+}
-+
- /** Return whether this tls initiated the connect (client) or
- * received it (server). */
- int
-@@ -1026,6 +1057,9 @@ tor_tls_handshake(tor_tls_t *tls)
- } else {
- r = SSL_connect(tls->ssl);
- }
-+ /* We need to call this here and not earlier, since OpenSSL has a penchant
-+ * for clearing its flags when you say accept or connect. */
-+ tor_tls_unblock_renegotiation(tls);
- r = tor_tls_get_error(tls,r,0, "handshaking", LOG_INFO);
- if (ERR_peek_error() != 0) {
- tls_log_errors(tls, tls->isServer ? LOG_INFO : LOG_WARN,
-diff --git a/src/common/tortls.h b/src/common/tortls.h
-index d006909..871fec3 100644
---- a/src/common/tortls.h
-+++ b/src/common/tortls.h
-@@ -65,6 +65,7 @@ int tor_tls_read(tor_tls_t *tls, char *cp, size_t len);
- int tor_tls_write(tor_tls_t *tls, const char *cp, size_t n);
- int tor_tls_handshake(tor_tls_t *tls);
- int tor_tls_renegotiate(tor_tls_t *tls);
-+void tor_tls_block_renegotiation(tor_tls_t *tls);
- int tor_tls_shutdown(tor_tls_t *tls);
- int tor_tls_get_pending_bytes(tor_tls_t *tls);
- size_t tor_tls_get_forced_write_size(tor_tls_t *tls);
-diff --git a/src/or/connection_or.c b/src/or/connection_or.c
-index b4e8092..2a52b3f 100644
---- a/src/or/connection_or.c
-+++ b/src/or/connection_or.c
-@@ -844,6 +844,7 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn)
-
- /* Don't invoke this again. */
- tor_tls_set_renegotiate_callback(tls, NULL, NULL);
-+ tor_tls_block_renegotiation(tls);
-
- if (connection_tls_finish_handshake(conn) < 0) {
- /* XXXX_TLS double-check that it's ok to do this from inside read. */
-@@ -1087,6 +1088,7 @@ connection_tls_finish_handshake(or_connection_t *conn)
- connection_or_init_conn_from_address(conn, &conn->_base.addr,
- conn->_base.port, digest_rcvd, 0);
- }
-+ tor_tls_block_renegotiation(conn->tls);
- return connection_or_set_state_open(conn);
- } else {
- conn->_base.state = OR_CONN_STATE_OR_HANDSHAKING;
---
-1.5.6.5
diff --git a/net-misc/tor/tor-0.2.1.19-r2.ebuild b/net-misc/tor/tor-0.2.1.19-r2.ebuild
deleted file mode 100644
index 165207affffa..000000000000
--- a/net-misc/tor/tor-0.2.1.19-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 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.19-r2.ebuild,v 1.6 2009/12/26 20:32:04 armin76 Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
- >=dev-libs/libevent-1.2"
-RDEPEND="${DEPEND}
- net-proxy/tsocks"
-
-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}"/${P}-logrotate.patch
- epatch "${FILESDIR}"/${P}-openssl.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=details&id=920
- # 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="${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/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 "You must create /etc/tor/torrc, you can use the sample that is in that directory"
- elog "To have privoxy and tor working together you must add:"
- elog "forward-socks4a / localhost:9050 ."
- elog "(notice the . at the end of the line)"
- elog "to /etc/privoxy/config"
-}
diff --git a/net-misc/tor/tor-0.2.1.20-r1.ebuild b/net-misc/tor/tor-0.2.1.20-r1.ebuild
deleted file mode 100644
index cc9ebde653ad..000000000000
--- a/net-misc/tor/tor-0.2.1.20-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 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.20-r1.ebuild,v 1.1 2009/12/06 14:36:45 fauli Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
- >=dev-libs/libevent-1.2"
-RDEPEND="${DEPEND}
- net-proxy/tsocks"
-
-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
- epatch "${FILESDIR}"/${PN}-0.2.1.19-openssl.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=details&id=920
- # 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="${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/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 "You must create /etc/tor/torrc, you can use the sample that is in that directory"
- elog "To have privoxy and tor working together you must add:"
- elog "forward-socks4a / localhost:9050 ."
- elog "(notice the . at the end of the line)"
- elog "to /etc/privoxy/config"
-}
diff --git a/net-misc/tor/tor-0.2.1.21.ebuild b/net-misc/tor/tor-0.2.1.21.ebuild
deleted file mode 100644
index 9522568df974..000000000000
--- a/net-misc/tor/tor-0.2.1.21.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 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.21.ebuild,v 1.1 2010/01/16 11:14:46 fauli Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
- >=dev-libs/libevent-1.2"
-RDEPEND="${DEPEND}
- net-proxy/tsocks"
-
-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=details&id=920
- # 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="${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/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 "You must create /etc/tor/torrc, you can use the sample that is in that directory"
- elog "To have privoxy and tor working together you must add:"
- elog "forward-socks4a / localhost:9050 ."
- elog "(notice the . at the end of the line)"
- elog "to /etc/privoxy/config"
-}