Update do version 1.0.6 as requested by pkgsrc-security (hi!).

===========================================================================
STABLE RELEASE 1.0.6 : Major bug fixes

# Fix support for Teredo peers behind symmetric NATs (bug from 0.9.8).
  This could probably be used to spoof a Teredo clients.
# MacOS X compilation fix.

===========================================================================
STABLE RELEASE 1.0.5 : Major bug fixes

# Fix issues with timer and compiler optimizations (bug from 0.9.4).
# Increase ping test hop limit:
  Some IPv6 native nodes could not be reached otherwise.
# Increase HMAC secret size from 64 to 128 bits.
# Fix filtering of packets with link-local source address (bug from 0.4.0).
# Various fixes to the experimental ISATAP daemon.

============================================================================
STABLE RELEASE 1.0.4 : Major bug fix

# Fix packet storm with Teredo client behind symmetric NATs.

============================================================================
STABLE RELEASE 1.0.3 : Minor feature enhancement

# Work-around for compatibility with Microsoft Teredo servers.
# Better detection of symmetric NATs and access network changes.
# Limit spamming of syslog.

============================================================================
STABLE RELEASE 1.0.2 : Minor portability and bug fixes

# Several portability and minor/impossible bug fixes (see ChangeLog).

============================================================================
STABLE RELEASE 1.0.1 : Minor portability fixes

# Install configuration file samples into a dedicated directory.
# Build fixes (libteredo would not link on Mac OS X).

6 files changed, 23 insertions, 58 deletions

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 7aa3942a3a3..c4e02b957a5 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2006/08/23 22:59:09 rpaulo Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/03 19:21:01 rpaulo Exp $
 
-DISTNAME=	miredo-1.0.0
+DISTNAME=	miredo-1.0.6
 CATEGORIES=	net
 MASTER_SITES=	http://www.remlab.net/files/miredo/
 EXTRACT_SUFX=	.tar.bz2
@@ -21,6 +21,8 @@ CONF_FILES+=	${EGDIR}/miredo-server.conf-dist \
 		${PKG_SYSCONFDIR}/miredo-server.conf
 CONF_FILES+=	${EGDIR}/isatapd.conf-dist ${PKG_SYSCONFDIR}/isatapd.conf
 
+CONFIGURE_ARGS+=	--enable-examplesdir=${EGDIR} --disable-sample-conf
+
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/miredo/PLIST b/net/miredo/PLIST
index e9855a9e341..9603c76cfd8 100644
--- a/net/miredo/PLIST
+++ b/net/miredo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/08/15 20:54:44 rpaulo Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/01/03 19:21:01 rpaulo Exp $
 bin/teredo-mire
 sbin/miredo
 sbin/miredo-server
@@ -18,9 +18,9 @@ man/man8/miredo.8
 man/man8/isatapd.8
 lib/libteredo.la
 lib/libtun6.la
-share/examples/miredo/miredo.conf-dist
-share/examples/miredo/miredo-server.conf-dist
-share/examples/miredo/isatapd.conf-dist
+share/examples/miredo/miredo.conf
+share/examples/miredo/miredo-server.conf
+share/examples/miredo/isatapd.conf
 @dirrm include/libteredo
 @dirrm include/libtun6
 @dirrm share/examples/miredo
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index c43cebe00d0..8889a2372ea 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2006/08/23 22:59:09 rpaulo Exp $
+$NetBSD: distinfo,v 1.9 2007/01/03 19:21:01 rpaulo Exp $
 
-SHA1 (miredo-1.0.0.tar.bz2) = f7b6aa33d940532f6370ad041fb74da67f29e18f
-RMD160 (miredo-1.0.0.tar.bz2) = ea66a1416fc5f4031316a65f1b55e69cce44c7e6
-Size (miredo-1.0.0.tar.bz2) = 437269 bytes
-SHA1 (patch-aa) = 184c8dd8ca12ecdfcf56700aef25d46eccc16c53
-SHA1 (patch-ab) = 08e67c6fa8bebfca8d47ca2b9525bda2eefb518f
-SHA1 (patch-ac) = c591e9097cf143c9bc4bde3cb66b875755547cd1
+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 (patch-ab) = b9b1ed3d47ebe992e3eb33dec46a7419273e7d3c
+SHA1 (patch-ac) = 583fdeb0bab04ba58178a628cf8125e8df79e835
diff --git a/net/miredo/patches/patch-aa b/net/miredo/patches/patch-aa
deleted file mode 100644
index b7294e94402..00000000000
--- a/net/miredo/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/08/18 13:45:57 salo Exp $
-
---- Makefile.in.orig	2006-08-15 22:15:54.000000000 +0200
-+++ Makefile.in	2006-08-18 15:32:53.000000000 +0200
-@@ -237,6 +237,7 @@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-+examplesdir = @prefix@/share/examples/miredo
- target_alias = @target_alias@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = po doc compat libteredo libtun6 src
-@@ -347,12 +348,9 @@
- 	done
- install-nodist_sysconfDATA: $(nodist_sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
--	@list='$(nodist_sysconf_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(nodist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(nodist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(examplesdir)
-+	for p in $(nodist_sysconf_DATA); do \
-+	  $(BSD_INSTALL_DATA) $$p $(DESTDIR)$(examplesdir)/; \
- 	done
- 
- uninstall-nodist_sysconfDATA:
-@@ -703,7 +701,6 @@
- 
- install-data-am:
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-exec-am: install-dist_sysconfDATA install-nodist_sysconfDATA
- 
diff --git a/net/miredo/patches/patch-ab b/net/miredo/patches/patch-ab
index 99b4f32476f..bee09ee28c5 100644
--- a/net/miredo/patches/patch-ab
+++ b/net/miredo/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2006/08/15 20:54:44 rpaulo Exp $
+$NetBSD: patch-ab,v 1.6 2007/01/03 19:21:01 rpaulo Exp $
 
---- misc/miredo.conf.orig	2006-08-13 13:56:16.000000000 +0100
-+++ misc/miredo.conf	2006-08-13 13:56:21.000000000 +0100
-@@ -7,7 +7,7 @@
+--- misc/miredo.conf-in.old	2007-01-03 18:39:03.000000000 +0000
++++ misc/miredo.conf-in	2007-01-03 18:39:09.000000000 +0000
+@@ -9,7 +9,7 @@
  #RelayType client
  
  # Name of the network tunneling interface.
diff --git a/net/miredo/patches/patch-ac b/net/miredo/patches/patch-ac
index c8e4dbb548f..3ca872ec108 100644
--- a/net/miredo/patches/patch-ac
+++ b/net/miredo/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.4 2006/08/15 20:54:44 rpaulo Exp $
+$NetBSD: patch-ac,v 1.5 2007/01/03 19:21:01 rpaulo Exp $
 
---- misc/isatapd.conf.orig	2006-08-13 13:56:57.000000000 +0100
-+++ misc/isatapd.conf	2006-08-13 13:57:02.000000000 +0100
-@@ -8,7 +8,7 @@
- ServerAddress isatap
+--- misc/isatapd.conf-in.old	2007-01-03 18:38:52.000000000 +0000
++++ misc/isatapd.conf-in	2007-01-03 18:38:58.000000000 +0000
+@@ -10,7 +10,7 @@
+ ServerAddress	isatap
  
  # Name of the network tunneling interface.
 -InterfaceName	isatap