Pullup ticket 1793 - requested by rpaulo

security update for miredo

Revisions pulled up:
- pkgsrc/net/miredo/Makefile			1.9, 1.10
- pkgsrc/net/miredo/PLIST			1.4
- pkgsrc/net/miredo/distinfo			1.6, 1.7
- pkgsrc/net/miredo/patches/patch-aa		1.4, 1.5
- pkgsrc/net/miredo/patches/patch-ab		1.5
- pkgsrc/net/miredo/patches/patch-ac		1.4
- pkgsrc/net/miredo/patches/patch-ad		removed
- pkgsrc/net/miredo/patches/patch-ae		removed

   Module Name:		pkgsrc
   Committed By:	rpaulo
   Date:		Tue Aug 15 20:54:45 UTC 2006

   Modified Files:
   	pkgsrc/net/miredo: Makefile PLIST distinfo
   	pkgsrc/net/miredo/patches: patch-aa patch-ab patch-ac
   Removed Files:
   	pkgsrc/net/miredo/patches: patch-ad patch-ae

   Log Message:
   Update to version 0.9.9:

   ============================================================================
   RELEASE CANDIDATE 0.9.9 : Minor portability fixes

   # NetBSD 4 build fixes.

   ============================================================================
   RELEASE CANDIDATE 0.9.8 : Major feature enhancements, major security fixes

   # Support interacting with Teredo clients behind symmetric NATs.
   # Fix multiple problems with HMAC/ping authentication of non-Teredo nodes.
   # Increase timestamp wrap time from 18 hours to 70 years to avoid replay
      attacks against authentication tokens.
   # Allow Router Advertisement through the ISATAP tunnel (untested).
      isatapd remain very experimental, particular client-side.
      Someone ought to make a clean kernel implementation instead.
   # Use HMAC instead of random nonces in Teredo clients.

   =============================================================================
   BETA RELEASE 0.9.7 : Major security fixes

   # Fix infinite UDP packet forwarding loop in Teredo server (MTFL-SA 0603).

   =============================================================================
   BETA RELEASE 0.9.6 : Major compatibility fixes

   # Lots of portability fixes, mostly for FreeBSD and the likes.
   # Removed some dead code.
   # Provide teredo-mire by default.
   # Print more helpful error message for some common BSD tunneling issues.

   =============================================================================
   BETA RELEASE 0.9.5 : Major features enhancement, major bug fixes

   # Removed too brittle cone NAT support. As a side effect, miredo is much
      faster to startup in client mode in most cases.
   # Fix server-side handling of Windows Vista client solicitations.
   # Removed the IgnoreConeBit configure option. The cone bit is now always
      ignored (this was the default ever since the introduction of that
   option).

   =============================================================================
   BETA RELEASE 0.9.4 : Major features enhancement

   # More refined system clock usage brings about 30% performance boost.

   =============================================================================
   BETA RELEASE 0.9.3 : Major features enhancement, major bug fixes

   # Use dedicated thread for packets transmission and reception. Miredo
      should now leverage dual-process, dual-core and SMT systems.

   # Receive to-be-decapsulated and to-be-encapsulated packets in blocking
      mode; this improves performance by about 10% on Linux.

   # Use the POSIX monotonic clock for maintenance procedure and exclusive
      mode watch if POSIX monotonic clock and clock selection are available.

   # Minor optimizations to the most stressed code paths.
   # Suppress spurious 4-seconds delay when waiting for symmetric probes.
   # Minimalistic support for ISATAP client in ISATAPd.
   # Ignore invalid Router Advertisements properly.
   # Drop incoming multicast traffic as a precautionary measure.
   # Truncate PID file properly when updating it.
   # Fix deadlocks and spurious exits upon some signals (such as SIGCONT).
   # Fix deadlock when Teredo server DNS hostname resolution fails.
   # Handle would-be spurious wakeups properly.
   # Fix IPv4 global unicast access-list.
   # Fix SO_REUSEADDR socket option usage.
   # Use C99 restrict keyword at sensible places for compiler optimization.
   # Portability fixes for DragonFly BSD.
   # Work-around for some uClibc POSIX defines insanity.
   # Got rid of all C++ code.
   # Renamed libteredo-mire to teredo-mire for consistency.
   # Leverage newer autoconf macros.
   # Fix encoding of non-ASCII characters in manual pages.
   # Work-around for platforms that can't rename tunnel network interface.
   # Build libmiredo dynamically to reduce global code size.
   # Fix inclusion of non-PIC code into shared libraries.

   (Unstable version 0.9.3 includes all fixes from stable version 0.8.5)

   =============================================================================
   BETA RELEASE 0.9.1 : Major features enhancement

   # Created and referenced a developper mailing list: <miredo-devel at
      remlab.net>. Send a mail with subject subscribe to
   <miredo-devel-request
      at remlab.net> to subscribe.

   # Added isatap, an ISATAP router based on libtun6 and miredo.
      After careful IETF IPR claim check, it seems ISATAP can be freely
      implemented anyway.

   # Working support for Mac OS X:
      - work-around overly long closefrom() replacement,
      - work-around tuntap for OS X spurious initialization error.
      - add required defines for pthread to work properly.

   # Added libteredo-miredo, an undocumented Teredo test card.
   # Improve miredo-checkconf semantics.
   # Multi-threaded libteredo, and finer grained locking.
   # Fix initialization in libteredo sometimes causing a crash at startup.
   # Fix race condition in libteredo-list unit test.
   # Fix _impossible_ overflow of FD_SET().

   (Unstable version 0.9.1 includes all fixes from stable version 0.8.4)
