[Midnightbsd-cvs] mports [19950] trunk/devel/libgtop: libgtop 2.30
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 22 17:38:17 EDT 2015
Revision: 19950
http://svnweb.midnightbsd.org/mports/?rev=19950
Author: laffer1
Date: 2015-08-22 17:38:15 -0400 (Sat, 22 Aug 2015)
Log Message:
-----------
libgtop 2.30
Modified Paths:
--------------
trunk/devel/libgtop/Makefile
trunk/devel/libgtop/distinfo
trunk/devel/libgtop/files/patch-configure
trunk/devel/libgtop/pkg-plist
Removed Paths:
-------------
trunk/devel/libgtop/files/patch-libgtop-sysdeps.m4
trunk/devel/libgtop/files/patch-src_daemon_server.c
trunk/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am
trunk/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
trunk/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c
trunk/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h
trunk/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c
trunk/devel/libgtop/files/patch-sysdeps_freebsd_open.c
trunk/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
trunk/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
trunk/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
trunk/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c
trunk/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c
Property Changed:
----------------
trunk/devel/libgtop/files/patch-configure
Modified: trunk/devel/libgtop/Makefile
===================================================================
--- trunk/devel/libgtop/Makefile 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/Makefile 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= libgtop
-PORTVERSION= 2.28.2
-PORTREVISION= 2
+PORTVERSION= 2.30.0
+PORTREVISION= 5
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -10,34 +10,18 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= GNOME 2 top library
-LICENSE= gpl2
-
-BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-
-USES= pkgconfig gettext gmake tar:bzip2 libtool
-USE_PERL5_BUILD=yes
+USE_PERL5= build
+USE_XORG= xau
+USES= gettext gmake libtool makeinfo pathfix perl5 pkgconfig tar:xz
USE_GNOME= gnomeprefix glib20 intlhack introspection:build
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --disable-gtk-doc \
- --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H" \
- LDFLAGS="-L${LOCALBASE}/lib -lgeom -ldevstat"
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsd7.0
-CFLAGS+= -D__FreeBSD_version=700055
+GNU_CONFIGURE= yes
+LDFLAGS+= -L${LOCALBASE}/lib -lutil
+INSTALL_TARGET= install-strip
+CONFIGURE_ARGS= --enable-introspection
INFO= libgtop2
PKGMESSAGE= ${FILESDIR}/pkg-message
-.include <bsd.port.pre.mk>
-
-post-patch:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
-
-post-install:
- @${CHGRP} kmem ${PREFIX}/bin/libgtop_server2
- @${CHMOD} 2555 ${PREFIX}/bin/libgtop_server2
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/devel/libgtop/distinfo
===================================================================
--- trunk/devel/libgtop/distinfo 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/distinfo 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,3 +1,2 @@
-SHA256 (gnome2/libgtop-2.28.2.tar.bz2) = 49958d7da1f76b257bfd0d557d8ed2b218a5ab0d31b59fed1c32ddf2a1529f5d
-RMD160 (gnome2/libgtop-2.28.2.tar.bz2) = 61b1ac4e9c7212a04ff4591edd1a1c154f689627
-SIZE (gnome2/libgtop-2.28.2.tar.bz2) = 766124
+SHA256 (gnome2/libgtop-2.30.0.tar.xz) = 463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5
+SIZE (gnome2/libgtop-2.30.0.tar.xz) = 664476
Modified: trunk/devel/libgtop/files/patch-configure
===================================================================
--- trunk/devel/libgtop/files/patch-configure 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-configure 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,10 +1,10 @@
---- 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
+--- configure.orig 2014-04-29 10:12:29.633996234 +0000
++++ configure 2014-04-29 10:14:19.976988652 +0000
+@@ -13638,6 +13638,79 @@
+
+ done
+
++ { 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
@@ -47,20 +47,20 @@
+ 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 -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
++ $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
++ 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
++ 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
@@ -67,15 +67,16 @@
+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
-
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for I4B" >&5
+ $as_echo_n "checking for I4B... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
Property changes on: trunk/devel/libgtop/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/devel/libgtop/files/patch-libgtop-sysdeps.m4
===================================================================
--- trunk/devel/libgtop/files/patch-libgtop-sysdeps.m4 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-libgtop-sysdeps.m4 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,12 +0,0 @@
---- 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
-
Deleted: trunk/devel/libgtop/files/patch-src_daemon_server.c
===================================================================
--- trunk/devel/libgtop/files/patch-src_daemon_server.c 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-src_daemon_server.c 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,17 +0,0 @@
---- 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
-
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,17 +0,0 @@
---- 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 \
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,43 +0,0 @@
---- 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 at ./$(DEPDIR)/netlist.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netload.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nosuid.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/suid_open.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/open.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ppp.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/procaffinity.Plo at am__quote@
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,66 +0,0 @@
---- 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;
-
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,10 +0,0 @@
---- 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>
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,19 +0,0 @@
---- 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)
- { }
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_open.c
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_open.c 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_open.c 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,91 +0,0 @@
---- 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. */
- }
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,35 +0,0 @@
---- 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;
- }
-
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,61 +0,0 @@
---- 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;
-
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,89 +0,0 @@
---- sysdeps/freebsd/procwd.c.orig 2009-04-19 19:51:00.000000000 +0200
-+++ sysdeps/freebsd/procwd.c 2010-05-07 13:17:54.000000000 +0200
-@@ -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)
- {
-@@ -97,24 +100,39 @@ parse_output(const char *output, glibtop
- char**
- glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
- {
-- char path[MAXPATHLEN];
-+ int exe_mib[4];
-+ size_t len;
- #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
- struct kinfo_file *freep, *kif;
- GPtrArray *dirs;
-- size_t len;
-- int i;
-+#ifndef HAVE_KINFO_GETFILE
- int name[4];
- #else
-+ int cnt;
-+#endif
-+ int i;
-+#else
- char *output;
- #endif
-
- memset (buf, 0, sizeof (glibtop_proc_wd));
-+ len = 0;
-
-- g_snprintf(path, sizeof(path), "/proc/%u/file", pid);
-- if (safe_readlink(path, buf->exe, sizeof(buf->exe)))
-- buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
-+ exe_mib[0] = CTL_KERN;
-+ exe_mib[1] = KERN_PROC;
-+ exe_mib[2] = KERN_PROC_PATHNAME;
-+ exe_mib[3] = pid;
-+
-+ if (sysctl(exe_mib, 4, NULL, &len, NULL, 0) == 0) {
-+ if (len > sizeof(buf->exe))
-+ len = sizeof(buf->exe);
-+ if (sysctl(exe_mib, 4, buf->exe, &len, NULL, 0) == 0)
-+ buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
-+ }
-
- #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+#ifndef HAVE_KINFO_GETFILE
-+ len = 0;
- name[0] = CTL_KERN;
- name[1] = KERN_PROC;
- name[2] = KERN_PROC_FILEDESC;
-@@ -127,10 +145,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,
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,95 +0,0 @@
---- 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 at 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. */
-+}
Deleted: trunk/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c
===================================================================
--- trunk/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,13 +0,0 @@
---- 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);
Modified: trunk/devel/libgtop/pkg-plist
===================================================================
--- trunk/devel/libgtop/pkg-plist 2015-08-22 21:33:26 UTC (rev 19949)
+++ trunk/devel/libgtop/pkg-plist 2015-08-22 21:38:15 UTC (rev 19950)
@@ -1,5 +1,9 @@
bin/libgtop_daemon2
+ at group kmem
+ at mode 2555
bin/libgtop_server2
+ at mode
+ at group
include/libgtop-2.0/glibtop.h
include/libgtop-2.0/glibtop/close.h
include/libgtop-2.0/glibtop/command.h
@@ -43,14 +47,16 @@
include/libgtop-2.0/glibtop_server.h
include/libgtop-2.0/glibtop_suid.h
include/libgtop-2.0/libgtopconfig.h
+lib/girepository-1.0/GTop-2.0.typelib
lib/libgtop-2.0.a
-lib/libgtop-2.0.la
lib/libgtop-2.0.so
-lib/libgtop-2.0.so.7
+lib/libgtop-2.0.so.10
+lib/libgtop-2.0.so.10.0.0
libdata/pkgconfig/libgtop-2.0.pc
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left-insensitive.png
%%DOCSDIR%%/left.png
%%DOCSDIR%%/libgtop-Close.html
%%DOCSDIR%%/libgtop-Command.html
@@ -59,6 +65,9 @@
%%DOCSDIR%%/libgtop-Net-List.html
%%DOCSDIR%%/libgtop-Net-Load.html
%%DOCSDIR%%/libgtop-PPP.html
+%%DOCSDIR%%/libgtop-Process-Arguments.html
+%%DOCSDIR%%/libgtop-Process-List.html
+%%DOCSDIR%%/libgtop-Process-Time.html
%%DOCSDIR%%/libgtop-Shared-Memory-Limits.html
%%DOCSDIR%%/libgtop-Uptime.html
%%DOCSDIR%%/libgtop-cpu.html
@@ -70,9 +79,7 @@
%%DOCSDIR%%/libgtop-msg-limits.html
%%DOCSDIR%%/libgtop-open.html
%%DOCSDIR%%/libgtop-parameter.html
-%%DOCSDIR%%/libgtop-procargs.html
%%DOCSDIR%%/libgtop-prockernel.html
-%%DOCSDIR%%/libgtop-proclist.html
%%DOCSDIR%%/libgtop-procmap.html
%%DOCSDIR%%/libgtop-procmem.html
%%DOCSDIR%%/libgtop-procopenfiles.html
@@ -79,7 +86,6 @@
%%DOCSDIR%%/libgtop-procsegment.html
%%DOCSDIR%%/libgtop-procsignal.html
%%DOCSDIR%%/libgtop-procstate.html
-%%DOCSDIR%%/libgtop-proctime.html
%%DOCSDIR%%/libgtop-procuid.html
%%DOCSDIR%%/libgtop-sem-limits.html
%%DOCSDIR%%/libgtop-signal.html
@@ -90,11 +96,13 @@
%%DOCSDIR%%/libgtop-version.html
%%DOCSDIR%%/libgtop-white-paper-overview.html
%%DOCSDIR%%/libgtop-white-paper.html
-%%DOCSDIR%%/libgtop.devhelp
%%DOCSDIR%%/libgtop.devhelp2
+%%DOCSDIR%%/right-insensitive.png
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up-insensitive.png
%%DOCSDIR%%/up.png
+share/gir-1.0/GTop-2.0.gir
share/locale/am/LC_MESSAGES/libgtop-2.0.mo
share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
share/locale/as/LC_MESSAGES/libgtop-2.0.mo
@@ -123,6 +131,7 @@
share/locale/fa/LC_MESSAGES/libgtop-2.0.mo
share/locale/fi/LC_MESSAGES/libgtop-2.0.mo
share/locale/fr/LC_MESSAGES/libgtop-2.0.mo
+share/locale/fur/LC_MESSAGES/libgtop-2.0.mo
share/locale/ga/LC_MESSAGES/libgtop-2.0.mo
share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
share/locale/gu/LC_MESSAGES/libgtop-2.0.mo
@@ -170,8 +179,10 @@
share/locale/sv/LC_MESSAGES/libgtop-2.0.mo
share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
share/locale/te/LC_MESSAGES/libgtop-2.0.mo
+share/locale/tg/LC_MESSAGES/libgtop-2.0.mo
share/locale/th/LC_MESSAGES/libgtop-2.0.mo
share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ug/LC_MESSAGES/libgtop-2.0.mo
share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
share/locale/xh/LC_MESSAGES/libgtop-2.0.mo
@@ -178,44 +189,3 @@
share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
- at dirrm %%DOCSDIR%%
- at dirrm include/libgtop-2.0/glibtop
- at dirrm include/libgtop-2.0
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/xh/LC_MESSAGES
- at dirrmtry share/locale/xh
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
- at dirrmtry share/locale/oc/LC_MESSAGES
- at dirrmtry share/locale/oc
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/mi/LC_MESSAGES
- at dirrmtry share/locale/mi
- at dirrmtry share/locale/mg/LC_MESSAGES
- at dirrmtry share/locale/mg
- at dirrmtry share/locale/mai/LC_MESSAGES
- at dirrmtry share/locale/mai
- at dirrmtry share/locale/la/LC_MESSAGES
- at dirrmtry share/locale/la
- at dirrmtry share/locale/ky/LC_MESSAGES
- at dirrmtry share/locale/ky
- at dirrmtry share/locale/ku/LC_MESSAGES
- at dirrmtry share/locale/ku
- at dirrmtry share/locale/en at shaw/LC_MESSAGES
- at dirrmtry share/locale/en at shaw
- at dirrmtry share/locale/dz/LC_MESSAGES
- at dirrmtry share/locale/dz
- at dirrmtry share/locale/ca at valencia/LC_MESSAGES
- at dirrmtry share/locale/ca at valencia
- at dirrmtry share/locale/bn_IN/LC_MESSAGES
- at dirrmtry share/locale/bn_IN
- at dirrmtry share/locale/ast/LC_MESSAGES
- at dirrmtry share/locale/ast
- at dirrmtry share/locale/as/LC_MESSAGES
- at dirrmtry share/locale/as
More information about the Midnightbsd-cvs
mailing list