From patchwork Thu Sep 10 20:39:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3456 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BnW2X5XTgz3x3C for ; Thu, 10 Sep 2020 20:39:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BnW2W153Tz1t; Thu, 10 Sep 2020 20:39:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BnW2V6qJKz2xxZ; Thu, 10 Sep 2020 20:39:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BnW2V1Xg3z2xkc for ; Thu, 10 Sep 2020 20:39:14 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BnW2T4hGvz1t; Thu, 10 Sep 2020 20:39:13 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1599770353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ETxueE/XVlKag3OdpsgWuZd/xr5RSsAseJhxcQEzv/Q=; b=NalDp2gHhGRk4yJpof8RWDlwtzkUUVc6rvwic4kH719ubi7hIbGeDai8JbpZvcC7jh9IpN yEyYAPGv7R2aFxCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1599770353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ETxueE/XVlKag3OdpsgWuZd/xr5RSsAseJhxcQEzv/Q=; b=KnZrq7dV7MEPEJb2HqJMYCtGfjzvpuiprcEwMjoMi/ti97+6fCESrXuuctFLR/8qSGSYWN f54/u6mWLdCq/G/2rJUz52+1MYN9fUcyvhit1v8OESAeSEU9q8tsaSx07oMWgP7nAW5hzt j1PALXY5mG9pUlSVP4WUFSPLx2WyDl93nWnkNF+7Mtr0P/FHGwwi8mA8wf4n9N4ZFD2il2 fuC537PvfiKAnRRKusY7Kf5pEtSZ6xsZK6Cny9KUAJv/g0RUKRGhYPw8GhbzB79UYchaHJ 2O418yC0l0BnJR4sAzos33B7Dz7ynh5oYs7fsoiY5rL3uA8/ebTSbcYQ4J7C6w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] collectd: Link against libip4tc Date: Thu, 10 Sep 2020 20:39:06 +0000 Message-Id: <20200910203906.14234-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" libiptc is no longer being shipped by iptables and has been split into a version for IPv4 and IPv6. Signed-off-by: Michael Tremer --- lfs/collectd | 1 + src/patches/collectd-4.10-libiptc-build-fixes.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 src/patches/collectd-4.10-libiptc-build-fixes.patch diff --git a/lfs/collectd b/lfs/collectd index e3fcc1013..0f99c4ce7 100644 --- 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 index 000000000..851dba70f --- /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