---
   Module Name:		pkgsrc
   Committed By:	salo
   Date:		Fri Aug 18 13:45:57 UTC 2006

   Modified Files:
   	pkgsrc/net/miredo: Makefile distinfo
   	pkgsrc/net/miredo/patches: patch-aa

   Log Message:
   Fix example configuration files installation so they aren't installed twice
   (extra ones in PKG_SYSCONFDIR).

   ok <rpaulo>

8 files changed, 60 insertions, 108 deletions

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 8dfba00b398..4569697faa0 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/05/12 08:25:47 joerg Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2006/08/18 13:55:46 salo Exp $
 
-DISTNAME=	miredo-0.8.4
-PKGREVISION=	1
+DISTNAME=	miredo-0.9.9
 CATEGORIES=	net
-MASTER_SITES=	http://www.remlab.net/files/miredo/v0.8/
+MASTER_SITES=	http://www.remlab.net/files/miredo/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rpaulo@NetBSD.org
@@ -20,12 +19,7 @@ EGDIR=		${PREFIX}/share/examples/miredo
 CONF_FILES=	${EGDIR}/miredo.conf-dist ${PKG_SYSCONFDIR}/miredo.conf
 CONF_FILES+=	${EGDIR}/miredo-server.conf-dist \
 		${PKG_SYSCONFDIR}/miredo-server.conf
-
-INSTALLATION_DIRS=	share/examples/miredo
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/misc/miredo.conf-dist ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/misc/miredo-server.conf-dist ${EGDIR}
+CONF_FILES+=	${EGDIR}/isatapd.conf-dist ${PKG_SYSCONFDIR}/isatapd.conf
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/miredo/PLIST b/net/miredo/PLIST
index e695b50c96f..13bd3f2d1e6 100644
--- a/net/miredo/PLIST
+++ b/net/miredo/PLIST
@@ -1,28 +1,26 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/12 08:25:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3.2.1 2006/08/18 13:55:46 salo Exp $
+bin/teredo-mire
 sbin/miredo
 sbin/miredo-server
+sbin/miredo-checkconf
+sbin/isatapd
 include/libteredo/teredo.h
 include/libteredo/teredo-udp.h
 include/libteredo/tunnel.h
 include/libtun6/tun6.h
+man/man1/teredo-mire.1
 man/man5/miredo-server.conf.5
 man/man5/miredo.conf.5
+man/man5/isatapd.conf.5
 man/man8/miredo-checkconf.8
 man/man8/miredo-server.8
 man/man8/miredo.8
-lib/libteredo.a
+man/man8/isatapd.8
 lib/libteredo.la
-lib/libteredo.so
-lib/libteredo.so.0
-lib/libteredo.so.0.0.0
-lib/libtun6.a
 lib/libtun6.la
-lib/libtun6.so
-lib/libtun6.so.0
-lib/libtun6.so.0.0.0
-sbin/miredo-checkconf
 share/examples/miredo/miredo.conf-dist
 share/examples/miredo/miredo-server.conf-dist
+share/examples/miredo/isatapd.conf-dist
 @dirrm include/libteredo
 @dirrm include/libtun6
 @dirrm share/examples/miredo
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index f679d677065..a0425a3497f 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/05/12 08:25:47 joerg Exp $
+$NetBSD: distinfo,v 1.5.2.1 2006/08/18 13:55:46 salo Exp $
 
-SHA1 (miredo-0.8.4.tar.bz2) = 57b2f3880c2e6ec0342478fd6fd329f457250de9
-RMD160 (miredo-0.8.4.tar.bz2) = f72409d4f63800e7f9adc833a1916c7a2939db07
-Size (miredo-0.8.4.tar.bz2) = 407550 bytes
-SHA1 (patch-aa) = 864290fea0303cf82bacace2cf955408983bbf18
-SHA1 (patch-ab) = 9299baae1f7741ddec743159aa871999eff8228a
-SHA1 (patch-ac) = 884e1d2fdadb3aebf096ab99afa1dc8fea2346e9
-SHA1 (patch-ad) = 0b6170f8bb8e3f501de6773e68fd0657036a17bd
-SHA1 (patch-ae) = d6deef1b94ed3e33bb0b0659ba0615416ca2be38
+SHA1 (miredo-0.9.9.tar.bz2) = 15fd2dc04f295cce5a25a4372488caaf99bc6552
+RMD160 (miredo-0.9.9.tar.bz2) = 7bb88d5fc90001b8c7efdc809038bf382708bdcd
+Size (miredo-0.9.9.tar.bz2) = 441042 bytes
+SHA1 (patch-aa) = 184c8dd8ca12ecdfcf56700aef25d46eccc16c53
+SHA1 (patch-ab) = 08e67c6fa8bebfca8d47ca2b9525bda2eefb518f
+SHA1 (patch-ac) = c591e9097cf143c9bc4bde3cb66b875755547cd1
diff --git a/net/miredo/patches/patch-aa b/net/miredo/patches/patch-aa
index 21d40efb42c..9f7d2a0c92f 100644
--- a/net/miredo/patches/patch-aa
+++ b/net/miredo/patches/patch-aa
@@ -1,21 +1,36 @@
-$NetBSD: patch-aa,v 1.3 2006/05/02 15:36:09 rpaulo Exp $
+$NetBSD: patch-aa,v 1.3.2.1 2006/08/18 13:55:46 salo Exp $
 
---- Makefile.in.orig	2006-05-01 13:58:04.000000000 +0100
-+++ Makefile.in	2006-05-02 16:10:03.000000000 +0100
-@@ -215,7 +215,7 @@ sharedstatedir = @sharedstatedir@
+--- 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 misc compat libtun6 libteredo src
-+SUBDIRS = po doc compat libtun6 libteredo src
- DIST_SUBDIRS = m4 $(SUBDIRS)
- noinst_HEADERS = include/gettext.h
- EXTRA_DIST = bootstrap autopackage/default.apspec.in
-@@ -615,7 +615,6 @@ info-am:
+ 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-exec-am: install-dist_sysconfDATA install-nodist_sysconfDATA
  
diff --git a/net/miredo/patches/patch-ab b/net/miredo/patches/patch-ab
index fb56019c84a..057ab145941 100644
--- a/net/miredo/patches/patch-ab
+++ b/net/miredo/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.4 2006/05/02 15:36:09 rpaulo Exp $
+$NetBSD: patch-ab,v 1.4.2.1 2006/08/18 13:55:46 salo Exp $
 
