Update tor to 0.0.9.3.

Pkgsrc changes:
- make this build under IRIX.
- tor has moved to tor.eff.org

Version changes since 0.0.9.2:

- Backport the cpu use fixes from main branch, so busy servers won't
  need as much processor time.
- Work better when we go offline and then come back, or when we
  run Tor at boot before the network is up. We do this by
  optimistically trying to fetch a new directory whenever an
  application request comes in and we think we're offline -- the
  human is hopefully a good measure of when the network is back.
- Backport some minimal hidserv bugfixes: keep rend circuits open as
  long as you keep using them; actually publish hidserv descriptors
  shortly after they change, rather than waiting 20-40 minutes.
- Enable Mac startup script by default.
- Fix duplicate dns_cancel_pending_resolve reported by Giorgos Pallas.
- When you update AllowUnverifiedNodes or FirewallPorts via the
  controller's setconf feature, we were always appending, never
  resetting.
- When you update HiddenServiceDir via setconf, it was screwing up
  the order of reading the lines, making it fail.
- Do not rewrite a cached directory back to the cache; otherwise we
  will think it is recent and not fetch a newer one on startup.
- Workaround for webservers that lie about Content-Encoding: Tor
  now tries to autodetect compressed directories and compression
  itself. This lets us Proxypass dir fetches through apache.

4 files changed, 43 insertions, 7 deletions

diff --git a/net/tor/Makefile b/net/tor/Makefile
index ddd391bab8d..54880677890 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2005/01/11 21:02:20 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/02/02 16:41:22 jschauma Exp $
 #
 
-DISTNAME=		tor-0.0.9.2
+DISTNAME=		tor-0.0.9.3
 CATEGORIES=		net security
-MASTER_SITES=		http://freehaven.net/tor/dist/
+MASTER_SITES=		http://tor.eff.org/dist/
 
 MAINTAINER=		jschauma@NetBSD.org
-HOMEPAGE=		http://freehaven.net/tor/dist/
+HOMEPAGE=		http://tor.eff.org
 COMMENT=		Anonymizing overlay network for TCP
 
 USE_BUILDLINK3=		yes
@@ -21,6 +21,12 @@ CONF_FILES+=		${PREFIX}/share/examples/tor/tor-tsocks.conf 	\
 CONF_FILES+=		${PREFIX}/share/examples/tor/torrc.sample 	\
 				${PKG_SYSCONFDIR}/tor/torrc
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(PKGSRC_COMPILER:Mmipspro)
+CFLAGS+=		-c99
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/or/tor ${PREFIX}/bin/tor
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/torify ${PREFIX}/bin/torify
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 43db04eb1fc..888a5028672 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/01/11 21:02:20 tv Exp $
+$NetBSD: distinfo,v 1.4 2005/02/02 16:41:22 jschauma Exp $
 
-SHA1 (tor-0.0.9.2.tar.gz) = 5b7e1f91eb7d1caa9e8f55314db04603046fd9d0
-Size (tor-0.0.9.2.tar.gz) = 539296 bytes
+SHA1 (tor-0.0.9.3.tar.gz) = 2aa29ba40bbaffb209588f636cf0650f8fbb58fa
+Size (tor-0.0.9.3.tar.gz) = 541810 bytes
+SHA1 (patch-aa) = 56638a359579d6ae8933f000f99202a2d2e63cef
+SHA1 (patch-ab) = 0ffc6fe4564fd4c164d2754f73a973c4d5e0008c
diff --git a/net/tor/patches/patch-aa b/net/tor/patches/patch-aa
new file mode 100644
index 00000000000..f125ec79d8d
--- /dev/null
+++ b/net/tor/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2005/02/02 16:41:22 jschauma Exp $
+
+--- src/common/compat.h.orig	Wed Feb  2 10:45:31 2005
++++ src/common/compat.h	Wed Feb  2 10:44:58 2005
+@@ -53,6 +53,10 @@
+ #define __FUNCTION__ "???"
+ #endif
+ 
++#if defined(__sgi) && !defined(__GNUC__) && defined(__c99)
++#define __FUNCTION__ __func__
++#endif
++
+ /* ===== String compatibility */
+ #ifdef MS_WINDOWS
+ /* Windows names string functions differently from most other platforms. */
diff --git a/net/tor/patches/patch-ab b/net/tor/patches/patch-ab
new file mode 100644
index 00000000000..5821ca4e96d
--- /dev/null
+++ b/net/tor/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/02/02 16:41:22 jschauma Exp $
+
+--- src/common/compat.c.orig	Wed Feb  2 10:50:05 2005
++++ src/common/compat.c	Wed Feb  2 11:15:38 2005
+@@ -583,6 +583,8 @@
+ 
+ #ifndef MS_WINDOWS
+ struct tor_mutex_t {
++  /* struct declarations without members lead to undefined behaviour */
++  int unused;
+ };
+ tor_mutex_t *tor_mutex_new(void) { return NULL; }
+ void tor_mutex_acquire(tor_mutex_t *m) { }