pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

update tor tor-dev to 0.2.7.4-rc



Module Name:	pkgsrc-wip
Committed By:	Christian Sturm <reezer%reezer.org@localhost>
Pushed By:	athaba
Date:		Sun Oct 25 17:57:36 2015 +0000
Changeset:	e470752860afd9ea3d2975c5e59f694ff8feb695

Modified Files:
	tor-dev/Makefile
	tor-dev/distinfo
Removed Files:
	tor-dev/patches/patch-aa

Log Message:
update tor tor-dev to 0.2.7.4-rc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e470752860afd9ea3d2975c5e59f694ff8feb695

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tor-dev/Makefile         |  4 ++--
 tor-dev/distinfo         |  8 ++++----
 tor-dev/patches/patch-aa | 42 ------------------------------------------
 3 files changed, 6 insertions(+), 48 deletions(-)

diffs:
diff --git a/tor-dev/Makefile b/tor-dev/Makefile
index 07f567f..72945ee 100644
--- a/tor-dev/Makefile
+++ b/tor-dev/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.53 2015/05/21 12:06:28 athaba Exp $
 
-DISTNAME=	tor-0.2.7.1-alpha
-PKGNAME=	${DISTNAME:S/-alpha//}
+DISTNAME=	tor-0.2.7.4-rc
+PKGNAME=	${DISTNAME:S/-rc//}
 CATEGORIES=	net security
 MASTER_SITES=	https://www.torproject.org/dist/
 
diff --git a/tor-dev/distinfo b/tor-dev/distinfo
index 01b78da..6e72d78 100644
--- a/tor-dev/distinfo
+++ b/tor-dev/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.40 2015/05/21 12:06:28 athaba Exp $
 
-SHA1 (tor-0.2.7.1-alpha.tar.gz) = 3dc6e132175526216e14e9761c0a508c1790de59
-RMD160 (tor-0.2.7.1-alpha.tar.gz) = dccb7170ce06370edad64f3207e5eed278daae94
-Size (tor-0.2.7.1-alpha.tar.gz) = 3603319 bytes
-SHA1 (patch-aa) = dee30061d2b04e61b121cbd20ae5bbe0ea0a3677
+SHA1 (tor-0.2.7.4-rc.tar.gz) = 4990b4d90dff2788f33a8cc9a98e6b722693e351
+RMD160 (tor-0.2.7.4-rc.tar.gz) = 0724f25971f3cbc45c40491eb4908e53e1ef1892
+SHA512 (tor-0.2.7.4-rc.tar.gz) = e637cad37d26f7ceec52e2f78ff53ff2d9e362cefe0796b91fc91c7e2b01652d0333be44e48497cb54650ece3f606b20a7201b806775e9349eef99a288420e59
+Size (tor-0.2.7.4-rc.tar.gz) = 4830972 bytes
diff --git a/tor-dev/patches/patch-aa b/tor-dev/patches/patch-aa
deleted file mode 100644
index c0f4b4e..0000000
--- a/tor-dev/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2014/11/29 14:13:48 athaba Exp $
-
-From: Taylor R Campbell
-Subject: patch for Tor to workaround OpenSSL renegotiation lossage on 5.1
-Cc: athaba (pkgsrc/net/tor maintainer)
-Date: Fri, 30 Jul 2010 01:31:50 +0000
-
-Here's a patch to make Tor work on NetBSD 5.1, which implemented
-OpenSSL 0.9.8l's ABI-incompatible SSL3_FLAGS method for reenabling TLS
-renegotiation.  Tor already jumps through a number of hoops to guess
-the right way to reenable renegotiation in OpenSSL, but it guesses
-wrong for the version of OpenSSL that comes with NetBSD 5.1, which,
-being 0.9.9-dev, looks newer than 0.9.8m.
-
-I'm posting this here rather than on a Tor list because I don't think
-it should be Tor's responsibility to work around back-ports and
-forward-ports of broken OpenSSL features.  What I'd really rather see
-is OpenSSL 0.9.8m's ABI-compatible SSL_OP method for reenabling TLS[*]
-put into NetBSD 5.1 (and SSL_OP_ALLOW_UNSAFE_RENEGOTIATION defined in
-ssl.h) so that this patch would be unnecessary.
-[2. text/plain; nbsd51-reneg]
-
---- src/common/tortls.c.orig	2014-11-29 13:13:35.000000000 +0000
-+++ src/common/tortls.c
-@@ -481,6 +481,17 @@ tor_tls_init(void)
-      * program should be allowed to use renegotiation unless it first passed
-      * a test of intelligence and determination.
-      */
-+#ifdef __NetBSD__
-+    /* In NetBSD 5.1, OpenSSL 0.9.9-dev was imported and `fixed' to use
-+       the same scheme as 0.9.8l.  */
-+    if (version == OPENSSL_V_NOPATCH(0,9,9)) {
-+      log_info(LD_GENERAL, "OpenSSL %s on NetBSD looks like version 0.9.8l; "
-+                 "I will try SSL3_FLAGS and SSL_OP to enable renegotation.",
-+                 SSLeay_version(SSLEAY_VERSION));
-+      use_unsafe_renegotiation_flag = 1;
-+      use_unsafe_renegotiation_op = 1;
-+    } else
-+#endif
-     if (version > OPENSSL_V(0,9,8,'k') && version <= OPENSSL_V(0,9,8,'l')) {
-       log_info(LD_GENERAL, "OpenSSL %s looks like version 0.9.8l, but "
-                  "some vendors have backported renegotiation code from "


Home | Main Index | Thread Index | Old Index