From patchwork Sun Apr 12 12:21:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1269433 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=cFREqt/A; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 490W636RjDz9sSg for ; Sun, 12 Apr 2020 22:19:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DE2FF8637D; Sun, 12 Apr 2020 12:19:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id usufCe+ibmfw; Sun, 12 Apr 2020 12:19:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id ABBD486382; Sun, 12 Apr 2020 12:19:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 920EF1BF59F for ; Sun, 12 Apr 2020 12:19:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8F13384F7A for ; Sun, 12 Apr 2020 12:19:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SLhgCesrT8WT for ; Sun, 12 Apr 2020 12:19:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 01B0D84CC2 for ; Sun, 12 Apr 2020 12:19:47 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id x18so3192351wrq.2 for ; Sun, 12 Apr 2020 05:19:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EZpcz1zNACwTn9doE+DLe8+CPgOVvn50UzuV/cC4c9s=; b=cFREqt/AQqFM2xybp3+WqdV29CggGTGQYNxFfFSw++Awc9J0rTrdRxKiR2MpI8/vQM tm7WIpSaVh8JAidWyMM+2UWd4+oWCHOYUtA9NmsWLgNHoE86sQuaoP7UO2DzA8d/s86u zYANDY96ZYLLvOperV2/NZFOR/dbP89boYfaPyB3nUh7Kkdb3v5Lp2ns7E6FGg56n9Ot Hq0BxI+MiS0SRrNdX2xaL6hK2ouHPk1UtyZPwpMQp3ciXauBqtscA2VWHEPPzgoNtKTH k4EhaSs+tqcQ2two77B4JKHP261Mb+8NEVkHCphlRP1yDfbxfru1mfenLTdZfreuIweq TnGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EZpcz1zNACwTn9doE+DLe8+CPgOVvn50UzuV/cC4c9s=; b=AFWskuP8gx8690Z8LDr7/VWkKw3ptEJyfUnaLYXy3EeWvisytB5KMUz1BSnSdDxmQg 2jLkBrYorIEtllW4uWPnuJrzy5wDEx2lV+KCMkh0nkdDUztAFdierGKwX2WQpXmmzjJm g1njgFf+o9BGeh7cHcv18KdXC+3UTqVVmbtlWDoUaFfyLaeLC96uI9TiSfnUfKvF4LsO o3y3BV34LQciBFldq9Lv/GQYw71kPXMQQWxHPDguFQICWJUUViVcQ3QtNZjybnU4cW6R zn8eri6mD9b7f54G3G1+S/YCYxQDNnlj8gRIObqJdMZEW+iFm2OkUbS5W0sWHElgdJKm JCNQ== X-Gm-Message-State: AGi0PubFEc9hOyh8FetOWIXhRManIs3IDNimfa4hdC9ZSptz3sVSS/TX oL8zgxzQ9KMAVOqqPO0bqzGekqBw X-Google-Smtp-Source: APiQypIQ1E2P3THZfzoVbA6+t6TvMhVZ3FRxE9dsKO37k+vYmOerVDhTaTywgTeI5U+1UkNNnFtOxQ== X-Received: by 2002:a5d:404f:: with SMTP id w15mr13070246wrp.38.1586693986070; Sun, 12 Apr 2020 05:19:46 -0700 (PDT) Received: from kali.home (lfbn-ren-1-403-35.w2-10.abo.wanadoo.fr. [2.10.23.35]) by smtp.gmail.com with ESMTPSA id v7sm12627879wmg.3.2020.04.12.05.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Apr 2020 05:19:45 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 12 Apr 2020 14:21:07 +0200 Message-Id: <20200412122107.1071258-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libnetfilter_conntrack: add libmnl to Libs.Private X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This will fix a static build failure with dnsmasq on latest libnetfilter_conntrack Fixes: - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 Signed-off-by: Fabrice Fontaine Tested-by: Baruch Siach --- ...ntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create 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 new file mode 100644 index 0000000000..921837df07 --- /dev/null +++ b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch @@ -0,0 +1,38 @@ +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: sent to Pablo Neira Ayuso ] +--- + 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 +