Hi Michael,

collectd will not build successfully with this patch.

You asked that the patch should be created but that it would not be merged until collectd had been patched to make it work with libip4tc instead of libiptc (bug 12482 raised).

Regards,

Adolf

On 10/09/2020 13:57, Michael Tremer wrote:
> Hello,
>
> Does this patch break the build of collectd?
>
> Best,
> -Michael
>
>> On 7 Sep 2020, at 12:45, Adolf Belka <ahb.ipfire(a)gmail.com> wrote:
>>
>> - Update iptables from version 1.8.3 to 1.8.5
>>     See: https://www.netfilter.org/projects/iptables/files/changes-iptables-1.8.5.txt
>>
>> Supporting request from Peter Müller
>> Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
>> ---
>> config/rootfiles/common/iptables | 16 +++++-----------
>> lfs/iptables                     |  4 ++--
>> 2 files changed, 7 insertions(+), 13 deletions(-)
>>
>> diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
>> index 0f8f1cf8c..f8f669014 100644
>> --- a/config/rootfiles/common/iptables
>> +++ b/config/rootfiles/common/iptables
>> @@ -10,14 +10,10 @@ lib/libip6tc.so.2.0.0
>> lib/libipq.so
>> lib/libipq.so.0
>> lib/libipq.so.0.0.0
>> -#lib/libiptc.la
>> -lib/libiptc.so
>> -lib/libiptc.so.0
>> -lib/libiptc.so.0.0.0
>> #lib/libxtables.la
>> lib/libxtables.so
>> lib/libxtables.so.12
>> -lib/libxtables.so.12.2.0
>> +lib/libxtables.so.12.3.0
>> #lib/xtables
>> lib/xtables/libip6t_DNAT.so
>> lib/xtables/libip6t_DNPT.so
>> @@ -130,6 +126,7 @@ lib/xtables/libxt_tos.so
>> lib/xtables/libxt_u32.so
>> lib/xtables/libxt_udp.so
>> sbin/ip6tables
>> +sbin/ip6tables-apply
>> #sbin/ip6tables-legacy
>> #sbin/ip6tables-legacy-restore
>> #sbin/ip6tables-legacy-save
>> @@ -170,19 +167,16 @@ sbin/xtables-legacy-multi
>> #usr/share/man/man3/ipq_set_mode.3
>> #usr/share/man/man3/ipq_set_verdict.3
>> #usr/share/man/man3/libipq.3
>> +usr/share/man/man8/ip6tables-apply.8
>> #usr/share/man/man8/ip6tables-restore.8
>> #usr/share/man/man8/ip6tables-save.8
>> -#usr/share/man/man8/ip6tables-translate.8
>> #usr/share/man/man8/ip6tables.8
>> +usr/share/man/man8/iptables-apply.8
>> #usr/share/man/man8/iptables-extensions.8
>> #usr/share/man/man8/iptables-restore.8
>> #usr/share/man/man8/iptables-save.8
>> -#usr/share/man/man8/iptables-translate.8
>> #usr/share/man/man8/iptables.8
>> #usr/share/man/man8/nfnl_osf.8
>> -#usr/share/man/man8/xtables-legacy.8
>> -#usr/share/man/man8/xtables-monitor.8
>> -#usr/share/man/man8/xtables-nft.8
>> -#usr/share/man/man8/xtables-translate.8
>> #usr/share/xtables
>> usr/share/xtables/pf.os
>> +
>> diff --git a/lfs/iptables b/lfs/iptables
>> index e2012ecb6..afe452f10 100644
>> --- a/lfs/iptables
>> +++ b/lfs/iptables
>> @@ -24,7 +24,7 @@
>>
>> include Config
>>
>> -VER        = 1.8.3
>> +VER        = 1.8.5
>>
>> THISAPP    = iptables-$(VER)
>> DL_FILE    = $(THISAPP).tar.bz2
>> @@ -41,7 +41,7 @@ objects = $(DL_FILE) \
>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>> netfilter-layer7-v2.23.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.23.tar.gz
>>
>> -$(DL_FILE)_MD5 = 29de711d15c040c402cf3038c69ff513
>> +$(DL_FILE)_MD5 = 42cfa96d4ac5eb93ee7ed8dd85cfe8fb
>> netfilter-layer7-v2.23.tar.gz_MD5 = 10910b6173d18e426cb56ae7e1300eeb
>>
>> install : $(TARGET)
>> -- 
>> 2.28.0
>>