---- misc/miredo.conf-dist.orig	2006-05-02 16:29:45.000000000 +0100
-+++ misc/miredo.conf-dist	2006-05-02 16:29:51.000000000 +0100
+--- 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 @@
  #RelayType client
  
- # Name of the network tunneling interface.
+ # Name of the network tunneling interface.
 -InterfaceName	teredo
 +#InterfaceName	teredo
  
diff --git a/net/miredo/patches/patch-ac b/net/miredo/patches/patch-ac
index 3efe63a74c0..60d928aab6f 100644
--- a/net/miredo/patches/patch-ac
+++ b/net/miredo/patches/patch-ac
@@ -1,22 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2006/05/12 08:25:47 joerg Exp $
+$NetBSD: patch-ac,v 1.3.2.1 2006/08/18 13:55:46 salo Exp $
 
---- libtun6/tun6.c.orig	2006-05-01 12:57:31.000000000 +0000
-+++ libtun6/tun6.c
-@@ -94,6 +94,8 @@ static const char *os_driver = "BSD";
+--- 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
  
- # if defined (HAVE_NET_IF_TUN_H)
- #  include <net/if_tun.h> // TUNSIFHEAD, TUNSLMODE
-+# elif defined(__DragonFly__)
-+#  include <net/tun/if_tun.h>
- # elif defined (__APPLE__)
- #  define TUNSIFHEAD  _IOW('t', 96, int)
- # endif
-@@ -213,7 +215,7 @@ tun6 *tun6_create (const char *req_name)
- 		 * Some BSD variants or older kernel versions do not support /dev/tun,
- 		 * so fallback to the old scheme.
- 		 */
--		for (unsigned i = 0; (fd == -1) && (errno != ENOENT); i++)
-+		for (unsigned i = 0; (fd == -1) && (errno == ENOENT); i++)
- 		{
- 			char tundev[5 + IFNAMSIZ];
- 			snprintf (tundev, sizeof (tundev), "/dev/tun%u", i);
+ # Name of the network tunneling interface.
+-InterfaceName	isatap
++#InterfaceName	isatap
+ 
+ # IPv4 address to bind to (default automatic)
+ #BindAddress	192.0.2.100
diff --git a/net/miredo/patches/patch-ad b/net/miredo/patches/patch-ad
deleted file mode 100644
index 7cd9dc82591..00000000000
--- a/net/miredo/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/05/12 08:25:47 joerg Exp $
-
---- compat/barrier.c.orig	2006-05-01 12:57:31.000000000 +0000
-+++ compat/barrier.c
-@@ -30,7 +30,27 @@
-  ***********************************************************************/
- 
- #include <errno.h>
-+
-+#if defined(__DragonFly__)
-+#define pthread_barrier_init sys_pthread_barrier_init
-+#define pthread_barrier_destroy sys_pthread_barrier_destroy
-+#define pthread_barrier_wait sys_pthread_barrier_wait
-+#define pthread_barrier_t sys_pthread_barrier_t
-+#define pthread_barrierattr_init sys_pthread_barrierattr_init
-+#define pthread_barrierattr_destroy sys_pthread_barrierattr_destroy
-+#define pthread_barrierattr_t sys_pthread_barrierattr_t
-+#endif
- #include <pthread.h>
-+#if defined(__DragonFly__)
-+#undef pthread_barrier_init
-+#undef pthread_barrier_destroy
-+#undef pthread_barrier_wait
-+#undef pthread_barrier_t
-+#undef pthread_barrierattr_init
-+#undef pthread_barrierattr_destroy
-+#undef pthread_barrierattr_t
-+#undef PTHREAD_BARRIER_SERIAL_THREAD
-+#endif
- #include "barrier.h"
- 
- extern int
diff --git a/net/miredo/patches/patch-ae b/net/miredo/patches/patch-ae
deleted file mode 100644
index 5624cfa0c38..00000000000
--- a/net/miredo/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2006/05/12 08:25:47 joerg Exp $
-
---- configure.orig	2006-05-12 08:09:32.000000000 +0000
-+++ configure
-@@ -20607,6 +20607,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <net/if.h>
-