aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorBrendan Fabeny <bf@FreeBSD.org>2013-06-20 04:37:30 +0000
committerBrendan Fabeny <bf@FreeBSD.org>2013-06-20 04:37:30 +0000
commit49fd91c13d4d7859b14706cc36e53856020ebcee (patch)
treecf64e83eea8724ebb17fb2d5c89e05ce3d25d6cd /security
parent72ba0aa5c6e0ea56fa3f32c812dab0e2a992310d (diff)
downloadports-49fd91c13d4d7859b14706cc36e53856020ebcee.tar.gz
ports-49fd91c13d4d7859b14706cc36e53856020ebcee.zip
Notes
Diffstat (limited to 'security')
-rw-r--r--security/tor-devel/Makefile3
-rw-r--r--security/tor-devel/distinfo4
-rw-r--r--security/tor-devel/files/patch-src__or__relay.c21
3 files changed, 3 insertions, 25 deletions
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index 169590aa8d29..6f84e0998b57 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tor
-DISTVERSION= 0.2.4.13-alpha
-PORTREVISION= 1
+DISTVERSION= 0.2.4.14-alpha
CATEGORIES= security net ipv6
MASTER_SITES= https://www.torproject.org/dist/ \
ftp://ftp.bit.nl/mirror/tor/ \
diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo
index 07b6d248c06e..5d9ed397278f 100644
--- a/security/tor-devel/distinfo
+++ b/security/tor-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tor-0.2.4.13-alpha.tar.gz) = a8bbdf91e37a7d1385565d805f3ac75182666c7d616580ef78d8350b0978c088
-SIZE (tor-0.2.4.13-alpha.tar.gz) = 2816561
+SHA256 (tor-0.2.4.14-alpha.tar.gz) = 2b32f87f1fa14032ebfcc56c4dce49cb5e4f6b5ba8e1bbacdedc8d25bd16f094
+SIZE (tor-0.2.4.14-alpha.tar.gz) = 2832944
diff --git a/security/tor-devel/files/patch-src__or__relay.c b/security/tor-devel/files/patch-src__or__relay.c
deleted file mode 100644
index 0d9dda4c4184..000000000000
--- a/security/tor-devel/files/patch-src__or__relay.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/or/relay.c.orig 2013-06-14 04:07:30.000000000 -0400
-+++ src/or/relay.c 2013-06-15 05:20:19.000000000 -0400
-@@ -2482,6 +2482,10 @@
- streams_blocked = circ->streams_blocked_on_p_chan;
- }
-
-+ /*
-+ * Disabling this for now because of a possible guard discovery attack
-+ */
-+#if 0
- /* Are we a middle circuit about to exceed ORCIRC_MAX_MIDDLE_CELLS? */
- if ((circ->n_chan != NULL) && CIRCUIT_IS_ORCIRC(circ)) {
- orcirc = TO_OR_CIRCUIT(circ);
-@@ -2505,6 +2509,7 @@
- }
- }
- }
-+#endif
-
- cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids);
-