optionally use /dev/smbios on all netbsd platforms, if machdep.smbios
exists and is non-zero.

this makes dmidecode by default work on x86 with INSECURE.

bump pkg version.


(mrg)

$NetBSD: patch-biosdecode.c,v 1.1 2022/11/28 04:26:08 mrg Exp $

* Use /dev/smbios instead of /dev/mem on NetBSD if available.

--- biosdecode.c.orig	2022-06-27 08:06:32.000000000 -0700
+++ biosdecode.c	2022-11-27 14:28:45.654835935 -0800
@@ -645,12 +645,12 @@
 	static const char *help =
 		"Usage: biosdecode [OPTIONS]\n"
 		"Options are:\n"
-		" -d, --dev-mem FILE     Read memory from device FILE (default: " DEFAULT_MEM_DEV ")\n"
+		" -d, --dev-mem FILE     Read memory from device FILE (default: %s)\n"
 		"     --pir full         Decode the details of the PCI IRQ routing table\n"
 		" -h, --help             Display this help text and exit\n"
 		" -V, --version          Display the version and exit\n";
 
-	printf("%s", help);
+	printf(help, DEFAULT_MEM_DEV);
 }
 
 int main(int argc, char * const argv[])

$NetBSD: patch-dmiopt.c,v 1.1 2022/11/28 04:26:08 mrg Exp $

* Use /dev/smbios instead of /dev/mem on NetBSD if available.

--- dmiopt.c.orig	2022-06-27 08:06:32.000000000 -0700
+++ dmiopt.c	2022-11-27 14:28:45.656425673 -0800
@@ -368,7 +368,7 @@
 	static const char *help =
 		"Usage: dmidecode [OPTIONS]\n"
 		"Options are:\n"
-		" -d, --dev-mem FILE     Read memory from device FILE (default: " DEFAULT_MEM_DEV ")\n"
+		" -d, --dev-mem FILE     Read memory from device FILE (default: %s)\n"
 		" -h, --help             Display this help text and exit\n"
 		" -q, --quiet            Less verbose output\n"
 		" -s, --string KEYWORD   Only display the value of the given DMI string\n"
@@ -381,5 +381,5 @@
 		"     --oem-string N     Only display the value of the given OEM string\n"
 		" -V, --version          Display the version and exit\n";
 
-	printf("%s", help);
+	printf(help, DEFAULT_MEM_DEV);
 }

$NetBSD: patch-ownership.c,v 1.1 2022/11/28 04:26:08 mrg Exp $

* Use /dev/smbios instead of /dev/mem on NetBSD if available.

--- ownership.c.orig	2022-06-27 08:06:32.000000000 -0700
+++ ownership.c	2022-11-27 14:28:45.655641133 -0800
@@ -146,11 +146,11 @@
 	static const char *help =
 		"Usage: ownership [OPTIONS]\n"
 		"Options are:\n"
-		" -d, --dev-mem FILE     Read memory from device FILE (default: " DEFAULT_MEM_DEV ")\n"
+		" -d, --dev-mem FILE     Read memory from device FILE (default: %s)\n"
 		" -h, --help             Display this help text and exit\n"
 		" -V, --version          Display the version and exit\n";
 
-	printf("%s", help);
+	printf(help, DEFAULT_MEM_DEV);
 }
 
 int main(int argc, char * const argv[])

$NetBSD: patch-util.c,v 1.1 2022/11/28 04:26:08 mrg Exp $

* Use /dev/smbios instead of /dev/mem on NetBSD if available.

--- util.c.orig	2022-06-27 08:06:32.000000000 -0700
+++ util.c	2022-11-27 14:28:45.657997798 -0800
@@ -36,6 +36,9 @@
 #define MAP_FAILED ((void *) -1)
 #endif /* !MAP_FAILED */
 #endif /* USE MMAP */
+#ifdef __NetBSD__
+#include <sys/sysctl.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -314,3 +317,28 @@
 
 	return res;
 }
+
+#ifdef USE_DEFAULT_MEM_DEV_FUNC
+const char *
+default_mem_dev(void)
+{
+#ifdef __NetBSD__
+	uint64_t addr;
+	size_t addrlen = sizeof addr;
+	int ret;
+
+	/*
+	 * If machdep.smbios exists and has a non-zero value, /dev/smbios
+	 * should work.  Otherwise fallback to /dev/mem.
+	 */
+	ret = sysctlbyname("machdep.smbios", &addr, &addrlen, NULL, 0);
+	if (ret == 0 && addr != 0) {
+		return "/dev/smbios";
+	} else {
+		return "/dev/mem";
+	}
+#else
+# error "not implemented."
+#endif
+}
+#endif

$NetBSD: patch-vpdopt.c,v 1.1 2022/11/28 04:26:08 mrg Exp $

* Use /dev/smbios instead of /dev/mem on NetBSD if available.

--- vpdopt.c.orig	2022-06-27 08:06:32.000000000 -0700
+++ vpdopt.c	2022-11-27 14:28:45.657210082 -0800
@@ -147,11 +147,11 @@
 	static const char *help =
 		"Usage: vpddecode [OPTIONS]\n"
 		"Options are:\n"
-		" -d, --dev-mem FILE     Read memory from device FILE (default: " DEFAULT_MEM_DEV ")\n"
+		" -d, --dev-mem FILE     Read memory from device FILE (default: %s)\n"
 		" -h, --help             Display this help text and exit\n"
 		" -s, --string KEYWORD   Only display the value of the given VPD string\n"
 		" -u, --dump             Do not decode the VPD records\n"
 		" -V, --version          Display the version and exit\n";
 
-	printf("%s", help);
+	printf(help, DEFAULT_MEM_DEV);
 }