summaryrefslogtreecommitdiff
path: root/net/tor
diff options
context:
space:
mode:
authorbjs <bjs@pkgsrc.org>2007-11-16 05:30:13 +0000
committerbjs <bjs@pkgsrc.org>2007-11-16 05:30:13 +0000
commit52b79906431c1874be958e5e982519456be74530 (patch)
treed8217ab502ed03aaae1df49a26a2b930e8033871 /net/tor
parentee8644b924f123774251df1e93e220feec629198 (diff)
downloadpkgsrc-52b79906431c1874be958e5e982519456be74530.tar.gz
Update to version 0.1.2.18. Changes since the last release:
o Major bugfixes (crashes): - If a connection is shut down abruptly because of something that happened inside connection_flushed_some(), do not call connection_finished_flushing(). Should fix bug 451: "connection_stop_writing: Assertion conn->write_event failed" Bugfix on 0.1.2.7-alpha. - Fix possible segfaults in functions called from rend_process_relay_cell(). o Major bugfixes (hidden services): - Hidden services were choosing introduction points uniquely by hexdigest, but when constructing the hidden service descriptor they merely wrote the (potentially ambiguous) nickname. - Clients now use the v2 intro format for hidden service connections: they specify their chosen rendezvous point by identity digest rather than by (potentially ambiguous) nickname. These changes could speed up hidden service connections dramatically. o Major bugfixes (other): - Stop publishing a new server descriptor just because we get a HUP signal. This led (in a roundabout way) to some servers getting dropped from the networkstatus lists for a few hours each day. - When looking for a circuit to cannibalize, consider family as well as identity. Fixes bug 438. Bugfix on 0.1.0.x (which introduced circuit cannibalization). - When a router wasn't listed in a new networkstatus, we were leaving the flags for that router alone -- meaning it remained Named, Running, etc -- even though absence from the networkstatus means that it shouldn't be considered to exist at all anymore. Now we clear all the flags for routers that fall out of the networkstatus consensus. Fixes bug 529. o Minor bugfixes: - Don't try to access (or alter) the state file when running --list-fingerprint or --verify-config or --hash-password. Resolves bug 499. - When generating information telling us how to extend to a given router, do not try to include the nickname if it is absent. Resolves bug 467. - Fix a user-triggerable segfault in expand_filename(). (There isn't a way to trigger this remotely.) - When sending a status event to the controller telling it that an OR address is readable, set the port correctly. (Previously we were reporting the dir port.) - Fix a minor memory leak whenever a controller sends the PROTOCOLINFO command. Bugfix on 0.1.2.17. - When loading bandwidth history, do not believe any information in the future. Fixes bug 434. - When loading entry guard information, do not believe any information in the future. - When we have our clock set far in the future and generate an onion key, then re-set our clock to be correct, we should not stop the onion key from getting rotated. - On some platforms, accept() can return a broken address. Detect this more quietly, and deal accordingly. Fixes bug 483. - It's not actually an error to find a non-pending entry in the DNS cache when canceling a pending resolve. Don't log unless stuff is fishy. Resolves bug 463. - Don't reset trusted dir server list when we set a configuration option. Patch from Robert Hogan.
Diffstat (limited to 'net/tor')
-rw-r--r--net/tor/Makefile12
-rw-r--r--net/tor/distinfo8
-rw-r--r--net/tor/options.mk23
3 files changed, 36 insertions, 7 deletions
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 63eedc6eea2..a8847e0e22f 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2007/10/25 14:58:29 obache Exp $
+# $NetBSD: Makefile,v 1.48 2007/11/16 05:30:13 bjs Exp $
#
-DISTNAME= tor-0.1.2.17
-PKGREVISION= 1
+DISTNAME= tor-0.1.2.18
CATEGORIES= net security
MASTER_SITES= http://tor.eff.org/dist/
@@ -63,7 +62,14 @@ post-install:
${PREFIX}/share/examples/tor/tor-tsocks.conf
BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1a
+
.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+
+## We include this after other b3.mk files since we use PTHREAD_TYPE.
+##
+.include "options.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 37879622878..3df1e15a305 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2007/09/11 15:53:57 obache Exp $
+$NetBSD: distinfo,v 1.26 2007/11/16 05:30:13 bjs Exp $
-SHA1 (tor-0.1.2.17.tar.gz) = 01092fb75c407b5c1d7f33db069cf7641973d94d
-RMD160 (tor-0.1.2.17.tar.gz) = 7ec316cdcc57ab5e817af1dcda913438b332f7e3
-Size (tor-0.1.2.17.tar.gz) = 1251636 bytes
+SHA1 (tor-0.1.2.18.tar.gz) = ff2160d30cfcb8cd7b735236dcb641b4bcb3fbeb
+RMD160 (tor-0.1.2.18.tar.gz) = e0ccd51288f7b41b5c4a21e49ce712066ce66a58
+Size (tor-0.1.2.18.tar.gz) = 1257011 bytes
SHA1 (patch-ac) = adcc070e4d522143c4d882bd13436cd2b71f289b
SHA1 (patch-ad) = 72a68cbd00a5febdff82ba9268bdad2b47ea8159
SHA1 (patch-ae) = 82977c38f18942de883a17d285ad9addd95e02f7
diff --git a/net/tor/options.mk b/net/tor/options.mk
new file mode 100644
index 00000000000..85bac1c8ab8
--- /dev/null
+++ b/net/tor/options.mk
@@ -0,0 +1,23 @@
+PKG_OPTIONS_VAR= PKG_OPTIONS.tor
+PKG_SUPPORTED_OPTIONS= threads
+
+.if !empty(PTHREAD_TYPE:Mnative)
+PKG_SUGGESTED_OPTIONS+= threads
+.endif
+.include "../../mk/bsd.options.mk"
+
+
+###
+### This enables new code for threaded operation on NetBSD, OpenBSD, etc.
+### I used {PTHREAD,RESOLV}_AUTO_VARS here for consistency's sake, as
+### I don't trust configure scripts to do this properly on all platforms.
+###
+.if !empty(PKG_OPTIONS:Mthreads)
+CONFIGURE_ARGS+= --enable-eventdns
+CONFIGURE_ARGS+= --enable-threads
+PTHREAD_OPTS+= require
+PTHREAD_AUTO_VARS= yes
+USE_FEATURES.openssl+= threads
+.else
+CONFIGURE_ARGS+= --disable-threads
+.endif