summaryrefslogtreecommitdiffstats
path: root/devel/libgtop/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libgtop/files')
-rw-r--r--devel/libgtop/files/patch-config.h.in12
-rw-r--r--devel/libgtop/files/patch-configure81
-rw-r--r--devel/libgtop/files/patch-libgtop-sysdeps.m412
-rw-r--r--devel/libgtop/files/patch-src_daemon_server.c17
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am17
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in43
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_cpu.c66
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h10
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c19
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_open.c91
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procmap.c35
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c61
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procwd.c67
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c95
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c13
-rw-r--r--devel/libgtop/files/pkg-message13
16 files changed, 652 insertions, 0 deletions
diff --git a/devel/libgtop/files/patch-config.h.in b/devel/libgtop/files/patch-config.h.in
new file mode 100644
index 000000000..8fc4a10b1
--- /dev/null
+++ b/devel/libgtop/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig 2008-12-06 16:05:23.000000000 -0500
++++ config.h.in 2008-12-06 16:05:27.000000000 -0500
+@@ -115,6 +115,9 @@
+ /* defined if you have linux/isdn.h */
+ #undef HAVE_ISDN_H
+
++/* Define if you have the kinfo_getfile function */
++#undef HAVE_KINFO_GETFILE
++
+ /* Define to 1 if you have the `lchown' function. */
+ #undef HAVE_LCHOWN
+
diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure
new file mode 100644
index 000000000..800116d44
--- /dev/null
+++ b/devel/libgtop/files/patch-configure
@@ -0,0 +1,81 @@
+--- configure.orig 2009-01-13 01:39:39.000000000 -0500
++++ configure 2009-01-13 01:45:25.000000000 -0500
+@@ -21745,6 +21745,78 @@ fi
+ if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
+ EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
+ fi
++ { echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5
++echo $ECHO_N "checking for kinfo_getfile in -lutil... $ECHO_C" >&6; }
++if test "${ac_cv_lib_util_kinfo_getfile+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lutil $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char kinfo_getfile ();
++int
++main ()
++{
++return kinfo_getfile ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_util_kinfo_getfile=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_util_kinfo_getfile=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_kinfo_getfile" >&5
++echo "${ECHO_T}$ac_cv_lib_util_kinfo_getfile" >&6; }
++if test $ac_cv_lib_util_kinfo_getfile = yes; then
++ EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil"
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_KINFO_GETFILE 1
++_ACEOF
++
++else
++ :
++fi
++
+ ;;
+ esac
+
diff --git a/devel/libgtop/files/patch-libgtop-sysdeps.m4 b/devel/libgtop/files/patch-libgtop-sysdeps.m4
new file mode 100644
index 000000000..1805da02a
--- /dev/null
+++ b/devel/libgtop/files/patch-libgtop-sysdeps.m4
@@ -0,0 +1,12 @@
+--- libgtop-sysdeps.m4.orig 2008-04-21 14:58:38.000000000 -0400
++++ libgtop-sysdeps.m4 2008-12-06 16:16:00.000000000 -0500
+@@ -158,6 +160,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+ if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
+ EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
+ fi
++ AC_CHECK_LIB(util, kinfo_getfile,
++ [EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil"
++ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
+ ;;
+ esac
+
diff --git a/devel/libgtop/files/patch-src_daemon_server.c b/devel/libgtop/files/patch-src_daemon_server.c
new file mode 100644
index 000000000..bf0bba5c7
--- /dev/null
+++ b/devel/libgtop/files/patch-src_daemon_server.c
@@ -0,0 +1,17 @@
+--- src/daemon/server.c.orig Mon Feb 17 15:22:19 2003
++++ src/daemon/server.c Mon Feb 17 15:23:31 2003
+@@ -88,11 +88,12 @@
+ if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
+ strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
+ strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
+- fprintf (stderr, "Can only run on %s %s %s\n",
++ fprintf (stderr, "This libgtop was compiled on %s %s %s\n",
+ LIBGTOP_COMPILE_SYSTEM,
+ LIBGTOP_COMPILE_RELEASE,
+ LIBGTOP_COMPILE_MACHINE);
+- _exit (1);
++ fprintf (stderr, "If you see strange problems caused by it,\n");
++ fprintf (stderr, "you should recompile libgtop and dependent applications\n");
+ }
+ #endif
+
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am
new file mode 100644
index 000000000..25ec1f7d7
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am
@@ -0,0 +1,17 @@
+--- sysdeps/freebsd/Makefile.am.orig 2008-09-29 17:21:56.000000000 -0400
++++ sysdeps/freebsd/Makefile.am 2008-09-29 17:22:07.000000000 -0400
+@@ -7,12 +7,12 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid.
+ cpu.c msg_limits.c sem_limits.c loadavg.c \
+ uptime.c netlist.c fsusage.c mem.c \
+ mountlist.c procopenfiles.c procwd.c \
+- procaffinity.c glibtop_private.c
++ procaffinity.c glibtop_private.c open.c
+
+ libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+
+ libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
+-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \
++libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \
+ proclist.c procstate.c procuid.c \
+ proctime.c procmem.c procsignal.c \
+ prockernel.c procsegment.c procargs.c \
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
new file mode 100644
index 000000000..d60fe782e
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
@@ -0,0 +1,43 @@
+--- sysdeps/freebsd/Makefile.in.orig 2009-01-13 01:49:02.172092000 -0500
++++ sysdeps/freebsd/Makefile.in 2009-01-13 01:53:30.000000000 -0500
+@@ -50,7 +50,8 @@ libgtop_sysdeps_2_0_la_LIBADD =
+ am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo \
+ shm_limits.lo cpu.lo msg_limits.lo sem_limits.lo loadavg.lo \
+ uptime.lo netlist.lo fsusage.lo mem.lo mountlist.lo \
+- procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo
++ procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo \
++ open.lo
+ libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
+ libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -58,7 +59,7 @@ libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL)
+ am__DEPENDENCIES_1 =
+ libgtop_sysdeps_suid_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+-am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo swap.lo \
++am_libgtop_sysdeps_suid_2_0_la_OBJECTS = suid_open.lo close.lo swap.lo \
+ proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \
+ procsignal.lo prockernel.lo procsegment.lo procargs.lo \
+ procmap.lo netload.lo ppp.lo
+@@ -296,11 +297,11 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid.
+ cpu.c msg_limits.c sem_limits.c loadavg.c \
+ uptime.c netlist.c fsusage.c mem.c \
+ mountlist.c procopenfiles.c procwd.c \
+- procaffinity.c glibtop_private.c
++ procaffinity.c glibtop_private.c open.c
+
+ libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+ libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
+-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \
++libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \
+ proclist.c procstate.c procuid.c \
+ proctime.c procmem.c procsignal.c \
+ prockernel.c procsegment.c procargs.c \
+@@ -375,6 +376,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suid_open.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c b/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c
new file mode 100644
index 000000000..99a3e8ef8
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c
@@ -0,0 +1,66 @@
+--- sysdeps/freebsd/cpu.c.orig 2009-04-12 01:45:28.000000000 -0400
++++ sysdeps/freebsd/cpu.c 2009-04-12 01:45:29.000000000 -0400
+@@ -54,6 +54,7 @@ void
+ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
+ {
+ long cpts [CPUSTATES];
++ long *cp_times = NULL;
+ struct clockinfo ci;
+ size_t length;
+ int ncpu, i;
+@@ -75,6 +76,16 @@ glibtop_get_cpu_s (glibtop *server, glib
+ return;
+ }
+
++ length = 0;
++ if (sysctlbyname ("kern.cp_times", NULL, &length, NULL, 0) == 0) {
++ cp_times = g_malloc (length);
++ length = sizeof(long) * CPUSTATES * (length / (sizeof(long) * CPUSTATES));
++ if (sysctlbyname ("kern.cp_times", cp_times, &length, NULL, 0)) {
++ g_free (cp_times);
++ cp_times = NULL;
++ }
++ }
++
+ /* set user time */
+ buf->user = cpts [CP_USER];
+ /* set nice time */
+@@ -89,22 +100,32 @@ glibtop_get_cpu_s (glibtop *server, glib
+ /* set frequency */
+ buf->frequency = (ci.stathz ? ci.stathz : ci.hz);
+ /* set total */
+- buf->total = cpts [CP_USER] + cpts [CP_NICE]
++ buf->total = cpts [CP_USER] + cpts [CP_NICE] \
+ + cpts [CP_SYS] + cpts [CP_IDLE] + cpts [CP_INTR];
+
+ ncpu = server->ncpu + 1;
+
+ for (i = 0; i < ncpu; i++) {
+- buf->xcpu_user[i] = cpts [CP_USER] / ncpu;
+- buf->xcpu_nice[i] = cpts [CP_NICE] / ncpu;
+- buf->xcpu_sys[i] = cpts [CP_SYS] / ncpu;
+- buf->xcpu_idle[i] = cpts [CP_IDLE] / ncpu;
+- buf->xcpu_irq[i] = cpts [CP_INTR] / ncpu;
++ if (cp_times) {
++ buf->xcpu_user[i] = cp_times[i * CPUSTATES + CP_USER];
++ buf->xcpu_nice[i] = cp_times[i * CPUSTATES + CP_NICE];
++ buf->xcpu_sys[i] = cp_times[i * CPUSTATES + CP_SYS];
++ buf->xcpu_idle[i] = cp_times[i * CPUSTATES + CP_IDLE];
++ buf->xcpu_irq[i] = cp_times[i * CPUSTATES + CP_INTR];
++ } else {
++ buf->xcpu_user[i] = cpts [CP_USER] / ncpu;
++ buf->xcpu_nice[i] = cpts [CP_NICE] / ncpu;
++ buf->xcpu_sys[i] = cpts [CP_SYS] / ncpu;
++ buf->xcpu_idle[i] = cpts [CP_IDLE] / ncpu;
++ buf->xcpu_irq[i] = cpts [CP_INTR] / ncpu;
++ }
+ buf->xcpu_total[i] = buf->xcpu_user[i] + buf->xcpu_nice[i] \
+ + buf->xcpu_sys[i] + buf->xcpu_idle[i] \
+ + buf->xcpu_irq[i];
+ }
+
++ g_free (cp_times);
++
+ /* Set the flags last. */
+ buf->flags = _glibtop_sysdeps_cpu;
+
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h b/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h
new file mode 100644
index 000000000..e3b899af1
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h
@@ -0,0 +1,10 @@
+--- sysdeps/freebsd/glibtop_machine.h.orig 2009-12-13 18:34:21.000000000 -0500
++++ sysdeps/freebsd/glibtop_machine.h 2009-12-13 18:34:32.000000000 -0500
+@@ -24,6 +24,7 @@
+
+ #include <sys/param.h>
+ #include <nlist.h>
++#include <limits.h>
+ #include <kvm.h>
+ #include <sys/dkstat.h>
+ #include <time.h>
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c
new file mode 100644
index 000000000..acb327f98
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c
@@ -0,0 +1,19 @@
+--- sysdeps/freebsd/nosuid.c.orig 2008-09-29 17:28:31.000000000 -0400
++++ sysdeps/freebsd/nosuid.c 2008-09-29 17:28:39.000000000 -0400
+@@ -21,16 +21,8 @@
+
+ #include <config.h>
+ #include <glibtop.h>
+-#include <glibtop/open.h>
+ #include <glibtop/close.h>
+
+ void
+-glibtop_open_s (glibtop *server,
+- const char *program_name,
+- const unsigned long features,
+- const unsigned flags)
+-{ }
+-
+-void
+ glibtop_close_s (glibtop *server)
+ { }
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_open.c
new file mode 100644
index 000000000..f7bf0e3b1
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_open.c
@@ -0,0 +1,91 @@
+--- sysdeps/freebsd/open.c.orig 2008-05-23 18:13:23.000000000 -0400
++++ sysdeps/freebsd/open.c 2008-09-29 17:23:22.000000000 -0400
+@@ -20,76 +20,33 @@
+ */
+
+ #include <config.h>
++#include <sys/types.h>
++#include <sys/sysctl.h>
+ #include <glibtop.h>
+-#include <glibtop/error.h>
+ #include <glibtop/open.h>
+-#include <glibtop/init_hooks.h>
+-
+-/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
+-
+-void
+-glibtop_init_p (glibtop *server, const unsigned long features,
+- const unsigned flags)
+-{
+- const _glibtop_init_func_t *init_fkt;
+-
+- if (server == NULL)
+- glibtop_error_r (NULL, "glibtop_init_p (server == NULL)");
+-
+- /* Do the initialization, but only if not already initialized. */
+-
+- if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) {
+- glibtop_open_p (server, "glibtop", features, flags);
++#include <glibtop/cpu.h>
++#include <glibtop/error.h>
+
+- for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++)
+- (*init_fkt) (server);
++#include <glibtop_private.h>
+
+- server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
+- }
+-}
+
+ void
+-glibtop_open_p (glibtop *server, const char *program_name,
++glibtop_open_s (glibtop *server, const char *program_name,
+ const unsigned long features,
+ const unsigned flags)
+ {
+-#ifdef DEBUG
+- fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ());
+-#endif
++ int ncpus;
++ size_t len;
+
+- /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
++ len = sizeof (ncpus);
++ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
++ server->real_ncpu = ncpus - 1;
++ server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
+
+- server->machine.uid = getuid ();
+- server->machine.euid = geteuid ();
+- server->machine.gid = getgid ();
+- server->machine.egid = getegid ();
+ #if defined(__FreeBSD_kernel__)
+ server->os_version_code = __FreeBSD_kernel_version;
+ #else
+ server->os_version_code = __FreeBSD_version;
+ #endif
+- /* Setup machine-specific data */
+- server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
+-
+- if (server->machine.kd == NULL)
+- glibtop_error_io_r (server, "kvm_open");
+-
+- /* Drop priviledges. */
+-
+- if (setreuid (server->machine.euid, server->machine.uid))
+- _exit (1);
+-
+- if (setregid (server->machine.egid, server->machine.gid))
+- _exit (1);
+-
+- /* !!! END OF SUID ROOT PART !!! */
+-
+- /* Our effective uid is now those of the user invoking the server,
+- * so we do no longer have any priviledges. */
+
+- /* NOTE: On FreeBSD, we do not need to be suid root, we just need to
+- * be sgid kmem.
+- *
+- * The server will only use setegid() to get back it's priviledges,
+- * so it will fail if it is suid root and not sgid kmem. */
+ }
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 000000000..3a5a93bfc
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
@@ -0,0 +1,35 @@
+--- sysdeps/freebsd/procmap.c.orig 2009-12-13 18:53:02.827740000 -0500
++++ sysdeps/freebsd/procmap.c 2009-12-13 19:00:04.000000000 -0500
+@@ -85,7 +85,9 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
+ char tagstr[12];
+ struct inode inode;
+ struct cdev_priv priv;
++#if __FreeBSD_version < 800039
+ struct cdev si;
++#endif
+
+ *inum = 0;
+ *dev = 0;
+@@ -111,18 +113,18 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
+ return;
+ }
+
+- if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si,
+- sizeof (si)) != sizeof (si) ||
+ #if __FreeBSD_version >= 800039
+- kvm_read (server->machine.kd, (gulong) cdev2priv(&si), (char *) &priv,
++ if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv,
+ sizeof (priv))
+ #else
++ if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si,
++ sizeof (si)) != sizeof (si) ||
+ kvm_read (server->machine.kd, (gulong) si.si_priv, (char *) &priv,
+ sizeof (priv))
+ #endif
+ != sizeof (priv))
+ {
+- glibtop_warn_io_r (server, "kvm_read (si)");
++ glibtop_warn_io_r (server, "kvm_read (priv)");
+ return;
+ }
+
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
new file mode 100644
index 000000000..0efedfc61
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
@@ -0,0 +1,61 @@
+--- sysdeps/freebsd/procopenfiles.c.orig 2009-12-13 18:53:02.827740000 -0500
++++ sysdeps/freebsd/procopenfiles.c 2009-12-13 18:54:55.000000000 -0500
+@@ -35,6 +35,9 @@
+ #include <sys/user.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#ifdef HAVE_KINFO_GETFILE
++#include <libutil.h>
++#endif
+ #include <string.h>
+ #include <stdlib.h>
+
+@@ -263,9 +266,13 @@ glibtop_get_proc_open_files_s (glibtop *
+ {
+ #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+ struct kinfo_file *freep, *kif;
++#ifndef HAVE_KINFO_GETFILE
+ int name[4];
+ size_t len;
+- size_t i;
++#else
++ int cnt;
++#endif
++ ssize_t i;
+ #else
+ char *output;
+ #endif
+@@ -274,6 +281,7 @@ glibtop_get_proc_open_files_s (glibtop *
+ memset(buf, 0, sizeof (glibtop_proc_open_files));
+
+ #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
++#ifndef HAVE_KINFO_GETFILE
+ name[0] = CTL_KERN;
+ name[1] = KERN_PROC;
+ name[2] = KERN_PROC_FILEDESC;
+@@ -287,12 +295,25 @@ glibtop_get_proc_open_files_s (glibtop *
+ g_free(freep);
+ return NULL;
+ }
++#else
++ freep = kinfo_getfile(pid, &cnt);
++#endif
+
+ entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry));
+
++#ifndef HAVE_KINFO_GETFILE
+ for (i = 0; i < len / sizeof(*kif); i++, kif++) {
+ glibtop_open_files_entry entry = {0};
+
++ if (kif->kf_structsize != sizeof(*kif))
++ continue;
++#else
++ for (i = 0; i < cnt; i++) {
++ glibtop_open_files_entry entry = {0};
++
++ kif = &freep[i];
++#endif
++
+ if (kif->kf_fd < 0)
+ continue;
+
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
new file mode 100644
index 000000000..8fd7fffff
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
@@ -0,0 +1,67 @@
+--- sysdeps/freebsd/procwd.c.orig 2009-12-13 18:53:02.827740000 -0500
++++ sysdeps/freebsd/procwd.c 2009-12-13 18:59:27.000000000 -0500
+@@ -27,6 +27,9 @@
+ #include <sys/sysctl.h>
+ #include <sys/param.h>
+ #include <sys/user.h>
++#ifdef HAVE_KINFO_GETFILE
++#include <libutil.h>
++#endif
+ #include <string.h>
+
+ static const unsigned long _glibtop_sysdeps_proc_wd =
+@@ -40,7 +43,7 @@ _glibtop_init_proc_wd_s(glibtop *server)
+ server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd;
+ }
+
+-#if (__FreeBSD_version >= 800000 && __FreeBSD_version < 800019) || _FreeBSD_version < 700104
++#if (__FreeBSD_version >= 800000 && __FreeBSD_version < 800019) || __FreeBSD_version < 700104
+ static GPtrArray *
+ parse_output(const char *output, glibtop_proc_wd *buf)
+ {
+@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g
+ #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+ struct kinfo_file *freep, *kif;
+ GPtrArray *dirs;
++#ifndef HAVE_KINFO_GETFILE
+ size_t len;
+- int i;
+ int name[4];
+ #else
++ int cnt;
++#endif
++ int i;
++#else
+ char *output;
+ #endif
+
+@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g
+ buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
+
+ #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
++#ifndef HAVE_KINFO_GETFILE
+ name[0] = CTL_KERN;
+ name[1] = KERN_PROC;
+ name[2] = KERN_PROC_FILEDESC;
+@@ -127,10 +135,21 @@ glibtop_get_proc_wd_s(glibtop *server, g
+ g_free(freep);
+ return NULL;
+ }
++#else
++ freep = kinfo_getfile(pid, &cnt);
++#endif
+
+ dirs = g_ptr_array_sized_new(1);
+
++#ifndef HAVE_KINFO_GETFILE
+ for (i = 0; i < len / sizeof(*kif); i++, kif++) {
++ if (kif->kf_structsize != sizeof(*kif))
++ continue;
++#else
++ for (i = 0; i < cnt; i++) {
++ kif = &freep[i];
++#endif
++
+ switch (kif->kf_fd) {
+ case KF_FD_TYPE_ROOT:
+ g_strlcpy(buf->root, kif->kf_path,
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c
new file mode 100644
index 000000000..dec0ffb49
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c
@@ -0,0 +1,95 @@
+--- sysdeps/freebsd/suid_open.c.orig 2009-12-13 13:47:12.739004000 -0500
++++ sysdeps/freebsd/suid_open.c 2009-12-13 18:37:51.000000000 -0500
+@@ -0,0 +1,92 @@
++/* Copyright (C) 1998 Joshua Sled
++ This file is part of LibGTop 1.0.
++
++ Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998.
++
++ LibGTop is free software; you can redistribute it and/or modify it
++ under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License,
++ or (at your option) any later version.
++
++ LibGTop is distributed in the hope that it will be useful, but WITHOUT
++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with LibGTop; see the file COPYING. If not, write to the
++ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ Boston, MA 02111-1307, USA.
++*/
++
++#include <config.h>
++#include <glibtop.h>
++#include <glibtop/error.h>
++#include <glibtop/cpu.h>
++#include <glibtop/open.h>
++#include <glibtop/init_hooks.h>
++
++
++/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
++
++void
++glibtop_init_p (glibtop *server, const unsigned long features,
++ const unsigned flags)
++{
++ const _glibtop_init_func_t *init_fkt;
++
++ if (server == NULL)
++ glibtop_error_r (NULL, "glibtop_init_p (server == NULL)");
++
++ /* Do the initialization, but only if not already initialized. */
++
++ if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) {
++ glibtop_open_p (server, "glibtop", features, flags);
++
++ for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++)
++ (*init_fkt) (server);
++
++ server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
++ }
++}
++
++void
++glibtop_open_p (glibtop *server, const char *program_name,
++ const unsigned long features,
++ const unsigned flags)
++{
++ char errbuf[_POSIX2_LINE_MAX];
++#ifdef DEBUG
++ fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ());
++#endif
++
++ /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
++ server->machine.uid = getuid ();
++ server->machine.euid = geteuid ();
++ server->machine.gid = getgid ();
++ server->machine.egid = getegid ();
++ /* Setup machine-specific data */
++ server->machine.kd = kvm_openfiles (NULL, NULL, NULL, O_RDONLY, errbuf);
++
++ if (server->machine.kd == NULL)
++ glibtop_error_io_r (server, "kvm_open");
++
++ /* Drop priviledges. */
++
++ if (setreuid (server->machine.euid, server->machine.uid))
++ _exit (1);
++
++ if (setregid (server->machine.egid, server->machine.gid))
++ _exit (1);
++
++ /* !!! END OF SUID ROOT PART !!! */
++
++ /* Our effective uid is now those of the user invoking the server,
++ * so we do no longer have any priviledges. */
++
++ /* NOTE: On FreeBSD, we do not need to be suid root, we just need to
++ * be sgid kmem.
++ *
++ * The server will only use setegid() to get back it's priviledges,
++ * so it will fail if it is suid root and not sgid kmem. */
++}
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c
new file mode 100644
index 000000000..ab5fdd66d
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c
@@ -0,0 +1,13 @@
+--- sysdeps/freebsd/sysinfo.c.orig 2008-05-23 18:13:23.000000000 -0400
++++ sysdeps/freebsd/sysinfo.c 2008-09-29 14:35:25.000000000 -0400
+@@ -45,8 +45,8 @@ init_sysinfo (glibtop *server)
+
+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
+
+- len = sizeof (ncpus);
+- sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
++ ncpus = server->ncpu + 1;
++
+ len = 0;
+ sysctlbyname ("hw.model", NULL, &len, NULL, 0);
+ model = g_malloc (len);
diff --git a/devel/libgtop/files/pkg-message b/devel/libgtop/files/pkg-message
new file mode 100644
index 000000000..dacaf62a9
--- /dev/null
+++ b/devel/libgtop/files/pkg-message
@@ -0,0 +1,13 @@
+===============================================================================
+
+In order to use the File System read/write monitor, you must chmod
+/dev/devstat so that all users can open it read-only. For example:
+
+# chmod 0444 /dev/devstat
+
+In order for this to persist across reboots, add the following to
+/etc/devfs.conf:
+
+perm devstat 0444
+
+===============================================================================
generated by cgit (git 2.34.1) at 2025-10-22 19:55:01 +0800