Pullup ticket 1687 - requested by salo

security update for miredo

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

   Module Name:	pkgsrc
   Committed By:	rpaulo
   Date:		Fri Mar 31 23:21:33 UTC 2006

   Modified Files:
	pkgsrc/net/miredo: Makefile

   Log Message:
   SunOS is not supported. PR 33157.
---
   Module Name:	pkgsrc
   Committed By:	rpaulo
   Date:		Mon Apr  3 23:30:34 UTC 2006

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

   Log Message:
   NetBSD needs TUNIFHEAD.
---
   Module Name:	pkgsrc
   Committed By:	rpaulo
   Date:		Tue May  2 15:36:09 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 patch-af

   Log Message:
   Update to version 0.8.4.
   Changes include the fix for this security problem:
   http://www.simphalempin.com/dev/miredo/mtfl-sa-0601.shtml.en
   and the additon of most pkgsrc patches.
---
   Module Name:	pkgsrc
   Committed By:	rpaulo
   Date:		Tue May  2 15:36:44 UTC 2006

   Modified Files:
	pkgsrc/net/miredo: Makefile

   Log Message:
   Put back NOT_FOR_PLATFORM.
---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Fri May 12 08:25:47 UTC 2006

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

   Log Message:
   Fix PLIST and bump revision. Add DragonFly work arounds for pthread.h
   and fix net/if_var.h test as well.

1 files changed, 10 insertions, 48 deletions

diff --git a/net/miredo/patches/patch-ab b/net/miredo/patches/patch-ab
index 1509b30fbc9..a6d507c9dbe 100644
--- a/net/miredo/patches/patch-ab
+++ b/net/miredo/patches/patch-ab
@@ -1,51 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2006/03/14 01:58:47 joerg Exp $
+$NetBSD: patch-ab,v 1.2.2.1 2006/06/07 18:23:42 ghen Exp $
 
---- libtun6/tun6.c.orig	2006-02-02 21:01:54.000000000 +0000
-+++ libtun6/tun6.c
-@@ -70,7 +70,8 @@ struct in6_ifreq {
- static const char *os_driver = "Linux";
+--- 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
+@@ -7,7 +7,7 @@
+ #RelayType client
  
- #elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || \
--	defined (HAVE_NETBSD) || defined (HAVE_DARWIN)
-+	defined (HAVE_NETBSD) || defined (HAVE_DARWIN) || \
-+	defined (HAVE_DRAGONFLY)
- /*
-  * BSD tunneling driver
-  * NOTE: the driver does NOT really work on NetBSD
-@@ -84,11 +85,18 @@ static const char *os_driver = "Linux";
- # define USE_TUNHEAD
- static const char *os_driver = "FreeBSD";
- 
-+# elif defined(HAVE_DRAGONFLY)
-+#  include <net/if_var.h>
-+#  include <net/tun/if_tun.h>
-+# define USE_TUNHEAD
-+static const char *os_driver = "DragonFly";
-+
- # elif defined (HAVE_OPENBSD)
- #  define USE_TUNHEAD
- static const char *os_driver = "OpenBSD";
- 
- # elif defined (HAVE_NETBSD)
-+#  define USE_TUNHEAD
- static const char *os_driver = "NetBSD";
- 
- # elif defined (HAVE_DARWIN)
-@@ -705,7 +713,7 @@ tun6_recv (const tun6 *t, const fd_set *
- 	/* TUNTAP driver */
- 	if (head.tun_linux.proto != htons (ETH_P_IPV6))
- 		return -1; /* only accept IPv6 packets */
--#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD)
-+#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || defined (HAVE_NETBSD) || defined(HAVE_DRAGONFLY)
- 	/* FreeBSD driver */
- 	if (head.tun_bsd != htonl (AF_INET6))
- 		return -1;
-@@ -733,7 +741,7 @@ tun6_send (const tun6 *t, const void *pa
- 	uint16_t flags;
- 	uint16_t proto;
- } head = { 0, htons (ETH_P_IPV6) };
--#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD)
-+#elif defined (HAVE_FREEBSD) || defined (HAVE_OPENBSD) || defined (HAVE_NETBSD) || defined(HAVE_DRAGONFLY)
- 	uint32_t head = htonl (AF_INET6);
- #endif
+ # Name of the network tunneling interface.
+-InterfaceName	teredo
++#InterfaceName	teredo
  
+ # Depending on the local firewall/NAT rules, you might need to force
+ # Miredo to use a fixed UDP port and or IPv4 address.