From 7a56dfe415683200ddb43f8d6ff09e9f564cce90 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sun, 30 Jan 2022 22:39:23 +0800 Subject: [PATCH] tcpdump: upgrade 4.99.0 -> 4.99.1 * Skip aclocal in do_configure * Inherit pkgconfig then we can drop 0001-aclocal.m4-Skip-checking-for-pcap-config.patch Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...cal.m4-Skip-checking-for-pcap-config.patch | 33 ------------------- .../{tcpdump_4.99.0.bb => tcpdump_4.99.1.bb} | 18 +++------- 2 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch rename meta-networking/recipes-support/tcpdump/{tcpdump_4.99.0.bb => tcpdump_4.99.1.bb} (72%) diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch b/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch deleted file mode 100644 index bb56c4d4c9..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 867bf5c9d0fb64e1b4e64cb13b983674c270a6bf Mon Sep 17 00:00:00 2001 -From: Yi Fan Yu -Date: Fri, 19 Feb 2021 00:52:35 -0500 -Subject: [PATCH] aclocal.m4: Skip checking for pcap-config - -Bitbake triggers an configure error -saying we should look for pkg-config instead. - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Yi Fan Yu ---- - aclocal.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index bd4e27a5..136cb8ca 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -584,8 +584,8 @@ AC_DEFUN(AC_LBL_LIBPCAP, - # No pkg-config - # Look for an installed pcap-config. - # -- AC_PATH_TOOL(PCAP_CONFIG, pcap-config) -- if test -n "$PCAP_CONFIG" ; then -+ # AC_PATH_TOOL(PCAP_CONFIG, pcap-config) -+ if false; then - # - # Found - use it to get the include flags for - # libpcap and the flags to link with libpcap. --- -2.29.2 - diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb similarity index 72% rename from meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb rename to meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb index 97a9027af4..322a826f07 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb @@ -24,15 +24,14 @@ SRC_URI = " \ http://www.tcpdump.org/release/${BP}.tar.gz \ file://add-ptest.patch \ file://run-ptest \ - file://0001-aclocal.m4-Skip-checking-for-pcap-config.patch \ " -SRC_URI[md5sum] = "b10aa2f497def7283bc060f626879ce5" -SRC_URI[sha256sum] = "8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842" +SRC_URI[md5sum] = "929a255c71a9933608bd7c31927760f7" +SRC_URI[sha256sum] = "79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe" -UPSTREAM_CHECK_REGEX = "tcpdump-(?P\d+(\.(?!99)\d+)+)\.tar" +UPSTREAM_CHECK_REGEX = "tcpdump-(?P\d+(\.\d+)+)\.tar" -inherit autotools-brokensep ptest +inherit autotools-brokensep pkgconfig ptest PACKAGECONFIG ?= "openssl" @@ -42,14 +41,7 @@ PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" # Note: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled) PACKAGECONFIG[smb] = "--enable-smb,--disable-smb" -EXTRA_AUTORECONF += "-I m4" - -do_configure:prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi -} +EXTRA_AUTORECONF += "--exclude=aclocal" do_install:append() { # make install installs an unneeded extra copy of the tcpdump binary