Dear all, please find the attached update for sysutils/collectd. Changelog: https://github.com/collectd/collectd/blob/master/ChangeLog
-- With best regards, Pavel Korovin
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/collectd/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- Makefile 18 Feb 2017 17:33:51 -0000 1.46 +++ Makefile 23 Apr 2017 16:23:37 -0000 @@ -11,8 +11,7 @@ COMMENT-memcachec = collectd memcachec p COMMENT-nut = collectd nut plugin COMMENT-riemann = collectd riemann plugin -REVISION-main = 2 -V = 5.6.2 +V = 5.7.1 DISTNAME = collectd-$V PKGNAME-main = collectd-$V PKGNAME-mysql = collectd-mysql-$V @@ -25,15 +24,6 @@ PKGNAME-memcachec = collectd-memcachec-$ PKGNAME-nut = collectd-nut-$V PKGNAME-riemann = collectd-riemann-$V CATEGORIES = sysutils -REVISION-memcachec = 0 -REVISION-mysql = 0 -REVISION-nut = 0 -REVISION-pgsql = 0 -REVISION-python = 0 -REVISION-riemann = 0 -REVISION-rrdtool = 0 -REVISION-snmp = 0 -REVISION-virt = 0 HOMEPAGE = http://www.collectd.org/ SHARED_LIBS += collectdclient 1.0 Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/collectd/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 3 Dec 2016 11:44:41 -0000 1.8 +++ distinfo 23 Apr 2017 16:23:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (collectd-5.6.2.tar.bz2) = zAtBGKkeU2lAnO0i0dioXBpAAJhBlBQWDBg5Jo7K0MY= -SIZE (collectd-5.6.2.tar.bz2) = 1806969 +SHA256 (collectd-5.7.1.tar.bz2) = ft02Q8CEIhVVOyQh1UVvTpqKWLB+IWtAp+jpECbY5QE= +SIZE (collectd-5.7.1.tar.bz2) = 1797725 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v retrieving revision 1.7 diff -u -p -r1.7 patch-Makefile_in --- patches/patch-Makefile_in 3 Dec 2016 11:44:41 -0000 1.7 +++ patches/patch-Makefile_in 23 Apr 2017 16:23:37 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2016/12/03 11:44:41 landry Exp $ ---- Makefile.in.orig Wed Nov 30 09:52:09 2016 -+++ Makefile.in Sat Dec 3 11:37:47 2016 -@@ -986,9 +986,6 @@ uninstall-am: +--- Makefile.in.orig Mon Jan 23 10:54:26 2017 ++++ Makefile.in Sun Feb 26 20:22:04 2017 +@@ -1003,9 +1003,6 @@ uninstall-am: install-exec-hook: Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_Makefile_in,v retrieving revision 1.10 diff -u -p -r1.10 patch-src_Makefile_in --- patches/patch-src_Makefile_in 3 Dec 2016 11:44:41 -0000 1.10 +++ patches/patch-src_Makefile_in 23 Apr 2017 16:23:37 -0000 @@ -1,16 +1,16 @@ $OpenBSD: patch-src_Makefile_in,v 1.10 2016/12/03 11:44:41 landry Exp $ ---- src/Makefile.in.orig Wed Nov 9 20:02:37 2016 -+++ src/Makefile.in Wed Nov 9 20:05:56 2016 +--- src/Makefile.in.orig Mon Jan 23 10:54:27 2017 ++++ src/Makefile.in Sun Feb 26 20:27:29 2017 @@ -80,7 +80,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_1 = liboconfig -@BUILD_FEATURE_DAEMON_TRUE@am__append_2 = -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' +@BUILD_FEATURE_DAEMON_TRUE@am__append_2 = -DPIDFILE='"${localstatedir}/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"' - check_PROGRAMS = $(am__EXEEXT_1) test_utils_latency$(EXEEXT) \ + check_PROGRAMS = test_format_graphite$(EXEEXT) $(am__EXEEXT_1) \ + test_utils_latency$(EXEEXT) test_utils_cmds$(EXEEXT) \ test_utils_vl_lookup$(EXEEXT) test_utils_mount$(EXEEXT) \ - $(am__EXEEXT_2) -@@ -2610,7 +2610,7 @@ PLUGIN_LDFLAGS = -module -avoid-version -export-symbol +@@ -2698,7 +2698,7 @@ PLUGIN_LDFLAGS = -module -avoid-version -export-symbol AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ -DLOCALSTATEDIR='"${localstatedir}"' \ @@ -19,8 +19,8 @@ $OpenBSD: patch-src_Makefile_in,v 1.10 2 $(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \ -DPKGDATADIR='"${pkgdatadir}"' LOG_COMPILER = env VALGRIND="@VALGRIND@" $(abs_top_srcdir)/testwrapper.sh -@@ -5519,13 +5519,8 @@ uninstall-man: uninstall-man1 uninstall-man5 - @BUILD_PLUGIN_PINBA_TRUE@ $(AM_V_PROTOC_C)$(PROTOC_C) -I$(srcdir) --c_out . $(srcdir)/pinba.proto +@@ -5709,13 +5709,8 @@ uninstall-man: uninstall-man1 uninstall-man5 + @BUILD_PLUGIN_WRITE_PROMETHEUS_TRUE@ $(AM_V_PROTOC_C)$(PROTOC_C) -I$(top_srcdir)/proto --c_out=$(builddir) $(top_srcdir)/proto/prometheus.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.3 diff -u -p -r1.3 patch-src_daemon_Makefile_in --- patches/patch-src_daemon_Makefile_in 3 Dec 2016 11:44:41 -0000 1.3 +++ patches/patch-src_daemon_Makefile_in 23 Apr 2017 16:23:37 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_daemon_Makefile_in,v 1.3 2016/12/03 11:44:41 landry Exp $ ---- src/daemon/Makefile.in.orig Wed Nov 30 09:52:10 2016 -+++ src/daemon/Makefile.in Sat Dec 3 11:41:09 2016 +--- src/daemon/Makefile.in.orig Mon Jan 23 10:54:27 2017 ++++ src/daemon/Makefile.in Sun Feb 26 20:22:04 2017 @@ -79,7 +79,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ @@ -10,7 +10,7 @@ $OpenBSD: patch-src_daemon_Makefile_in,v @BUILD_WITH_CAPABILITY_TRUE@am__append_2 = -lcap @BUILD_WITH_LIBRT_TRUE@am__append_3 = -lrt @BUILD_WITH_LIBPOSIX4_TRUE@am__append_4 = -lposix4 -@@ -772,7 +772,7 @@ top_srcdir = @top_srcdir@ +@@ -787,7 +787,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/src -DPREFIX='"${prefix}"' \ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ -DLOCALSTATEDIR='"${localstatedir}"' \ Index: patches/patch-src_processes_c =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_processes_c,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_processes_c --- patches/patch-src_processes_c 12 Dec 2016 17:55:24 -0000 1.9 +++ patches/patch-src_processes_c 23 Apr 2017 16:23:37 -0000 @@ -3,8 +3,8 @@ $OpenBSD: patch-src_processes_c,v 1.9 20 https://github.com/collectd/collectd/issues/2061 https://github.com/collectd/collectd/pull/2088 ---- src/processes.c.orig Wed Nov 30 09:52:01 2016 -+++ src/processes.c Mon Dec 12 18:52:34 2016 +--- src/processes.c.orig Mon Jan 23 10:53:57 2017 ++++ src/processes.c Sun Feb 26 20:22:04 2017 @@ -155,7 +155,7 @@ #if defined(ARG_MAX) && (ARG_MAX < 4096) #define CMDLINE_BUFFER_SIZE ARG_MAX @@ -14,7 +14,7 @@ https://github.com/collectd/collectd/pul #endif #endif -@@ -1937,7 +1937,7 @@ static int ps_read(void) { +@@ -1916,7 +1916,7 @@ static int ps_read(void) { ps_list_reset(); /* Open the kvm interface, get a descriptor */ Index: patches/patch-src_tcpconns_c =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_tcpconns_c,v retrieving revision 1.12 diff -u -p -r1.12 patch-src_tcpconns_c --- patches/patch-src_tcpconns_c 8 Dec 2016 10:06:42 -0000 1.12 +++ patches/patch-src_tcpconns_c 23 Apr 2017 16:23:37 -0000 @@ -3,8 +3,8 @@ $OpenBSD: patch-src_tcpconns_c,v 1.12 20 https://github.com/collectd/collectd/issues/2061 https://github.com/collectd/collectd/pull/2088 ---- src/tcpconns.c.orig Wed Nov 30 09:52:01 2016 -+++ src/tcpconns.c Sun Dec 4 16:22:52 2016 +--- src/tcpconns.c.orig Mon Jan 23 10:53:57 2017 ++++ src/tcpconns.c Sun Feb 26 20:22:04 2017 @@ -62,11 +62,16 @@ #include "common.h" #include "plugin.h" @@ -74,7 +74,7 @@ https://github.com/collectd/collectd/pul #elif HAVE_LIBKVM_NLIST static const char *tcp_state[] = {"CLOSED", "LISTEN", "SYN_SENT", "SYN_RECV", "ESTABLISHED", "CLOSE_WAIT", -@@ -775,6 +805,49 @@ static int conn_read(void) { +@@ -774,6 +804,49 @@ static int conn_read(void) { return (0); } /* int conn_read */ /* #endif HAVE_SYSCTLBYNAME */
