STABLE RELEASE 1.1.7 :

* Fix crash in client more (regression from 1.1.6).
* Thread-safety fixes (with regards to sigaction and strerror).
* Incomplete ISATAP support removed.
  In the mean time, proper support was added within the Linux kernel.
* Fix server link-local address, compatibility with Vista clients.
* Fix SIGHUP signal handling.
* Fix compiling on MacOS X and/or without libJudy.
* Fix unlikely race condition in Teredo maintenance procedure setup.
* Fix Teredo address randomization (reachability problems).
* Better debug messages.
* Allow GNU General Public License version 3 (and would be later).
* Fix filtering error within miredo-server (regression from 1.1.0).
* Fix fatal padding mistake on old ABI ARM achitecture.
* Remove NAT type determination:
  Miredo now runs behind any type of NAT. However, connectivity might
  be severely degraded behind the worst devices, such as symmetric NATs.
* Add 12 bits of randomness to Teredo client address:
  Teredo addresses are less predictible, which should enhance host
  protection against network scanning.
* Remove brittle and battery-unfriendly "autoclient" mode:
  Proper default IPv6 source address selection (RFC3484) implementation
  would address most of the use cases for this, as well as other issues.
  If that is not sufficient, an external connection management system
  is anyway needed to start/stop Miredo when appropriate.
* Restore "cone" RelayType:
  All relays should use it, as it improves support for some kinds of
  (pretty broken but nevertheless deployed) NAT devices.
* Use a hook shell script for client interface configuration.
* Add a bunch of debug messages to debug builds.
* Rewrite clock subsystem to avoid polling when idle (battery savings).

5 files changed, 54 insertions, 17 deletions

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 167ed23e43f..33864c64272 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2007/12/21 12:43:09 obache Exp $
+# $NetBSD: Makefile,v 1.16 2010/05/14 06:18:48 pettai Exp $
 
-DISTNAME=	miredo-1.0.6
-PKGREVISION=	1
+DISTNAME=	miredo-1.1.7
 CATEGORIES=	net
-MASTER_SITES=	http://www.remlab.net/files/miredo/
+MASTER_SITES=	http://www.remlab.net/files/miredo/archive/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -13,6 +12,10 @@ COMMENT=	Teredo IPv6 tunneling
 NOT_FOR_PLATFORM=	Interix-*-* NetBSD-[0-3]*-* SunOS-*-*
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--enable-examplesdir=${EGDIR}
+CONFIGURE_ARGS+=	--disable-sample-conf
+
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
@@ -22,10 +25,8 @@ EGDIR=		${PREFIX}/share/examples/miredo
 CONF_FILES=	${EGDIR}/miredo.conf ${PKG_SYSCONFDIR}/miredo.conf
 CONF_FILES+=	${EGDIR}/miredo-server.conf \
 		${PKG_SYSCONFDIR}/miredo-server.conf
-CONF_FILES+=	${EGDIR}/isatapd.conf ${PKG_SYSCONFDIR}/isatapd.conf
-
-CONFIGURE_ARGS+=	--enable-examplesdir=${EGDIR} --disable-sample-conf
 
 .include "../../net/libpcap/buildlink3.mk"
+.include "../../devel/libjudy/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/miredo/PLIST b/net/miredo/PLIST
index 879f2d0897e..ac8c238355f 100644
--- a/net/miredo/PLIST
+++ b/net/miredo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:09:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/05/14 06:18:48 pettai Exp $
 bin/teredo-mire
 include/libteredo/teredo-udp.h
 include/libteredo/teredo.h
@@ -6,18 +6,16 @@ include/libteredo/tunnel.h
 include/libtun6/tun6.h
 lib/libteredo.la
 lib/libtun6.la
+lib/miredo/miredo-privproc
 man/man1/teredo-mire.1
-man/man5/isatapd.conf.5
 man/man5/miredo-server.conf.5
 man/man5/miredo.conf.5
-man/man8/isatapd.8
 man/man8/miredo-checkconf.8
 man/man8/miredo-server.8
 man/man8/miredo.8
-sbin/isatapd
 sbin/miredo
 sbin/miredo-checkconf
 sbin/miredo-server
-share/examples/miredo/isatapd.conf
 share/examples/miredo/miredo-server.conf
 share/examples/miredo/miredo.conf
+share/examples/rc.d/client-hook
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index 8889a2372ea..3f536be239d 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2007/01/03 19:21:01 rpaulo Exp $
+$NetBSD: distinfo,v 1.10 2010/05/14 06:18:48 pettai Exp $
 
-SHA1 (miredo-1.0.6.tar.bz2) = 74a7d4f42627f36a6dd9e9396db7d6321406002d
-RMD160 (miredo-1.0.6.tar.bz2) = dd09b59e7630afaaa37010f40623c4c9f18dc16e
-Size (miredo-1.0.6.tar.bz2) = 443812 bytes
+SHA1 (miredo-1.1.7.tar.bz2) = a1484c7b47f332b551ef946e064d116cb11af432
+RMD160 (miredo-1.1.7.tar.bz2) = e15aa09f03fe47a6da1cfc4a53c5cf69399fd013
+Size (miredo-1.1.7.tar.bz2) = 517231 bytes
 SHA1 (patch-ab) = b9b1ed3d47ebe992e3eb33dec46a7419273e7d3c
-SHA1 (patch-ac) = 583fdeb0bab04ba58178a628cf8125e8df79e835
+SHA1 (patch-ag) = 75223566133380122c8ea58c8509d2180fe778fd
+SHA1 (patch-ah) = 078cb0a78210aa6d77e8f1fa1d158b03bb9204bc
diff --git a/net/miredo/patches/patch-ag b/net/miredo/patches/patch-ag
new file mode 100644
index 00000000000..33b4d4b255d
--- /dev/null
+++ b/net/miredo/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2010/05/14 06:18:49 pettai Exp $
+
+--- libtun6/diag.c.orig	2010-05-11 21:04:33.000000000 +0200
++++ libtun6/diag.c	2010-05-11 21:10:22.000000000 +0200
+@@ -98,10 +98,10 @@
+ 			return -1;
+ 	}
+ #else
++	const char tundev[] = "/dev/tun0";
+ #if 1	/* BSD creates a tunnel even on stat() - skip diagnostics */
+ 	return 0;
+ #else
+-	const char tundev[] = "/dev/tun0";
+ 	struct stat st;
+ 
+ 	if (stat (tundev, &st) == 0)
diff --git a/net/miredo/patches/patch-ah b/net/miredo/patches/patch-ah
new file mode 100644
index 00000000000..0af5a0cb6e7
--- /dev/null
+++ b/net/miredo/patches/patch-ah
@@ -0,0 +1,21 @@
+$NetBSD: patch-ah,v 1.1 2010/05/14 06:18:49 pettai Exp $
+
+--- misc/Makefile.in.orig	2009-07-06 17:57:11.000000000 +0200
++++ misc/Makefile.in	2010-05-13 23:34:06.000000000 +0200
+@@ -265,13 +265,13 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-confSCRIPTS: $(conf_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
++	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)/../rc.d"
+ 	@list='$(conf_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+ 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	    echo " $(confSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
+-	    $(confSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
++	    echo " $(confSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(examplesdir)/../rc.d/$$f'"; \
++	    $(confSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(examplesdir)/../rc.d/$$f"; \
+ 	  else :; fi; \
+ 	done
+