Re: [update] collectd 5.12

Le Thu, 20 Oct 2022 16:27:20 +0200,
Landry Breuil <landry@openbsd.org> a écrit :

> Hi,
>
> here's an update to collectd 5.12, cf
> https://github.com/collectd/collectd/blob/main/ChangeLog for changelog.
>
> apparently upstream went on a v6 branch to break the ABI
> (https://github.com/orgs/collectd/projects/1) but not
> everyone is liking it, cf
> https://github.com/collectd/collectd/issues/4048 - so the v5 branch isnt
> maintained that much, but we're still lagging behind many releases
> anyway :)
>
> builds fine, totally untested. Feedback welcome !
>
> Landry

as I made a change meanwhile, I'm joining the update diff for the bump

However with this new version, it fails to start

Oct 21 23:42:07 t400 collectd[26742]: fopen (/var/collectd.pid): Permission denied

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile 21 Oct 2022 15:32:04 -0000 1.72
+++ Makefile 21 Oct 2022 21:41:10 -0000
@@ -13,7 +13,7 @@ COMMENT-redis = collectd redis plugin
COMMENT-prometheus = collectd prometheus plugin
COMMENT-ping = collectd ping plugin

-V = 5.8.1
+V = 5.12.0
DISTNAME = collectd-$V
PKGNAME-main = collectd-$V
PKGNAME-mysql = collectd-mysql-$V
@@ -30,20 +30,6 @@ PKGNAME-redis = collectd-redis-$V
PKGNAME-prometheus = collectd-prometheus-$V
PKGNAME-ping = collectd-ping-$V
CATEGORIES = sysutils
-REVISION-main = 2
-REVISION-memcachec = 2
-REVISION-mqtt = 1
-REVISION-mysql = 2
-REVISION-nut = 3
-REVISION-pgsql = 1
-REVISION-ping = 1
-REVISION-prometheus = 4
-REVISION-python = 3
-REVISION-redis = 1
-REVISION-riemann = 4
-REVISION-rrdtool = 4
-REVISION-snmp = 1
-REVISION-virt = 4

HOMEPAGE = http://www.collectd.org/
SHARED_LIBS += collectdclient 1.0
@@ -78,7 +64,7 @@ LIB_DEPENDS-rrdtool = net/rrdtool
RUN_DEPENDS-rrdtool = collectd-$V:${BASE_PKGPATH},-main

LIB_DEPENDS-snmp = net/net-snmp
-WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl
+WANTLIB-snmp = crypto netsnmp pthread c kvm m netsnmpagent perl ssl
RUN_DEPENDS-snmp = collectd-$V:${BASE_PKGPATH},-main

