diff options
Diffstat (limited to 'net/miredo/patches/patch-ac')
| -rw-r--r-- | net/miredo/patches/patch-ac | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/net/miredo/patches/patch-ac b/net/miredo/patches/patch-ac index e48db9567d1..4bf0a7378bf 100644 --- a/net/miredo/patches/patch-ac +++ b/net/miredo/patches/patch-ac @@ -1,30 +1,22 @@ -$NetBSD: patch-ac,v 1.1.1.1 2006/02/28 01:29:39 rpaulo Exp $ +$NetBSD: patch-ac,v 1.1.1.1.2.1 2006/06/07 18:23:42 ghen 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: +--- 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"; - 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 \ + # 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); |