From patchwork Thu Jan 21 17:16:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 1429971 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DM8FC2gNnz9sS8 for ; Fri, 22 Jan 2021 04:16:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B946C231A1; Thu, 21 Jan 2021 17:16:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JFxerIl7lsQP; Thu, 21 Jan 2021 17:16:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7E9FA22CB0; Thu, 21 Jan 2021 17:16:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E01401BF5DE for ; Thu, 21 Jan 2021 17:16:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DC1A286D3F for ; Thu, 21 Jan 2021 17:16:17 +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 qGnNysAuEWTq for ; Thu, 21 Jan 2021 17:16:15 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3E29B86D3A for ; Thu, 21 Jan 2021 17:16:15 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id 48304440224; Thu, 21 Jan 2021 19:16:10 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Thu, 21 Jan 2021 19:16:03 +0200 Message-Id: X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/libpcap: bump to version 1.10.0 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" configure script now uses pkg-config. Add host-pkgconf dependency. pkg-config should provide necessary info for libnl build/link. Don't pass paths to configure. Add --without-dpdk to make sure we don't link with host installed libraries. Format hashes with two space delimiters. Use https for SITE to save redirect. Signed-off-by: Baruch Siach --- package/libpcap/libpcap.hash | 5 +++-- package/libpcap/libpcap.mk | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index a24fba24dead..e70d071294a5 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -sha256 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094 libpcap-1.9.1.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.0.tar.gz.sig +sha256 8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e libpcap-1.10.0.tar.gz # Hash for license file: -sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE +sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index e323461529fe..81e7cd4ab05c 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,19 +4,20 @@ # ################################################################################ -LIBPCAP_VERSION = 1.9.1 -LIBPCAP_SITE = http://www.tcpdump.org/release +LIBPCAP_VERSION = 1.10.0 +LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE LIBPCAP_CPE_ID_VENDOR = tcpdump LIBPCAP_INSTALL_STAGING = YES -LIBPCAP_DEPENDENCIES = host-flex host-bison +LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf LIBPCAP_CONF_ENV = \ ac_cv_header_linux_wireless_h=yes \ CFLAGS="$(LIBPCAP_CFLAGS)" LIBPCAP_CFLAGS = $(TARGET_CFLAGS) -LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag +LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag \ + --without-dpdk # Disable dbus to break recursive dependencies LIBPCAP_CONF_OPTS += --disable-dbus LIBPCAP_CONFIG_SCRIPTS = pcap-config @@ -35,8 +36,7 @@ endif ifeq ($(BR2_PACKAGE_LIBNL),y) LIBPCAP_DEPENDENCIES += libnl -LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3" -LIBPCAP_CONF_OPTS += --with-libnl=$(STAGING_DIR)/usr +LIBPCAP_CONF_OPTS += --with-libnl else LIBPCAP_CONF_OPTS += --without-libnl endif