LIB_DEPENDS-virt = sysutils/libvirt
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 18 Nov 2018 19:39:29 -0000 1.12
+++ distinfo 21 Oct 2022 21:41:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.8.1.tar.bz2) = 55b9onzgY3f0ka2RqihpYqaMK1QHaqd6KWc9UyBEU9o=
-SIZE (collectd-5.8.1.tar.bz2) = 1789228
+SHA256 (collectd-5.12.0.tar.bz2) = W64EMELBnDH3frhGTlagGlRU4LOfoHz3rQ8b/Jw6CdY=
+SIZE (collectd-5.12.0.tar.bz2) = 1902756
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 19:57:17 -0000 1.11
+++ patches/patch-Makefile_in 21 Oct 2022 21:41:10 -0000
@@ -1,26 +1,26 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -109,7 +109,7 @@ check_PROGRAMS = test_common$(EXEEXT) test_format_grap
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_4 = -lsocket
- @BUILD_WITH_LIBKSTAT_TRUE@am__append_5 = -lkstat
- @BUILD_WITH_LIBDEVINFO_TRUE@am__append_6 = -ldevinfo
--@BUILD_FEATURE_DAEMON_TRUE@am__append_7 = -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
-+@BUILD_FEATURE_DAEMON_TRUE@am__append_7 = -DPIDFILE='"${localstatedir}/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"'
+@@ -129,7 +129,7 @@ TESTS = $(check_PROGRAMS) $(am__EXEEXT_3) $(am__EXEEXT
+ @BUILD_WIN32_TRUE@am__append_13 = -ldl -Wl,--out-implib,libcollectd.a \
+ @BUILD_WIN32_TRUE@ -Wl,--out-implib,libcollectd.a
+ @BUILD_WIN32_FALSE@am__append_14 = src/daemon/cmd.c
+-@BUILD_FEATURE_DAEMON_TRUE@am__append_15 = -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
++@BUILD_FEATURE_DAEMON_TRUE@am__append_15 = -DPIDFILE='"${localstatedir}/${PACKAGE_NAME}.pid"'

# The daemon needs to call sg_init, so we need to link it against libstatgrab,
# too. -octo
-@@ -3210,7 +3210,7 @@ AM_CPPFLAGS = \
- -DPREFIX='"${prefix}"' \
- -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
- -DLOCALSTATEDIR='"${localstatedir}"' \
-- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
-+ -DPKGLOCALSTATEDIR='"${localstatedir}/${PACKAGE_NAME}"' \
- -DPLUGINDIR='"${pkglibdir}"' \
- -DPKGDATADIR='"${pkgdatadir}"'
-
-@@ -7821,16 +7821,8 @@ uninstall-man: uninstall-man1 uninstall-man5
- @HAVE_GRPC_CPP_TRUE@@HAVE_PROTOC3_TRUE@ $(V_PROTOC)$(PROTOC) -I$(srcdir)/proto --cpp_out=$(builddir) $<
+@@ -4000,7 +4000,7 @@ AM_YFLAGS = -d
+ @BUILD_WIN32_TRUE@cpkgdatadir = $(datadir)
+ @BUILD_WIN32_FALSE@cpkglibdir = $(pkglibdir)
+ @BUILD_WIN32_TRUE@cpkglibdir = $(libdir)/plugins
+-@BUILD_WIN32_FALSE@cpkglocalstatedir = ${localstatedir}/lib/${PACKAGE_NAME}
++@BUILD_WIN32_FALSE@cpkglocalstatedir = ${localstatedir}/${PACKAGE_NAME}
+ @BUILD_WIN32_TRUE@cpkglocalstatedir = ${localstatedir}
+ BUILT_SOURCES = src/libcollectdclient/collectd/lcc_features.h \
+ src/liboconfig/parser.h $(dist_man_MANS) $(am__append_298) \
+@@ -11535,16 +11535,8 @@ uninstall-man: uninstall-man1 uninstall-man5
+ @HAVE_GRPC_CPP_TRUE@@HAVE_PROTOC3_TRUE@ $(srcdir)/proto/types.proto

install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
@@ -29,12 +29,12 @@ Index: Makefile.in
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
- then \
-- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
+- $(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
- else \
-- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
+- $(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
- fi; \
+ $(mkinstalldirs) ${PREFIX}/share/examples
+ $(INSTALL) -m 0644 $(srcdir)/src/collectd.conf ${PREFIX}/share/examples/collectd.conf;
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- $(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(pkgdatadir)/types.db;
+ $(mkinstalldirs) $(DESTDIR)$(cpkgdatadir)
+ $(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(cpkgdatadir)/types.db;
$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/sysutils/collectd/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac 13 Apr 2022 07:28:40 -0000 1.3
+++ patches/patch-configure_ac 21 Oct 2022 21:41:10 -0000
@@ -1,11 +1,7 @@
-chunk 2 fixes detection of python > 3.7
-cf https://github.com/collectd/collectd/pull/3170
-and https://github.com/collectd/collectd/pull/3344
-
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -351,6 +351,7 @@ AC_CHECK_HEADERS([netinet/udp.h], [], [],
+@@ -358,6 +358,7 @@ AC_CHECK_HEADERS([netinet/udp.h], [], [],

# For cpu modules
AC_CHECK_HEADERS([sys/dkstat.h])
@@ -13,17 +9,3 @@ Index: configure.ac
if test "x$ac_system" = "xDarwin"; then
AC_CHECK_HEADERS(
[ \
-@@ -4641,11 +4642,11 @@ if test "$PYTHON_CONFIG" != ""; then
- if test $? -ne 0; then
- with_libpython="no"
- fi
-- LIBPYTHON_LDFLAGS="`${PYTHON_CONFIG} --ldflags`"
-+ LIBPYTHON_LDFLAGS="`${PYTHON_CONFIG} --ldflags --embed`"
- if test $? -ne 0; then
- with_libpython="no"
- fi
-- LIBPYTHON_LIBS="`${PYTHON_CONFIG} --libs`"
-+ LIBPYTHON_LIBS="`${PYTHON_CONFIG} --libs --embed`"
- if test $? -ne 0; then
- with_libpython="no"
- fi
Index: patches/patch-src_cpu_c
===================================================================
RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_cpu_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_cpu_c
--- patches/patch-src_cpu_c 11 Mar 2022 19:57:17 -0000 1.2
+++ patches/patch-src_cpu_c 21 Oct 2022 21:41:10 -0000
@@ -5,7 +5,7 @@ by the kernel.
Index: src/cpu.c
--- src/cpu.c.orig
+++ src/cpu.c
-@@ -64,6 +64,10 @@
+@@ -63,6 +63,10 @@
#include <sys/sysctl.h>