From e3855e55fac70a121754d8e0d17f2f9d5c2cbb08 Mon Sep 17 00:00:00 2001
From: haad <haad@NetBSD.org>
Date: Sun, 28 Feb 2010 17:36:51 +0000
Subject: [PATCH] Add fixes for missing symbols from libzfs and libzpool.

---
 external/cddl/osnet/lib/libzfs/mnttab.c   | 11 +++++++++--
 external/cddl/osnet/lib/libzfs/stubs.c    | 17 +++++++++++++++++
 external/cddl/osnet/lib/libzpool/kernel.c | 15 +++++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 external/cddl/osnet/lib/libzfs/stubs.c

diff --git a/external/cddl/osnet/lib/libzfs/mnttab.c b/external/cddl/osnet/lib/libzfs/mnttab.c
index 1026ff75c932..1907e3c69685 100644
--- a/external/cddl/osnet/lib/libzfs/mnttab.c
+++ b/external/cddl/osnet/lib/libzfs/mnttab.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mnttab.c,v 1.1 2009/08/07 20:57:56 haad Exp $	*/
+/*     $NetBSD: mnttab.c,v 1.2 2010/02/28 17:36:51 haad Exp $  */
 
 /*-
  * Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/compat/opensolaris/misc/mnttab.c,v 1.1 2007/04/06 01:08:59 pjd Exp $"); */
-__RCSID("$NetBSD: mnttab.c,v 1.1 2009/08/07 20:57:56 haad Exp $"); 
+__RCSID("$NetBSD: mnttab.c,v 1.2 2010/02/28 17:36:51 haad Exp $");
 
 #include <sys/param.h>
 #include <sys/statvfs.h>
@@ -195,3 +195,10 @@ getstatfs(struct statvfs *stat, const char *path)
 	free(statvfs);
 	return (0);
 }
+
+int
+getmntent(FILE *file, struct mnttab *mnttab) {
+
+
+	return 1;
+}
diff --git a/external/cddl/osnet/lib/libzfs/stubs.c b/external/cddl/osnet/lib/libzfs/stubs.c
new file mode 100644
index 000000000000..c9a0275b2e3e
--- /dev/null
+++ b/external/cddl/osnet/lib/libzfs/stubs.c
@@ -0,0 +1,17 @@
+#include <errno.h>
+#include <libintl.h>
+#include <link.h>
+#include <pthread.h>
+#include <strings.h>
+#include <unistd.h>
+
+#include <libzfs.h>
+
+#include "libzfs_impl.h"
+
+void
+libzfs_fru_clear(libzfs_handle_t *hld, boolean_t bol)
+{
+
+	return;
+}
diff --git a/external/cddl/osnet/lib/libzpool/kernel.c b/external/cddl/osnet/lib/libzpool/kernel.c
index 8b364daf5f97..a06dcf668fe9 100644
--- a/external/cddl/osnet/lib/libzpool/kernel.c
+++ b/external/cddl/osnet/lib/libzpool/kernel.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernel.c,v 1.1 2009/08/07 20:57:56 haad Exp $	*/
+/*     $NetBSD: kernel.c,v 1.2 2010/02/28 17:36:51 haad Exp $  */
 
 /*
  * CDDL HEADER START
@@ -29,7 +29,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: kernel.c,v 1.1 2009/08/07 20:57:56 haad Exp $");
+__RCSID("$NetBSD: kernel.c,v 1.2 2010/02/28 17:36:51 haad Exp $");
 
 #include <sys/zfs_context.h>
 #include <sys/sysctl.h>
@@ -54,6 +54,7 @@ __RCSID("$NetBSD: kernel.c,v 1.1 2009/08/07 20:57:56 haad Exp $");
 #ifdef XXXNETBSD
 int hz = 119;	/* frequency when using gethrtime() >> 23 for lbolt */
 #endif
+int aok;
 uint64_t physmem;
 vnode_t *rootdir = (vnode_t *)0xabcd1234;
 char hw_serial[11];
@@ -63,6 +64,9 @@ struct utsname utsname = {
 	"userland"
 };
 
+/* this only exists to have its address taken */
+struct proc p0;
+
 /*
  * =========================================================================
  * threads
@@ -692,3 +696,10 @@ ptob(size_t npg)
 
 	return npg * pgsize;
 }
+
+void
+print_timestamp(int fmt)
+{
+
+	return;
+}