CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcpdump: upgrade 4.99.0 -> 4.99.1

Browse Source 
* 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 <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao 2022-01-30 22:39:23 +08:00 committed by Khem Raj
parent c8ee13ae01
commit 7a56dfe415
2 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch
View File

@ -1,33 +0,0 @@
From 867bf5c9d0fb64e1b4e64cb13b983674c270a6bf Mon Sep 17 00:00:00 2001
From: Yi Fan Yu <yifan.yu@windriver.com>
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 <yifan.yu@windriver.com>
---
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

18
meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb → meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb
View File

@ -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<pver>\d+(\.(?!99)\d+)+)\.tar"
UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\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