From a52f13b2bdc8ca317b4488028f41b36cd0626215 Mon Sep 17 00:00:00 2001
From: rpaulo <rpaulo@pkgsrc.org>
Date: Mon, 3 Apr 2006 23:30:34 +0000
Subject: NetBSD needs TUNIFHEAD.

---
 net/miredo/Makefile         |  3 ++-
 net/miredo/distinfo         |  4 ++--
 net/miredo/patches/patch-ab | 11 ++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'net')

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 4e9be6475ab..e63e2de35d4 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/03/31 23:21:33 rpaulo Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/03 23:30:34 rpaulo Exp $
 
 DISTNAME=	miredo-0.8.0
 CATEGORIES=	net
+PKGREVISION=	1
 MASTER_SITES=	http://www.remlab.net/files/miredo/v0.8/
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index 433f4dbf760..5d1df6fe16b 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2006/03/14 01:58:47 joerg Exp $
+$NetBSD: distinfo,v 1.3 2006/04/03 23:30:34 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) = a5d3876d3e23681a3dae58867619c75434cbd0a9
-SHA1 (patch-ab) = 88d38658f43c65206bd5c65cf23de596affcd150
+SHA1 (patch-ab) = 31a6367610995e2a366bab773cff9c4a52bc049d
 SHA1 (patch-ac) = b9bd7176a9a89956447b5cf4ae4e48d2c262f37b
 SHA1 (patch-ad) = 67f36caf1eca4909eb3a9c9d0c769d962cf1247c
 SHA1 (patch-ae) = 67341ce2087881d22b8f6a95666cd12c1a1c07ab
diff --git a/net/miredo/patches/patch-ab b/net/miredo/patches/patch-ab
index 1509b30fbc9..bc9de909b48 100644
--- a/net/miredo/patches/patch-ab
+++ b/net/miredo/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2006/03/14 01:58:47 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2006/04/03 23:30:34 rpaulo Exp $
 
 --- libtun6/tun6.c.orig	2006-02-02 21:01:54.000000000 +0000
-+++ libtun6/tun6.c
++++ libtun6/tun6.c	2006-04-04 00:26:58.000000000 +0100
 @@ -70,7 +70,8 @@ struct in6_ifreq {
  static const char *os_driver = "Linux";
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.2 2006/03/14 01:58:47 joerg Exp $
  /*
   * BSD tunneling driver
   * NOTE: the driver does NOT really work on NetBSD
-@@ -84,11 +85,18 @@ static const char *os_driver = "Linux";
+@@ -84,11 +85,19 @@ static const char *os_driver = "Linux";
  # define USE_TUNHEAD
  static const char *os_driver = "FreeBSD";
  
@@ -27,11 +27,12 @@ $NetBSD: patch-ab,v 1.2 2006/03/14 01:58:47 joerg Exp $
  static const char *os_driver = "OpenBSD";
  
  # elif defined (HAVE_NETBSD)
++#  include <net/if_tun.h>
 +#  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 *
+@@ -705,7 +714,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 */
@@ -40,7 +41,7 @@ $NetBSD: patch-ab,v 1.2 2006/03/14 01:58:47 joerg Exp $
  	/* FreeBSD driver */
  	if (head.tun_bsd != htonl (AF_INET6))
  		return -1;
-@@ -733,7 +741,7 @@ tun6_send (const tun6 *t, const void *pa
+@@ -733,7 +742,7 @@ tun6_send (const tun6 *t, const void *pa
  	uint16_t flags;
  	uint16_t proto;
  } head = { 0, htons (ETH_P_IPV6) };
-- 
cgit v1.2.3