Hi, while looking at collectd, i also realized our libstatgrab port is ... also ancient and crufty. sigh. So here's an update to libstatgrab itself, all of our patches got magically merged upstream, all regress tests pass. The api changed, so i also had to update p5-Unix-Statgrab, not all tests pass but that was also broken before - i also ported py-statgrab, which was rotting in mystuff since 2012 - all of its tests also pass.
Of course, some patches are also needed to build collectd with that version, they're also attached. Only dead corpse is luastatgrab, which seems dead upstream since 2010, so id mark it BROKEN, and jasper told me he'd look into updating it to use the newer libstatgrab api. Comments/tests/oks welcome. Collectd seems happy with it at runtime. Landry
? libstatgrab-0.17-libstatgrab.so.0.0 ? libstatgrab-0.91-libstatgrab.so.0.0 ? regress Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/libstatgrab/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- Makefile 21 Mar 2013 08:48:54 -0000 1.9 +++ Makefile 22 Sep 2014 21:02:48 -0000 @@ -2,24 +2,22 @@ COMMENT= system statistics gathering library -DISTNAME= libstatgrab-0.17 +DISTNAME= libstatgrab-0.91 CATEGORIES= sysutils HOMEPAGE= http://www.i-scream.org/libstatgrab/ MAINTAINER= William Yodlowsky <will...@openbsd.org> -SHARED_LIBS += statgrab 0.0 # 8.3 +SHARED_LIBS += statgrab 1.0 # 10.0 # LGPLv2.1/GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c ncurses +WANTLIB= c ncurses m pthread -MASTER_SITES= ftp://ftp.i-scream.org/pub/i-scream/libstatgrab/ \ - ftp://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/ - -NO_TEST= Yes +MASTER_SITES= http://ftp.i-scream.org/pub/i-scream/libstatgrab/ \ + fhttp://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/ CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--disable-setgid-binaries \ Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/libstatgrab/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 30 May 2012 13:12:32 -0000 1.2 +++ distinfo 22 Sep 2014 21:02:48 -0000 @@ -1,5 +1,2 @@ -MD5 (libstatgrab-0.17.tar.gz) = WDhck5KJi+Own/xePr6HFw== -RMD160 (libstatgrab-0.17.tar.gz) = WGWSYmq7KrT/iUcFnV4p06eVEvM= -SHA1 (libstatgrab-0.17.tar.gz) = w/FGrFuqacoPhSHFptqm5shgPuU= -SHA256 (libstatgrab-0.17.tar.gz) = u6qIxr3ovTzycguBomUozAVafoPk6jvbHQo8QofM64g= -SIZE (libstatgrab-0.17.tar.gz) = 463224 +SHA256 (libstatgrab-0.91.tar.gz) = A+kyjkhXwsncwbA0dySuTNdBpy7hGsyZF4To70W38as= +SIZE (libstatgrab-0.91.tar.gz) = 776046 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 30 May 2012 13:12:32 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-configure,v 1.2 2012/05/30 13:12:32 jasper Exp $ ---- configure.orig Sun Feb 21 11:09:10 2010 -+++ configure Tue May 29 21:55:01 2012 -@@ -20557,6 +20557,7 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/types.h> - #include <sys/disk.h> - - int Index: patches/patch-src_libstatgrab_cpu_stats_c =================================================================== RCS file: patches/patch-src_libstatgrab_cpu_stats_c diff -N patches/patch-src_libstatgrab_cpu_stats_c --- patches/patch-src_libstatgrab_cpu_stats_c 17 Sep 2014 05:35:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_libstatgrab_cpu_stats_c,v 1.1 2014/09/17 05:35:16 espie Exp $ ---- src/libstatgrab/cpu_stats.c.orig Tue Sep 16 23:29:56 2014 -+++ src/libstatgrab/cpu_stats.c Tue Sep 16 23:30:18 2014 -@@ -48,7 +48,7 @@ - #ifdef OPENBSD - #include <sys/param.h> - #include <sys/sysctl.h> --#include <sys/dkstat.h> -+#include <sys/sched.h> - #endif - #ifdef HPUX - #include <sys/param.h> Index: patches/patch-src_libstatgrab_memory_stats_c =================================================================== RCS file: patches/patch-src_libstatgrab_memory_stats_c diff -N patches/patch-src_libstatgrab_memory_stats_c --- patches/patch-src_libstatgrab_memory_stats_c 8 Jul 2014 10:15:39 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_libstatgrab_memory_stats_c,v 1.2 2014/07/08 10:15:39 sthen Exp $ - -Fix implicit declarations of sysconf() and bzero(). - ---- src/libstatgrab/memory_stats.c.orig Sun Feb 21 10:04:26 2010 -+++ src/libstatgrab/memory_stats.c Tue Jul 8 11:09:23 2014 -@@ -47,9 +47,11 @@ - #endif - #if defined(OPENBSD) - #include <sys/param.h> --#include <sys/types.h> - #include <sys/sysctl.h> - #include <sys/unistd.h> -+#include <sys/vmmeter.h> -+#include <unistd.h> -+#include <string.h> - #endif - #ifdef HPUX - #include <sys/param.h> Index: patches/patch-src_libstatgrab_page_stats_c =================================================================== RCS file: patches/patch-src_libstatgrab_page_stats_c diff -N patches/patch-src_libstatgrab_page_stats_c --- patches/patch-src_libstatgrab_page_stats_c 9 Jul 2014 11:23:34 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-src_libstatgrab_page_stats_c,v 1.2 2014/07/09 11:23:34 sthen Exp $ ---- src/libstatgrab/page_stats.c.orig Sat Sep 24 07:29:22 2005 -+++ src/libstatgrab/page_stats.c Wed Jul 9 05:21:40 2014 -@@ -43,6 +43,14 @@ - #endif - #if defined(NETBSD) || defined(OPENBSD) - #include <sys/param.h> -+#include <sys/sysctl.h> -+ -+#if defined(OPENBSD) -+#include <sys/mutex.h> -+/* XXX until uvm gets cleaned up */ -+typedef int boolean_t; -+#endif -+ - #include <uvm/uvm.h> - #endif - #ifdef WIN32 Index: patches/patch-src_libstatgrab_process_stats_c =================================================================== RCS file: patches/patch-src_libstatgrab_process_stats_c diff -N patches/patch-src_libstatgrab_process_stats_c --- patches/patch-src_libstatgrab_process_stats_c 6 Jul 2011 12:45:04 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,144 +0,0 @@ -$OpenBSD: patch-src_libstatgrab_process_stats_c,v 1.2 2011/07/06 12:45:04 jasper Exp $ ---- src/libstatgrab/process_stats.c.orig Mon Oct 9 16:47:58 2006 -+++ src/libstatgrab/process_stats.c Wed Jul 6 14:39:36 2011 -@@ -105,7 +105,7 @@ sg_process_stats *sg_get_process_stats(int *entries){ - int num, i; - #endif - #ifdef ALLBSD -- int mib[4]; -+ int mib[6]; - size_t size; - struct kinfo_proc *kp_stats; - int procs, i; -@@ -349,27 +349,31 @@ sg_process_stats *sg_get_process_stats(int *entries){ - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_ALL; -+ mib[3] = 0; -+ mib[4] = sizeof(struct kinfo_proc); -+ mib[5] = 0; - -- if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { -+ if(sysctl(mib, 6, NULL, &size, NULL, 0) < 0) { - sg_set_error_with_errno(SG_ERROR_SYSCTL, - "CTL_KERN.KERN_PROC.KERN_PROC_ALL"); - return NULL; - } - -- procs = size / sizeof(struct kinfo_proc); -- -+ size = 5 * size / 4; - kp_stats = sg_malloc(size); - if(kp_stats == NULL) { - return NULL; - } - memset(kp_stats, 0, size); - -- if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) { -+ mib[5] = (int)(size / sizeof(struct kinfo_proc)); -+ if(sysctl(mib, 6, kp_stats, &size, NULL, 0) < 0) { - sg_set_error_with_errno(SG_ERROR_SYSCTL, - "CTL_KERN.KERN_PROC.KERN_PROC_ALL"); - free(kp_stats); - return NULL; - } -+ procs = (int)(size / sizeof(struct kinfo_proc)); - - #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) - kvmd = sg_get_kvm2(); -@@ -381,7 +385,7 @@ sg_process_stats *sg_get_process_stats(int *entries){ - #ifdef FREEBSD5 - if (kp_stats[i].ki_stat == 0) { - #else -- if (kp_stats[i].kp_proc.p_stat == 0) { -+ if (kp_stats[i].p_stat == 0) { - #endif - /* FreeBSD 5 deliberately overallocates the array that - * the sysctl returns, so we'll get a few junk -@@ -401,7 +405,7 @@ sg_process_stats *sg_get_process_stats(int *entries){ - #elif defined(DFBSD) - name = kp_stats[i].kp_thread.td_comm; - #else -- name = kp_stats[i].kp_proc.p_comm; -+ name = kp_stats[i].p_comm; - #endif - if (sg_update_string(&proc_state_ptr->process_name, name) < 0) { - return NULL; -@@ -414,7 +418,7 @@ sg_process_stats *sg_get_process_stats(int *entries){ - mib[3] = kp_stats[i].ki_pid; - #else - mib[1] = KERN_PROC_ARGS; -- mib[2] = kp_stats[i].kp_proc.p_pid; -+ mib[2] = kp_stats[i].p_pid; - mib[3] = KERN_PROC_ARGV; - #endif - -@@ -524,9 +528,9 @@ sg_process_stats *sg_get_process_stats(int *entries){ - proc_state_ptr->parent = kp_stats[i].ki_ppid; - proc_state_ptr->pgid = kp_stats[i].ki_pgid; - #else -- proc_state_ptr->pid = kp_stats[i].kp_proc.p_pid; -- proc_state_ptr->parent = kp_stats[i].kp_eproc.e_ppid; -- proc_state_ptr->pgid = kp_stats[i].kp_eproc.e_pgid; -+ proc_state_ptr->pid = kp_stats[i].p_pid; -+ proc_state_ptr->parent = kp_stats[i].p_ppid; -+ proc_state_ptr->pgid = kp_stats[i].p__pgid; - #endif - - #ifdef FREEBSD5 -@@ -540,10 +544,10 @@ sg_process_stats *sg_get_process_stats(int *entries){ - proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid; - proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid; - #else -- proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid; -- proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid; -- proc_state_ptr->gid = kp_stats[i].kp_eproc.e_pcred.p_rgid; -- proc_state_ptr->egid = kp_stats[i].kp_eproc.e_pcred.p_svgid; -+ proc_state_ptr->uid = kp_stats[i].p_ruid; -+ proc_state_ptr->euid = kp_stats[i].p_svuid; -+ proc_state_ptr->gid = kp_stats[i].p_rgid; -+ proc_state_ptr->egid = kp_stats[i].p_svgid; - #endif - - #ifdef FREEBSD5 -@@ -558,13 +562,13 @@ sg_process_stats *sg_get_process_stats(int *entries){ - proc_state_ptr->nice = kp_stats[i].ki_nice; - #else - proc_state_ptr->proc_size = -- kp_stats[i].kp_eproc.e_vm.vm_map.size; -+ kp_stats[i].p_vm_map_size; - /* This is in pages */ - proc_state_ptr->proc_resident = -- kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize(); -+ kp_stats[i].p_vm_rssize * getpagesize(); - #if defined(NETBSD) || defined(OPENBSD) - proc_state_ptr->time_spent = -- kp_stats[i].kp_proc.p_rtime.tv_sec; -+ kp_stats[i].p_rtime_sec; - #elif defined(DFBSD) - proc_state_ptr->time_spent = - ( kp_stats[i].kp_thread.td_uticks + -@@ -573,11 +577,11 @@ sg_process_stats *sg_get_process_stats(int *entries){ - #else - /* This is in microseconds */ - proc_state_ptr->time_spent = -- kp_stats[i].kp_proc.p_runtime / 1000000; -+ kp_stats[i].p_runtime / 1000000; - #endif - proc_state_ptr->cpu_percent = -- ((double)kp_stats[i].kp_proc.p_pctcpu / FSCALE) * 100.0; -- proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice; -+ ((double)kp_stats[i].p_pctcpu / FSCALE) * 100.0; -+ proc_state_ptr->nice = kp_stats[i].p_nice; - #endif - - #ifdef NETBSD2 -@@ -653,7 +657,7 @@ sg_process_stats *sg_get_process_stats(int *entries){ - #ifdef FREEBSD5 - switch (kp_stats[i].ki_stat) { - #else -- switch (kp_stats[i].kp_proc.p_stat) { -+ switch (kp_stats[i].p_stat) { - #endif - case SIDL: - case SRUN: Index: patches/patch-src_libstatgrab_swap_stats_c =================================================================== RCS file: patches/patch-src_libstatgrab_swap_stats_c diff -N patches/patch-src_libstatgrab_swap_stats_c --- patches/patch-src_libstatgrab_swap_stats_c 9 Jul 2014 11:23:34 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_libstatgrab_swap_stats_c,v 1.2 2014/07/09 11:23:34 sthen Exp $ ---- src/libstatgrab/swap_stats.c.orig Thu Jul 5 10:46:06 2007 -+++ src/libstatgrab/swap_stats.c Wed Jul 9 05:22:32 2014 -@@ -49,7 +49,15 @@ - #endif - #if defined(NETBSD) || defined(OPENBSD) - #include <sys/param.h> -+#include <sys/sysctl.h> - #include <sys/time.h> -+ -+#if defined(OPENBSD) -+#include <sys/mutex.h> -+/* XXX until uvm gets cleaned up */ -+typedef int boolean_t; -+#endif -+ - #include <uvm/uvm.h> - #include <unistd.h> - #endif Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- pkg/PFRAG.shared 17 Jul 2007 23:45:43 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/07/17 23:45:43 simon Exp $ -@lib lib/libstatgrab.so.${LIBstatgrab_VERSION} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/libstatgrab/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- pkg/PLIST 18 Jan 2010 22:03:46 -0000 1.2 +++ pkg/PLIST 22 Sep 2014 21:02:48 -0000 @@ -1,5 +1,4 @@ @comment $OpenBSD: PLIST,v 1.2 2010/01/18 22:03:46 okan Exp $ -%%SHARED%% @bin bin/saidar @bin bin/statgrab bin/statgrab-make-mrtg-config @@ -7,28 +6,119 @@ include/statgrab.h lib/libstatgrab.a lib/libstatgrab.la -lib/pkgconfig/ +@lib lib/libstatgrab.so.${LIBstatgrab_VERSION} lib/pkgconfig/libstatgrab.pc @man man/man1/saidar.1 @man man/man1/statgrab-make-mrtg-config.1 @man man/man1/statgrab-make-mrtg-index.1 @man man/man1/statgrab.1 +@man man/man3/libstatgrab.3 +@man man/man3/sg_clear_error.3 +@man man/man3/sg_comp_destroy.3 +@man man/man3/sg_comp_get_tls.3 +@man man/man3/sg_comp_init.3 +@man man/man3/sg_disk_io_compare_name.3 +@man man/man3/sg_disk_io_compare_traffic.3 +@man man/man3/sg_drop_privileges.3 +@man man/man3/sg_free_cpu_stats.3 +@man man/man3/sg_free_disk_io_stats.3 +@man man/man3/sg_free_fs_stats.3 +@man man/man3/sg_free_host_info.3 +@man man/man3/sg_free_load_stats.3 +@man man/man3/sg_free_mem_stats.3 +@man man/man3/sg_free_network_iface_stats.3 +@man man/man3/sg_free_network_io_stats.3 +@man man/man3/sg_free_page_stats.3 +@man man/man3/sg_free_process_count.3 +@man man/man3/sg_free_stats_buf.3 +@man man/man3/sg_free_swap_stats.3 +@man man/man3/sg_free_user_stats.3 +@man man/man3/sg_fs_compare_device_name.3 +@man man/man3/sg_fs_compare_mnt_point.3 @man man/man3/sg_get_cpu_percents.3 +@man man/man3/sg_get_cpu_percents_of.3 +@man man/man3/sg_get_cpu_percents_r.3 @man man/man3/sg_get_cpu_stats.3 @man man/man3/sg_get_cpu_stats_diff.3 +@man man/man3/sg_get_cpu_stats_diff_between.3 +@man man/man3/sg_get_cpu_stats_r.3 @man man/man3/sg_get_disk_io_stats.3 @man man/man3/sg_get_disk_io_stats_diff.3 +@man man/man3/sg_get_disk_io_stats_diff_between.3 +@man man/man3/sg_get_disk_io_stats_r.3 +@man man/man3/sg_get_error.3 +@man man/man3/sg_get_error_arg.3 +@man man/man3/sg_get_error_details.3 +@man man/man3/sg_get_error_errno.3 @man man/man3/sg_get_fs_stats.3 +@man man/man3/sg_get_fs_stats_diff.3 +@man man/man3/sg_get_fs_stats_diff_between.3 +@man man/man3/sg_get_fs_stats_r.3 @man man/man3/sg_get_host_info.3 +@man man/man3/sg_get_host_info_r.3 @man man/man3/sg_get_load_stats.3 +@man man/man3/sg_get_load_stats_r.3 @man man/man3/sg_get_mem_stats.3 +@man man/man3/sg_get_mem_stats_r.3 +@man man/man3/sg_get_nelements.3 @man man/man3/sg_get_network_iface_stats.3 +@man man/man3/sg_get_network_iface_stats_r.3 @man man/man3/sg_get_network_io_stats.3 @man man/man3/sg_get_network_io_stats_diff.3 +@man man/man3/sg_get_network_io_stats_diff_between.3 +@man man/man3/sg_get_network_io_stats_r.3 @man man/man3/sg_get_page_stats.3 @man man/man3/sg_get_page_stats_diff.3 +@man man/man3/sg_get_page_stats_diff_between.3 +@man man/man3/sg_get_page_stats_r.3 @man man/man3/sg_get_process_count.3 +@man man/man3/sg_get_process_count_of.3 +@man man/man3/sg_get_process_count_r.3 @man man/man3/sg_get_process_stats.3 +@man man/man3/sg_get_process_stats_r.3 @man man/man3/sg_get_swap_stats.3 +@man man/man3/sg_get_swap_stats_r.3 @man man/man3/sg_get_user_stats.3 +@man man/man3/sg_get_user_stats_r.3 +@man man/man3/sg_get_valid_filesystems.3 +@man man/man3/sg_global_lock.3 +@man man/man3/sg_global_unlock.3 +@man man/man3/sg_init.3 +@man man/man3/sg_internal-intro.3 +@man man/man3/sg_intro.3 +@man man/man3/sg_lock_mutex.3 +@man man/man3/sg_network_iface_compare_name.3 +@man man/man3/sg_network_io_compare_name.3 +@man man/man3/sg_process_compare_cpu.3 +@man man/man3/sg_process_compare_gid.3 +@man man/man3/sg_process_compare_name.3 +@man man/man3/sg_process_compare_pid.3 +@man man/man3/sg_process_compare_res.3 +@man man/man3/sg_process_compare_size.3 +@man man/man3/sg_process_compare_time.3 +@man man/man3/sg_process_compare_uid.3 +@man man/man3/sg_prove_vector.3 +@man man/man3/sg_set_error.3 +@man man/man3/sg_set_error_with_errno.3 +@man man/man3/sg_set_error_with_errno_code.3 +@man man/man3/sg_set_valid_filesystems.3 +@man man/man3/sg_shutdown.3 +@man man/man3/sg_snapshot.3 +@man man/man3/sg_str_error.3 +@man man/man3/sg_strperror.3 +@man man/man3/sg_unlock_mutex.3 +@man man/man3/sg_vector_clear.3 +@man man/man3/sg_vector_clone.3 +@man man/man3/sg_vector_clone_into.3 +@man man/man3/sg_vector_compute_diff.3 +@man man/man3/sg_vector_create.3 +@man man/man3/sg_vector_free.3 +@man man/man3/sg_vector_resize.3 @man man/man3/statgrab.3 +share/doc/libstatgrab/ +share/doc/libstatgrab/AUTHORS +share/doc/libstatgrab/COPYING +share/doc/libstatgrab/COPYING.LGPL +share/doc/libstatgrab/NEWS +share/doc/libstatgrab/PLATFORMS +share/doc/libstatgrab/README
py-statgrab-0.6.tgz
Description: application/tar-gz
? oldverregress.log
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/p5-Unix-Statgrab/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 18 Jun 2014 01:08:56 -0000 1.14
+++ Makefile 22 Sep 2014 21:03:09 -0000
@@ -4,8 +4,7 @@
SHARED_ONLY= Yes
MODULES= cpan
-DISTNAME= Unix-Statgrab-0.04
-REVISION= 6
+DISTNAME= Unix-Statgrab-0.104
CATEGORIES= sysutils
MAINTAINER= William Yodlowsky <will...@openbsd.org>
@@ -15,11 +14,13 @@
WANTLIB += c statgrab
-LIB_DEPENDS= sysutils/libstatgrab
+LIB_DEPENDS= sysutils/libstatgrab>=0.90
CONFIGURE_ARGS= INC="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lstatgrab"
+BUILD_DEPENDS= devel/p5-Config-AutoConf
+CONFIGURE_STYLE= modbuild
MAKE_ENV+= TEST_POD=1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/p5-Unix-Statgrab/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 17 Jul 2007 23:45:48 -0000 1.1.1.1
+++ distinfo 22 Sep 2014 21:03:09 -0000
@@ -1,5 +1,2 @@
-MD5 (Unix-Statgrab-0.04.tar.gz) = lHhwEOJxg85c81TFjEZdDQ==
-RMD160 (Unix-Statgrab-0.04.tar.gz) = uEoXNXGzTbumDmsoPnaTTakPTE8=
-SHA1 (Unix-Statgrab-0.04.tar.gz) = tmSSP8c5glS/g/IDfFDU4BICh5w=
-SHA256 (Unix-Statgrab-0.04.tar.gz) =
uZ81PJpN2RE8TVzqM7N0ybYNmgFlMAKyFtRGMV9TI+E=
-SIZE (Unix-Statgrab-0.04.tar.gz) = 23653
+SHA256 (Unix-Statgrab-0.104.tar.gz) =
+VNRxZCSc4B3G4/9DD9KO+9e9XGiTHqjfcPPGiR7s4Q=
+SIZE (Unix-Statgrab-0.104.tar.gz) = 72480
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/p5-Unix-Statgrab/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 14 Jun 2014 23:26:01 -0000 1.2
+++ pkg/PLIST 22 Sep 2014 21:03:09 -0000
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.2 2014/06/14 23:26:01 sthen Exp $
${P5ARCH}/
${P5ARCH}/Unix/
+${P5ARCH}/Unix/Statgrab/
${P5ARCH}/Unix/Statgrab.pm
+${P5ARCH}/Unix/Statgrab/ConfigData.pm
${P5ARCH}/auto/
${P5ARCH}/auto/Unix/
${P5ARCH}/auto/Unix/Statgrab/
@@ -9,3 +11,4 @@
${P5ARCH}/auto/Unix/Statgrab/Statgrab.so
${P5ARCH}/auto/Unix/Statgrab/autosplit.ix
@man man/man3p/Unix::Statgrab.3p
+@man man/man3p/Unix::Statgrab::ConfigData.3p
$OpenBSD$ https://github.com/collectd/collectd/issues/445 http://svnweb.freebsd.org/ports?view=revision&revision=353903 http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/sysutils/collectd/patches/patch-src_collectd.c?rev=1.1&content-type=text/x-cvsweb-markup --- src/collectd.c.orig Mon Sep 22 22:40:21 2014 +++ src/collectd.c Mon Sep 22 22:40:28 2014 @@ -288,7 +288,7 @@ static int do_init (void) #endif #if HAVE_LIBSTATGRAB - if (sg_init ()) + if (sg_init (0)) { ERROR ("sg_init: %s", sg_str_error (sg_get_error ())); return (-1); $OpenBSD$ Fix build with libstatgrab >= 0.90 >From http://svnweb.freebsd.org/ports?view=revision&revision=360770 --- src/users.c.orig Mon Sep 22 22:36:50 2014 +++ src/users.c Mon Sep 22 22:37:17 2014 @@ -101,12 +101,13 @@ static int users_read (void) #elif HAVE_LIBSTATGRAB sg_user_stats *us; + size_t num_entries; - us = sg_get_user_stats (); + us = sg_get_user_stats (&num_entries); if (us == NULL) return (-1); - users_submit ((gauge_t) us->num_entries); + users_submit ((gauge_t) num_entries); /* #endif HAVE_LIBSTATGRAB */ #else
