Correct torsmo build failure on NetBSD 8.99.1

There is <sys/user.h> removal fallout.
This commit is contained in:
kamil 2017-06-23 19:02:07 +00:00
parent a854b3eeb1
commit ff081df8ca
2 changed files with 18 additions and 7 deletions

View file

@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.6 2015/11/04 01:32:33 agc Exp $
$NetBSD: distinfo,v 1.7 2017/06/23 19:02:07 kamil Exp $
SHA1 (torsmo-0.18.tar.gz) = 01e6737b3971daa3a7c9cb6dd1961f61bc39bdae
RMD160 (torsmo-0.18.tar.gz) = f1d8b3c4679155596569f9116970e7ba8a01eb6e
SHA512 (torsmo-0.18.tar.gz) = 822a7a01bb685c6dbad5520d3c6bab4b2854647054de068952852dbf907f356d27718050ca1b0bc0c83b09112b4ae52c884aa75c6b1753a168f3072d0a91e854
Size (torsmo-0.18.tar.gz) = 84020 bytes
SHA1 (patch-aa) = 8c515d3b0925aeaaea928ad8abd89ab5ccbfceab
SHA1 (patch-ab) = 3bf66bd2b7645c204099a8c7b806098d028cc8bf
SHA1 (patch-ab) = 858d0f4d4a694e667465ed6519f034c07f13e535
SHA1 (patch-ac) = 5b342d09ff0fcc3982aa855e2cc660823ed53e11
SHA1 (patch-ad) = 87fa39455dc2d5190c419142d5e4d0768914841e
SHA1 (patch-ae) = 5888d6cf538a9d95006ab1d2cdd01eabfafa10ed

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.1.1.1 2006/03/29 21:42:55 ghen Exp $
$NetBSD: patch-ab,v 1.2 2017/06/23 19:02:07 kamil Exp $
--- netbsd.c.orig 2004-08-25 19:55:57.000000000 +0200
--- netbsd.c.orig 2004-08-25 17:55:57.000000000 +0000
+++ netbsd.c
@@ -9,6 +9,7 @@
#include <err.h>
@ -10,7 +10,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/03/29 21:42:55 ghen Exp $
#include <kvm.h>
#include <nlist.h>
@@ -221,6 +222,33 @@ void update_net_stats()
@@ -18,7 +19,6 @@
#include <sys/sysctl.h>
#include <sys/types.h>
#include <sys/time.h>
-#include <sys/user.h>
#include <sys/socket.h>
#include <sys/swap.h>
#include <sys/sched.h>
@@ -221,6 +221,33 @@ void update_net_stats()
}
}
@ -44,7 +52,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/03/29 21:42:55 ghen Exp $
void update_total_processes()
{
/* It's easier to use kvm here than sysctl */
@@ -302,6 +330,7 @@ void update_cpu_usage()
@@ -302,6 +329,7 @@ void update_cpu_usage()
}
double get_i2c_info(int fd, int div) {
@ -52,7 +60,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/03/29 21:42:55 ghen Exp $
return -1;
}
@@ -315,24 +344,96 @@ void update_load_average() {
@@ -315,27 +343,98 @@ void update_load_average() {
}
double get_acpi_temperature(int fd) {
@ -153,3 +161,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/03/29 21:42:55 ghen Exp $
}
char* get_acpi_fan() {
return "N/A";
}
-