From 63ae87823ca5774411cb29a7aebf35efae85f0b3 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 9 Oct 2019 09:56:13 -0400 Subject: meta-openembedded: subtree update:01d539b324..fd1a0c9210 Adrian Bunk (1): xmlrpc-c: Remove the RDEPENDS on perl Denys Dmytriyenko (1): mariadb: update SRC_URI to use archive.mariadb.org Khem Raj (7): xorg-fonts-100dpi: Change License Custom -> MIT fio: Depend on coreutils-native for fmt utility fio: Fix build when march is armv7ve pmdk: Update to 1.7 README: Document need for 32bit compiler mongodb: Turn system libpcre support into packageconfig grpc: Update to 1.24.1 Otavio Salvador (1): modemmanager: Upgrade 1.10.2 -> 1.10.6 Palmer Dabbelt (1): Add zeus compatibility to all layer.conf files Peiran Hong (1): tcpdump: upgrade 4.9.2 -> 4.9.3 Stefan Agner (1): zram: properly implement systemd service Stefan Wiehler (1): nvme-cli: upgrade 1.6 -> 1.9 Trevor Gamblin (2): gnome-desktop3: upgrade from 3.32.0 to 3.34.0 freeradius: add -latomic for armv5 William A. Kennington III via Openembedded-devel (1): log4cpp: Stop using RC as a variable Change-Id: I9b3bd69a061da11a59d38bce42543cb090b24601 Signed-off-by: Brad Bishop --- .../tcpdump/tcpdump/add-ptest.patch | 9 ++-- ...-absolute-path-when-searching-for-libdlpi.patch | 19 ++++---- .../recipes-support/tcpdump/tcpdump/run-ptest | 4 +- .../tcpdump/unnecessary-to-check-libpcap.patch | 15 ++++--- .../recipes-support/tcpdump/tcpdump_4.9.2.bb | 45 ------------------- .../recipes-support/tcpdump/tcpdump_4.9.3.bb | 51 ++++++++++++++++++++++ 6 files changed, 76 insertions(+), 67 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb (limited to 'meta-openembedded/meta-networking/recipes-support') diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index b71435a04..f8ff354fe 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,18 +1,19 @@ -From 8ee1ab1ac89557d48ac1ab7ddcc3c51be9b734ad Mon Sep 17 00:00:00 2001 +From 8c9c728757f89ebe6c4019114b83a63c63596f69 Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" -Date: Wed, 22 Oct 2014 10:02:48 +0800 +Date: Wed, 2 Oct 2019 16:57:06 -0400 Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending Signed-off-by: Hongjun.Yang +Signed-off-by: Peiran Hong --- Makefile.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 0941f0e..3ce40c6 100644 +index 3b589184..7b10e38c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -437,9 +437,17 @@ distclean: @@ -23,7 +24,7 @@ index 0941f0e..3ce40c6 100644 +buildtest-TESTS: tcpdump + +runtest-PTEST: - (cd tests && ./TESTrun.sh) + (mkdir -p tests && SRCDIR=`cd ${srcdir}; pwd` && export SRCDIR && $$SRCDIR/tests/TESTrun.sh ) +install-ptest: + cp -r tests $(DESTDIR) diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch index d82c16053..977ab95b7 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch @@ -1,6 +1,6 @@ -From a2bfd28034d9aa48d8ff109c1314e53bc9779752 Mon Sep 17 00:00:00 2001 +From 02085028cdaf075943c27ebc02bb6de0289ec1d3 Mon Sep 17 00:00:00 2001 From: Andre McCurdy -Date: Wed, 24 Oct 2018 22:26:08 -0700 +Date: Wed, 2 Oct 2019 16:43:48 -0400 Subject: [PATCH] avoid absolute path when searching for libdlpi Let the build environment control library search paths. @@ -8,15 +8,16 @@ Let the build environment control library search paths. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andre McCurdy +Signed-off-by: Peiran Hong --- - configure.in | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index c882909..52aefd6 100644 ---- a/configure.in -+++ b/configure.in -@@ -542,7 +542,7 @@ don't.]) +diff --git a/configure.ac b/configure.ac +index 3401a7a3..6a52485a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -528,7 +528,7 @@ don't.]) fi # libdlpi is needed for Solaris 11 and later. @@ -26,5 +27,5 @@ index c882909..52aefd6 100644 dnl dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()", -- -1.9.1 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index c03a8b8ef..2bfb2267d 100755 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest @@ -1,5 +1,5 @@ #!/bin/sh make -k runtest-PTEST | sed -e '/: passed/ s/^/PASS: /g' \ - -e '/: failed/ s/^/FAIL: /g' \ + -e '/: TEST FAILED.*/ s/^/FAIL: /g' \ -e 's/: passed//g' \ - -e 's/: failed//g' + -e 's/: TEST FAILED.*//g' diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index 69d68baac..8793bf7a3 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch @@ -15,15 +15,16 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Roy Li Signed-off-by: Andre McCurdy +Signed-off-by: Peiran Hong --- - configure.in | 4 +++- + configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index b2305a5..c882909 100644 ---- a/configure.in -+++ b/configure.in -@@ -418,7 +418,9 @@ dnl Some platforms may need -lnsl for getrpcbynumber. +diff --git a/configure.ac b/configure.ac +index 56e2a624..3401a7a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -404,7 +404,9 @@ dnl Some platforms may need -lnsl for getrpcbynumber. AC_SEARCH_LIBS(getrpcbynumber, nsl, AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) @@ -35,5 +36,5 @@ index b2305a5..c882909 100644 # # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate -- -1.9.1 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb deleted file mode 100644 index 9bd861cd4..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/" -SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" - -DEPENDS = "libpcap" - -SRC_URI = " \ - http://www.tcpdump.org/release/${BP}.tar.gz \ - file://unnecessary-to-check-libpcap.patch \ - file://avoid-absolute-path-when-searching-for-libdlpi.patch \ - file://add-ptest.patch \ - file://run-ptest \ - file://0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch \ -" - -SRC_URI[md5sum] = "9bbc1ee33dab61302411b02dd0515576" -SRC_URI[sha256sum] = "798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79" - -inherit autotools-brokensep ptest - -PACKAGECONFIG ?= "openssl" - -PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" -PACKAGECONFIG[openssl] = "--with-crypto,--without-openssl --without-crypto,openssl" -PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" - -EXTRA_AUTORECONF += "-I m4" - -do_configure_prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi -} - -do_install_append() { - # make install installs an unneeded extra copy of the tcpdump binary - rm -f ${D}${sbindir}/tcpdump.${PV} -} - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb new file mode 100644 index 000000000..3cd12aee7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb @@ -0,0 +1,51 @@ +SUMMARY = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +SECTION = "net" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" + +DEPENDS = "libpcap" + +RDEPENDS_${PN}-ptest += " make perl \ + perl-module-file-basename \ + perl-module-posix \ + perl-module-carp" + +SRC_URI = " \ + http://www.tcpdump.org/release/${BP}.tar.gz \ + file://unnecessary-to-check-libpcap.patch \ + file://avoid-absolute-path-when-searching-for-libdlpi.patch \ + file://add-ptest.patch \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "a4ead41d371f91aa0a2287f589958bae" +SRC_URI[sha256sum] = "2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410" + +inherit autotools-brokensep ptest + +PACKAGECONFIG ?= "openssl" + +PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" +PACKAGECONFIG[openssl] = "--with-crypto,--without-openssl --without-crypto,openssl" +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 +} + +do_install_append() { + # make install installs an unneeded extra copy of the tcpdump binary + rm -f ${D}${sbindir}/tcpdump.${PV} +} + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} -- cgit v1.2.3