collectd: Link against libip4tc

libiptc is no longer being shipped by iptables and has been split
into a version for IPv4 and IPv6.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/collectd b/lfs/collectd
index e3fcc10134b1fe1641fcf1c3271cf476fcbece30..0f99c4ce7a18e6043c29e36e70f201777f3ae265 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -105,6 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch
        cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch
        cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch
+       cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP)/libltdl && autoreconf -vfi
        cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \

diff --git a/src/patches/collectd-4.10-libiptc-build-fixes.patch b/src/patches/collectd-4.10-libiptc-build-fixes.patch
new file mode 100644 (file)
index 0000000..851dba7
--- /dev/null
+++ b/src/patches/collectd-4.10-libiptc-build-fixes.patch
@@ -0,0 +1,11 @@
+--- collectd-4.10.9/src/Makefile.am~   2020-09-10 19:45:41.936847854 +0000
++++ collectd-4.10.9/src/Makefile.am    2020-09-10 19:45:50.416713658 +0000
+@@ -418,7 +418,7 @@
+ iptables_la_LIBADD  = owniptc/libiptc.la
+ iptables_la_DEPENDENCIES = owniptc/libiptc.la
+ else
+-iptables_la_LIBADD = -liptc
++iptables_la_LIBADD = -lip4tc
+ endif
+ collectd_LDADD += "-dlopen" iptables.la
+ collectd_DEPENDENCIES += iptables.la