Miredo is an Unix daemon program which mostly implements the

"Teredo: Tunneling IPv6 over UDP through NATs" Internet proposed
standard (RFC 4380). It can provide either client or relay
functionality. A separate program, miredo-server is also included in
the package; it consists of a Teredo server.

Miredo can be used to provide IPv6 connectivity to users behind NAT
which do not support IPv6, and not even proto-41 forwarding. For this
to work, users need to have a Teredo client running on their system.
That can be Miredo itself on Linux/FreeBSD/OpenBSD/NetBSD.
--

Will (maybe) only work on NetBSD-current of an hour ago.

Thanks to Hubert and Amitai for help with this one.

7 files changed, 134 insertions, 0 deletions

diff --git a/net/miredo/DESCR b/net/miredo/DESCR
new file mode 100644
index 00000000000..a417233935c
--- /dev/null
+++ b/net/miredo/DESCR
@@ -0,0 +1,10 @@
+Miredo is an Unix daemon program which mostly implements the
+"Teredo: Tunneling IPv6 over UDP through NATs" Internet proposed
+standard (RFC 4380). It can provide either client or relay
+functionality. A separate program, miredo-server is also included in
+the package; it consists of a Teredo server.
+
+Miredo can be used to provide IPv6 connectivity to users behind NAT
+which do not support IPv6, and not even proto-41 forwarding. For this
+to work, users need to have a Teredo client running on their system.
+That can be Miredo itself on Linux/FreeBSD/OpenBSD/NetBSD.
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
new file mode 100644
index 00000000000..daec624b179
--- /dev/null
+++ b/net/miredo/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+
+DISTNAME=	miredo-0.8.0
+CATEGORIES=	net
+MASTER_SITES=	http://www.remlab.net/files/miredo/v0.8/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rpaulo@NetBSD.org
+HOMEPAGE=	http://www.simphalempin.com/dev/miredo/
+COMMENT=	Teredo IPv6 tunneling
+
+GNU_CONFIGURE=	yes
+
+EGDIR=		${PREFIX}/share/examples/miredo
+CONF_FILES=	${EGDIR}/miredo.conf-dist ${PKG_SYSCONFDIR}/miredo.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}
+
+.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
new file mode 100644
index 00000000000..8a3e0871280
--- /dev/null
+++ b/net/miredo/PLIST
@@ -0,0 +1,16 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+sbin/miredo
+sbin/miredo-server
+include/libteredo/teredo.h
+include/tun6.h
+man/man5/miredo-server.conf.5
+man/man5/miredo.conf.5
+man/man8/miredo-server.8
+man/man8/miredo.8
+lib/libteredo.a
+lib/libteredo.la
+lib/libtun6.a
+lib/libtun6.la
+share/examples/miredo/miredo.conf-dist
+share/examples/miredo/miredo-server.conf-dist
+@dirrm share/examples/miredo
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
new file mode 100644
index 00000000000..6b5eb1b2ae0
--- /dev/null
+++ b/net/miredo/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+
+SHA1 (miredo-0.8.0.tar.bz2) = 806a96730ef2687e8fbaea7c5bce7a9ffc2e7367
+RMD160 (miredo-0.8.0.tar.bz2) = ef9cc7c8db0188c5e5f364dbc8d24112e75a106f
+Size (miredo-0.8.0.tar.bz2) = 397357 bytes
+SHA1 (patch-aa) = 9be64b25c562af305c7ea76cbeddac2be1ae54fc
+SHA1 (patch-ab) = efae353e329580f6e8c1bff44503a6b967bd45de
+SHA1 (patch-ac) = b9bd7176a9a89956447b5cf4ae4e48d2c262f37b
diff --git a/net/miredo/patches/patch-aa b/net/miredo/patches/patch-aa
new file mode 100644
index 00000000000..f64c64717d9
--- /dev/null
+++ b/net/miredo/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+
+--- libteredo/server.c	2006-02-28 00:48:07.000000000 +0000
++++ libteredo/server.c.new	2006-02-28 00:47:56.000000000 +0000
+@@ -49,6 +49,10 @@
+ #include <pthread.h>
+ #include <syslog.h>
+ 
++#ifdef __NetBSD__
++#include <machine/limits.h>
++#endif
++
+ #include "server.h"
+ #include "v4global.h"
+ #include "checksum.h"
diff --git a/net/miredo/patches/patch-ab b/net/miredo/patches/patch-ab
new file mode 100644
index 00000000000..edad5f2ae74
--- /dev/null
+++ b/net/miredo/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+
+--- libtun6/tun6.c	2006-02-28 00:50:05.000000000 +0000
++++ libtun6/tun6.c.new	2006-02-28 00:49:48.000000000 +0000
+@@ -89,6 +89,7 @@ static const char *os_driver = "FreeBSD"
+ 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 +706,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)
+ 	/* FreeBSD driver */
+ 	if (head.tun_bsd != htonl (AF_INET6))
+ 		return -1;
+@@ -733,7 +734,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)
+ 	uint32_t head = htonl (AF_INET6);
+ #endif
+ 
diff --git a/net/miredo/patches/patch-ac b/net/miredo/patches/patch-ac
new file mode 100644
index 00000000000..e48db9567d1
--- /dev/null
+++ b/net/miredo/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $
+
+--- Makefile.in	2006-02-02 21:02:15.000000000 +0000
++++ Makefile.in.new	2006-02-28 01:08:36.000000000 +0000
+@@ -222,7 +222,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = m4 po libtun6 libteredo src misc
++SUBDIRS = m4 po libtun6 libteredo src
+ man5_MANS = doc/miredo.conf.5 doc/miredo-server.conf.5
+ man8_MANS = doc/miredo.8 doc/miredo-server.8
+ noinst_HEADERS = include/gettext.h
+@@ -722,7 +722,6 @@ info-am:
+ 
+ install-data-am: install-man
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+ install-exec-am:
+ 
+@@ -764,7 +763,7 @@ uninstall-man: uninstall-man5 uninstall-
+ 	distclean-recursive distclean-tags distcleancheck distdir \
+ 	distuninstallcheck dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-hook install-exec install-exec-am install-info \
++	install-exec install-exec-am install-info \
+ 	install-info-am install-man install-man5 install-man8 \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	installdirs-am maintainer-clean maintainer-clean-generic \