From 9af9dfa543907c46091c706b0f3a0eb89445ae74 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 22 Feb 2022 21:53:17 +0100 Subject: [PATCH] package/libnetfilter_conntrack: bump to version 1.0.9 Drop patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 ------------------- .../libnetfilter_conntrack.hash | 4 +- .../libnetfilter_conntrack.mk | 2 +- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch deleted file mode 100644 index 0b373d9261..0000000000 --- a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Apr 2020 14:05:15 +0200 -Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private - -Since version 1.0.8 and commit -c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends -on libmnl so add it to Libs.Private. - -Otherwise, applications such as dnsmasq will fail to link on: - -/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': -api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' - -Fixes: - - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 - -Signed-off-by: Fabrice Fontaine -[Upstream status: commit e94172f09e4d] ---- - libnetfilter_conntrack.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in -index 857f993..fbd7132 100644 ---- a/libnetfilter_conntrack.pc.in -+++ b/libnetfilter_conntrack.pc.in -@@ -12,5 +12,5 @@ Version: @VERSION@ - Requires: libnfnetlink - Conflicts: - Libs: -L${libdir} -lnetfilter_conntrack --Libs.private: @LIBNFNETLINK_LIBS@ -+Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ - Cflags: -I${includedir} --- -2.25.1 - diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash index 19520aa3f0..205eecf1f3 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.tar.bz2.sha256sum -sha256 0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf libnetfilter_conntrack-1.0.8.tar.bz2 +# From https://www.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.tar.bz2.sha256sum +sha256 67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 libnetfilter_conntrack-1.0.9.tar.bz2 # Hash for license file: sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 0a5a94be8f..e10bdd02e9 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.8 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.9 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES