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 From patchwork Thu Jan 21 17:16:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 1429972 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 4DM8FK2PWgz9sS8 for ; Fri, 22 Jan 2021 04:16:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 56C75236B5; Thu, 21 Jan 2021 17:16:34 +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 ENo-9yMy3oEV; Thu, 21 Jan 2021 17:16:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7A55722F05; Thu, 21 Jan 2021 17:16:22 +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 1066C1BF9C6 for ; Thu, 21 Jan 2021 17:16:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0CC6086D3A for ; Thu, 21 Jan 2021 17:16:18 +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 8eXZw3fmtkeo 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 3F51086D3E 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 79D72440850; Thu, 21 Jan 2021 19:16:10 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Thu, 21 Jan 2021 19:16:04 +0200 Message-Id: <52e8d711bf5b239729edaef5edf614a1dd4ff27e.1611249364.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/tcpdump: bump to version 4.99.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" Drop upstream security patch. Rename --with-system-libpcap to --disable-local-libpcap following upstream change. The configure scripts uses pkg-config to find libpcap, add host-pkgconf dependency. pkg-config handles static build for us. Remove explicit static build handling. Use https for SITE to save redirect. Update license file hash due to whitespace changes. Format hashes with two space delimiters. Signed-off-by: Baruch Siach --- ...ng-don-t-allocate-a-too-large-buffer.patch | 67 ------------------- package/tcpdump/tcpdump.hash | 6 +- package/tcpdump/tcpdump.mk | 15 ++--- 3 files changed, 7 insertions(+), 81 deletions(-) delete mode 100644 package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch diff --git a/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch b/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch deleted file mode 100644 index 9e8674ac90d6..000000000000 --- a/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001 -From: Guy Harris -Date: Sat, 18 Apr 2020 14:04:59 -0700 -Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer. - -The buffer should be big enough to hold the captured data, but it -doesn't need to be big enough to hold the entire on-the-network packet, -if we haven't captured all of it. - -(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334) - -[Retrieved from: -https://github.com/the-tcpdump-group/tcpdump/commit/32027e199368dad9508965aae8cd8de5b6ab5231] -Signed-off-by: Fabrice Fontaine ---- - print-ppp.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/print-ppp.c b/print-ppp.c -index 891761728..33fb03412 100644 ---- a/print-ppp.c -+++ b/print-ppp.c -@@ -1367,19 +1367,29 @@ print_bacp_config_options(netdissect_options *ndo, - return 0; - } - -+/* -+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes. -+ * The length argument is the on-the-wire length, not the captured -+ * length; we can only un-escape the captured part. -+ */ - static void - ppp_hdlc(netdissect_options *ndo, - const u_char *p, int length) - { -+ u_int caplen = ndo->ndo_snapend - p; - u_char *b, *t, c; - const u_char *s; -- int i, proto; -+ u_int i; -+ int proto; - const void *se; - -+ if (caplen == 0) -+ return; -+ - if (length <= 0) - return; - -- b = (u_char *)malloc(length); -+ b = (u_char *)malloc(caplen); - if (b == NULL) - return; - -@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo, - * Do this so that we dont overwrite the original packet - * contents. - */ -- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) { -+ for (s = p, t = b, i = caplen; i != 0; i--) { - c = *s++; - if (c == 0x7d) { -- if (i <= 1 || !ND_TTEST(*s)) -+ if (i <= 1) - break; - i--; - c = *s++ ^ 0x20; diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index da5c9aa7491e..4aea5b7cb5a9 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at -# http://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.0.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410 tcpdump-4.9.3.tar.gz -sha256 9b03d5d13e66d6de02a4bb2d0dd1cb9f41808d045962cdcc42350d5291b141a1 LICENSE +sha256 8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842 tcpdump-4.99.0.tar.gz +sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 63991163ab8f..f8ea6576eefb 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,8 +4,8 @@ # ################################################################################ -TCPDUMP_VERSION = 4.9.3 -TCPDUMP_SITE = http://www.tcpdump.org/release +TCPDUMP_VERSION = 4.99.0 +TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE TCPDUMP_CPE_ID_VENDOR = tcpdump @@ -15,18 +15,11 @@ TCPDUMP_CONF_ENV = \ PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config TCPDUMP_CONF_OPTS = \ --without-crypto \ - --with-system-libpcap \ + --disable-local-libpcap \ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb) -TCPDUMP_DEPENDENCIES = libpcap +TCPDUMP_DEPENDENCIES = libpcap host-pkgconf TCPDUMP_SELINUX_MODULES = netutils -# 0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch -TCPDUMP_IGNORE_CVES += CVE-2020-8037 - -ifeq ($(BR2_STATIC_LIBS),y) -TCPDUMP_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" -endif - # make install installs an unneeded extra copy of the tcpdump binary define TCPDUMP_REMOVE_DUPLICATED_BINARY rm -f $(TARGET_DIR)/usr/sbin/tcpdump.$(TCPDUMP_VERSION)