From 54d478b929ca04bb7b4acb66c20d4251a1f47f18 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Sun, 25 Sep 2016 21:34:26 +0000 Subject: [PATCH] Fix the build after 305902 change ufs inode related structs. https://svnweb.freebsd.org/changeset/base/305902 Submitted by: antoine@ --- .../files/patch-sysdeps_freebsd_procmap.c | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 devel/libgtop/files/patch-sysdeps_freebsd_procmap.c diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c new file mode 100644 index 000000000000..0482a00bb9d8 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c @@ -0,0 +1,31 @@ +--- sysdeps/freebsd/procmap.c.orig 2015-08-17 18:59:37 UTC ++++ sysdeps/freebsd/procmap.c +@@ -52,6 +52,8 @@ + #include + #include + #include ++#include ++#include + #include + #if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__) + #include +@@ -86,6 +88,8 @@ _glibtop_sysdeps_freebsd_dev_inode (glib + struct cdev_priv priv; + #if __FreeBSD_version < 800039 + struct cdev si; ++#else ++ struct ufsmount um; + #endif + + *inum = 0; +@@ -167,7 +171,9 @@ _glibtop_sysdeps_freebsd_dev_inode (glib + + + #if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039) +- if (kvm_read (server->machine->kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv, ++ if (kvm_read (server->machine->kd, (gulong) inode.i_ump, (char *) &um, ++ sizeof (um)) != sizeof (um) || ++ kvm_read (server->machine->kd, (gulong) cdev2priv(um.um_dev), (char *) &priv, + sizeof (priv)) + #else + if (kvm_read (server->machine->kd, (gulong) inode.i_dev, (char *) &si,