Hi,
here's an update to collectd 5.5.1. Please test it on your setups..
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile 22 Apr 2016 15:27:45 -0000 1.37
+++ Makefile 6 Jun 2016 12:32:03 -0000
@@ -10,15 +10,7 @@
COMMENT-memcachec = collectd memcachec plugin
COMMENT-nut = collectd nut plugin
-V = 5.5.0
-REVISION-main = 3
-REVISION-nut = 0
-REVISION-rrdtool = 1
-REVISION-virt = 1
-REVISION-python = 0
-REVISION-memcachec = 0
-REVISION-pgsql = 0
-REVISION-mysql = 0
+V = 5.5.1
DISTNAME = collectd-$V
PKGNAME-main = collectd-$V
PKGNAME-mysql = collectd-mysql-$V
@@ -121,7 +113,7 @@
target_notification target_replace target_scale \
target_set target_v5upgrade tcpconns teamspeak2 ted
unixsock uptime \
users uuid write_http write_graphite pf python virt
memcachec nut \
- aggregation curl_json fhcount log_logstash memcached \
+ aggregation curl_json log_logstash memcached \
threshold write_log write_riemann
.for _plugin in ${ENABLED_PLUGINS}
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 23 Jul 2015 07:33:17 -0000 1.6
+++ distinfo 6 Jun 2016 12:32:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.5.0.tar.gz) = X3z61bJO1PixE8+ycOD55an3w68QRDy1B/1AF0pskCg=
-SIZE (collectd-5.5.0.tar.gz) = 2244454
+SHA256 (collectd-5.5.1.tar.gz) = TbpR1iQ/93hY//H/vv5vZShoH/IZBR8SKqJyfiYnEHk=
+SIZE (collectd-5.5.1.tar.gz) = 2254181
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 31 Jul 2015 12:05:36 -0000 1.5
+++ patches/patch-Makefile_in 6 Jun 2016 12:32:03 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.5 2015/07/31 12:05:36 landry Exp $
dont create var/{run,lib,log}
---- Makefile.in.orig Wed May 27 09:51:48 2015
-+++ Makefile.in Fri Jul 31 13:55:59 2015
-@@ -946,9 +946,6 @@ uninstall-am:
+--- Makefile.in.orig Fri Jan 22 10:55:46 2016
++++ Makefile.in Mon Jun 6 09:18:40 2016
+@@ -947,9 +947,6 @@ uninstall-am:
install-exec-hook:
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/sysutils/collectd/patches/patch-configure,v
retrieving revision 1.9
diff -u -r1.9 patch-configure
--- patches/patch-configure 22 Apr 2016 15:27:45 -0000 1.9
+++ patches/patch-configure 6 Jun 2016 12:32:03 -0000
@@ -4,9 +4,9 @@
- dont check for pcap-bpf.h, not installed on openbsd
- in rrdtool the main librrd.so is now threadsafe, there is no more
librrd_th.so
---- configure.orig Wed May 27 08:51:50 2015
-+++ configure Fri Apr 22 16:21:02 2016
-@@ -17312,7 +17312,7 @@ SAVE_CFLAGS="$CFLAGS"
+--- configure.orig Fri Jan 22 10:55:47 2016
++++ configure Mon Jun 6 09:18:40 2016
+@@ -17470,7 +17470,7 @@ SAVE_CFLAGS="$CFLAGS"
# Emulate behavior of src/Makefile.am
if test "x$GCC" = "xyes"
then
@@ -15,31 +15,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtok_r" >&5
-@@ -23486,23 +23486,7 @@ fi
- done
-
- fi
--if test "x$with_libpcap" = "xyes"
--then
-- for ac_header in pcap-bpf.h
--do :
-- ac_fn_c_check_header_mongrel "$LINENO" "pcap-bpf.h"
"ac_cv_header_pcap_bpf_h" "$ac_includes_default"
--if test "x$ac_cv_header_pcap_bpf_h" = xyes; then :
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_PCAP_BPF_H 1
--_ACEOF
-
--else
-- with_libpcap="no (pcap-bpf.h not found)"
--fi
--
--done
--
--fi
- if test "x$with_libpcap" = "xyes"
- then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libpcap has
PCAP_ERROR_IFACE_NOT_UP" >&5
-@@ -25067,7 +25051,7 @@ then
+@@ -25194,7 +25194,7 @@ then
fi
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_Makefile_in,v
retrieving revision 1.8
diff -u -r1.8 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 23 Jul 2015 07:33:17 -0000 1.8
+++ patches/patch-src_Makefile_in 6 Jun 2016 12:32:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_in,v 1.8 2015/07/23 07:33:17 landry Exp $
---- src/Makefile.in.orig Wed Jun 3 00:09:27 2015
-+++ src/Makefile.in Wed Jun 3 00:13:09 2015
+--- src/Makefile.in.orig Fri Jan 22 10:55:46 2016
++++ src/Makefile.in Mon Jun 6 09:18:40 2016
@@ -80,7 +80,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@@ -10,7 +10,7 @@
sbin_PROGRAMS = collectdmon$(EXEEXT)
bin_PROGRAMS = collectd-nagios$(EXEEXT) collectdctl$(EXEEXT) \
collectd-tg$(EXEEXT)
-@@ -2430,11 +2430,11 @@ top_builddir = @top_builddir@
+@@ -2422,11 +2422,11 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = libcollectdclient $(am__append_1) daemon
PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex
'\<module_register\>'
@@ -24,8 +24,8 @@
$(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \
-DPKGDATADIR='"${pkgdatadir}"'
AUTOMAKE_OPTIONS = subdir-objects
-@@ -5190,13 +5190,8 @@ uninstall-man: uninstall-man1 uninstall-man5
- @HAVE_PROTOC_C_TRUE@ protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
+@@ -5120,13 +5120,8 @@ uninstall-man: uninstall-man1 uninstall-man5
+ @BUILD_PLUGIN_WRITE_RIEMANN_TRUE@ $(AM_V_PROTOC_C)protoc-c -I$(srcdir)
--c_out . $(srcdir)/riemann.proto
install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
Index: patches/patch-src_daemon_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_daemon_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-src_daemon_Makefile_in
--- patches/patch-src_daemon_Makefile_in 27 Jul 2015 14:53:38 -0000
1.1
+++ patches/patch-src_daemon_Makefile_in 6 Jun 2016 12:32:03 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-src_daemon_Makefile_in,v 1.1 2015/07/27 14:53:38 landry Exp $
---- src/daemon/Makefile.in.orig Wed Jun 3 21:17:45 2015
-+++ src/daemon/Makefile.in Wed Jun 3 21:17:20 2015
+--- src/daemon/Makefile.in.orig Fri Jan 22 10:55:46 2016
++++ src/daemon/Makefile.in Mon Jun 6 09:19:46 2016
@@ -79,7 +79,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@BUILD_FEATURE_DAEMON_TRUE@am__append_1 =
-DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
+@BUILD_FEATURE_DAEMON_TRUE@am__append_1 =
-DPIDFILE='"${localstatedir}/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"'
- sbin_PROGRAMS = collectd$(EXEEXT)
-
- # Link to these libraries..
-@@ -710,7 +710,7 @@ top_srcdir = @top_srcdir@
+ @BUILD_WITH_LIBRT_TRUE@am__append_2 = -lrt
+ @BUILD_WITH_LIBPOSIX4_TRUE@am__append_3 = -lposix4
+ @BUILD_WITH_LIBSOCKET_TRUE@am__append_4 = -lsocket
+@@ -713,7 +713,7 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir)/src -DPREFIX='"${prefix}"' \
-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
-DLOCALSTATEDIR='"${localstatedir}"' \
@@ -18,4 +18,4 @@
+ -DPKGLOCALSTATEDIR='"${localstatedir}/${PACKAGE_NAME}"' \
$(am__append_1) -DPLUGINDIR='"${pkglibdir}"' \
-DPKGDATADIR='"${pkgdatadir}"'
- AUTOMAKE_OPTIONS = subdir-objects
+
Index: patches/patch-src_dns_c
===================================================================
RCS file: patches/patch-src_dns_c
diff -N patches/patch-src_dns_c
--- patches/patch-src_dns_c 31 Jul 2015 12:05:36 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_dns_c,v 1.2 2015/07/31 12:05:36 landry Exp $
-We dont install nor need pcap-bpf.h on openbsd
---- src/dns.c.orig Tue Mar 10 15:14:45 2015
-+++ src/dns.c Fri Jul 31 13:55:59 2015
-@@ -34,7 +34,6 @@
- #include <poll.h>
-
- #include <pcap.h>
--#include <pcap-bpf.h>
-
- /*
- * Private data types
Index: patches/patch-src_pf_c
===================================================================
RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_pf_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_pf_c
--- patches/patch-src_pf_c 31 Jul 2015 12:05:36 -0000 1.2
+++ patches/patch-src_pf_c 6 Jun 2016 12:32:03 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_pf_c,v 1.2 2015/07/31 12:05:36 landry Exp $
---- src/pf.c.orig Tue Mar 10 15:14:45 2015
-+++ src/pf.c Fri Jul 31 13:55:59 2015
-@@ -33,6 +33,7 @@
- # include <net/if.h>
+--- src/pf.c.orig Fri Jan 22 10:51:17 2016
++++ src/pf.c Mon Jun 6 09:18:40 2016
+@@ -36,6 +36,7 @@
+ # include <netinet/in.h>
#endif
+#include <netinet/in.h>
Index: patches/patch-src_processes_c
===================================================================
RCS file: patches/patch-src_processes_c
diff -N patches/patch-src_processes_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_processes_c 6 Jun 2016 12:32:03 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+https://github.com/collectd/collectd/issues/1674
+
+--- src/processes.c.orig Mon Jun 6 10:05:24 2016
++++ src/processes.c Mon Jun 6 10:05:35 2016
+@@ -2046,9 +2046,6 @@ static int ps_read (void)
+ pse.io_syscr = -1;
+ pse.io_syscw = -1;
+
+- pse.cswitch_vol = -1;
+- pse.cswitch_invol = -1;
+-
+ ps_list_add (procs[i].p_comm, have_cmdline ? cmdline :
NULL, &pse);
+
+ switch (procs[i].p_stat)
Index: patches/patch-src_tcpconns_c
===================================================================
RCS file: patches/patch-src_tcpconns_c
diff -N patches/patch-src_tcpconns_c
--- patches/patch-src_tcpconns_c 31 Jul 2015 12:06:18 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_tcpconns_c,v 1.7 2015/07/31 12:06:18 landry Exp $
-
-https://github.com/collectd/collectd/commit/924c9af78d535f4920d73a2cd8e5090747479f0f
-
---- src/tcpconns.c.orig Wed May 20 14:04:47 2015
-+++ src/tcpconns.c Fri Jul 31 13:58:04 2015
-@@ -981,7 +981,9 @@ static int conn_read (void)
- #endif
- {
- /* Read the pcb pointed to by `next' into `inpcb' */
-- kread ((u_long) next, &inpcb, sizeof (inpcb));
-+ status = kread ((u_long) next, &inpcb, sizeof (inpcb));
-+ if (status != 0)
-+ return (-1);
-
- /* Advance `next' */
- #if defined(__OpenBSD__) || (defined(__NetBSD_Version__) &&
__NetBSD_Version__ > 699002700)
-@@ -1004,7 +1006,9 @@ static int conn_read (void)
- continue;
- #endif
-
-- kread ((u_long) inpcb.inp_ppcb, &tcpcb, sizeof (tcpcb));
-+ status = kread ((u_long) inpcb.inp_ppcb, &tcpcb, sizeof (tcpcb));
-+ if (status != 0)
-+ return (-1);
- conn_handle_ports (ntohs(inpcb.inp_lport), ntohs(inpcb.inp_fport),
tcpcb.t_state);
- } /* while (next != head) */
-
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -r1.9 PLIST-main
--- pkg/PLIST-main 23 Jul 2015 07:33:17 -0000 1.9
+++ pkg/PLIST-main 6 Jun 2016 12:32:03 -0000
@@ -40,8 +40,6 @@
lib/collectd/email.so
@comment lib/collectd/exec.la
lib/collectd/exec.so
-@comment lib/collectd/fhcount.la
-lib/collectd/fhcount.so
@comment lib/collectd/filecount.la
lib/collectd/filecount.so
@comment lib/collectd/interface.la
@@ -161,8 +159,8 @@
share/collectd/types.db
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/collectd.conf
-@group _collectd
@mode 640
+@group _collectd
@sample ${SYSCONFDIR}/collectd.conf
@mode
@owner _collectd
