summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/tor/Makefile5
-rw-r--r--net/tor/distinfo11
-rw-r--r--net/tor/patches/patch-src_common_compat__pthreads.c22
3 files changed, 7 insertions, 31 deletions
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 9e61e3cfd3c..fa62ff361b7 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2016/03/05 11:29:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.110 2016/08/19 13:35:42 wiz Exp $
-DISTNAME= tor-0.2.7.6
-PKGREVISION= 1
+DISTNAME= tor-0.2.8.6
CATEGORIES= net security
MASTER_SITES= http://www.torproject.org/dist/
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 367e4ad4cb4..3cbd5ebbfc2 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.70 2015/12/13 21:24:01 wiz Exp $
+$NetBSD: distinfo,v 1.71 2016/08/19 13:35:42 wiz Exp $
-SHA1 (tor-0.2.7.6.tar.gz) = 1fe65414312d9e1d973e5b2f425cf3a639025d41
-RMD160 (tor-0.2.7.6.tar.gz) = a1da04a6c5f72e23cf17a81815b81bed97ce0d9b
-SHA512 (tor-0.2.7.6.tar.gz) = 9b0dbfabe6cd05189b179da24bfaa73b89ab237775e3b5b0ebc0a22ee98909e9b13e55841a466f04000e0ff876c15f76515ff46abca28d05eeddbdc52f183afc
-Size (tor-0.2.7.6.tar.gz) = 4869754 bytes
-SHA1 (patch-src_common_compat__pthreads.c) = 6c1be2f8e66e3796272eaad2d8a37ada6aa5e6ff
+SHA1 (tor-0.2.8.6.tar.gz) = 4b1fa511f40fc8ddb1709aaccb7197e0771a4b61
+RMD160 (tor-0.2.8.6.tar.gz) = 2486f6fde617b8bd77cdecd3683d00affb5c9891
+SHA512 (tor-0.2.8.6.tar.gz) = 2a550fa82135b3d5b0ae3c9e11d0fee1053a6b70e1dfd1921934bce280dc2a130966d541783f5f1a2d9f3c1ba87cec301d0d29acd9fbeaf47c0f206447d1bedc
+Size (tor-0.2.8.6.tar.gz) = 5163500 bytes
diff --git a/net/tor/patches/patch-src_common_compat__pthreads.c b/net/tor/patches/patch-src_common_compat__pthreads.c
deleted file mode 100644
index 1be6b88d0c9..00000000000
--- a/net/tor/patches/patch-src_common_compat__pthreads.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_common_compat__pthreads.c,v 1.1 2015/12/11 12:13:00 wiz Exp $
-
-Disable a function that is not there on NetBSD before 7.
-https://trac.torproject.org/projects/tor/ticket/17819
-
---- src/common/compat_pthreads.c.orig 2015-11-13 13:33:25.000000000 +0000
-+++ src/common/compat_pthreads.c
-@@ -186,12 +186,14 @@ tor_cond_init(tor_cond_t *cond)
- }
-
- #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
-+#if !defined(__NetBSD__) || (defined(__NetBSD__) && __NetBSD_Version__ > 699999999)
- /* Use monotonic time so when we timedwait() on it, any clock adjustment
- * won't affect the timeout value. */
- if (pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC)) {
- return -1;
- }
- #endif
-+#endif
- if (pthread_cond_init(&cond->cond, &condattr)) {
- return -1;
- }