diff options
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch | 9 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch | 19 | ||||
-rwxr-xr-x | meta-networking/recipes-support/tcpdump/tcpdump/run-ptest | 4 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch | 15 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb (renamed from meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb) | 12 |
5 files changed, 34 insertions, 25 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index b71435a04..f8ff354fe 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch | |||
@@ -1,18 +1,19 @@ | |||
1 | From 8ee1ab1ac89557d48ac1ab7ddcc3c51be9b734ad Mon Sep 17 00:00:00 2001 | 1 | From 8c9c728757f89ebe6c4019114b83a63c63596f69 Mon Sep 17 00:00:00 2001 |
2 | From: "Hongjun.Yang" <hongjun.yang@windriver.com> | 2 | From: "Hongjun.Yang" <hongjun.yang@windriver.com> |
3 | Date: Wed, 22 Oct 2014 10:02:48 +0800 | 3 | Date: Wed, 2 Oct 2019 16:57:06 -0400 |
4 | Subject: [PATCH] Add ptest for tcpdump | 4 | Subject: [PATCH] Add ptest for tcpdump |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> | 8 | Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> |
9 | Signed-off-by: Peiran Hong <peiran.hong@windriver.com> | ||
9 | 10 | ||
10 | --- | 11 | --- |
11 | Makefile.in | 10 +++++++++- | 12 | Makefile.in | 10 +++++++++- |
12 | 1 file changed, 9 insertions(+), 1 deletion(-) | 13 | 1 file changed, 9 insertions(+), 1 deletion(-) |
13 | 14 | ||
14 | diff --git a/Makefile.in b/Makefile.in | 15 | diff --git a/Makefile.in b/Makefile.in |
15 | index 0941f0e..3ce40c6 100644 | 16 | index 3b589184..7b10e38c 100644 |
16 | --- a/Makefile.in | 17 | --- a/Makefile.in |
17 | +++ b/Makefile.in | 18 | +++ b/Makefile.in |
18 | @@ -437,9 +437,17 @@ distclean: | 19 | @@ -437,9 +437,17 @@ distclean: |
@@ -23,7 +24,7 @@ index 0941f0e..3ce40c6 100644 | |||
23 | +buildtest-TESTS: tcpdump | 24 | +buildtest-TESTS: tcpdump |
24 | + | 25 | + |
25 | +runtest-PTEST: | 26 | +runtest-PTEST: |
26 | (cd tests && ./TESTrun.sh) | 27 | (mkdir -p tests && SRCDIR=`cd ${srcdir}; pwd` && export SRCDIR && $$SRCDIR/tests/TESTrun.sh ) |
27 | 28 | ||
28 | +install-ptest: | 29 | +install-ptest: |
29 | + cp -r tests $(DESTDIR) | 30 | + cp -r tests $(DESTDIR) |
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch b/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch index d82c16053..977ab95b7 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From a2bfd28034d9aa48d8ff109c1314e53bc9779752 Mon Sep 17 00:00:00 2001 | 1 | From 02085028cdaf075943c27ebc02bb6de0289ec1d3 Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Wed, 24 Oct 2018 22:26:08 -0700 | 3 | Date: Wed, 2 Oct 2019 16:43:48 -0400 |
4 | Subject: [PATCH] avoid absolute path when searching for libdlpi | 4 | Subject: [PATCH] avoid absolute path when searching for libdlpi |
5 | 5 | ||
6 | Let the build environment control library search paths. | 6 | Let the build environment control library search paths. |
@@ -8,15 +8,16 @@ Let the build environment control library search paths. | |||
8 | Upstream-Status: Inappropriate [OE specific] | 8 | Upstream-Status: Inappropriate [OE specific] |
9 | 9 | ||
10 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 10 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
11 | Signed-off-by: Peiran Hong <peiran.hong@windriver.com> | ||
11 | --- | 12 | --- |
12 | configure.in | 2 +- | 13 | configure.ac | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/configure.in b/configure.in | 16 | diff --git a/configure.ac b/configure.ac |
16 | index c882909..52aefd6 100644 | 17 | index 3401a7a3..6a52485a 100644 |
17 | --- a/configure.in | 18 | --- a/configure.ac |
18 | +++ b/configure.in | 19 | +++ b/configure.ac |
19 | @@ -542,7 +542,7 @@ don't.]) | 20 | @@ -528,7 +528,7 @@ don't.]) |
20 | fi | 21 | fi |
21 | 22 | ||
22 | # libdlpi is needed for Solaris 11 and later. | 23 | # libdlpi is needed for Solaris 11 and later. |
@@ -26,5 +27,5 @@ index c882909..52aefd6 100644 | |||
26 | dnl | 27 | dnl |
27 | dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()", | 28 | dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()", |
28 | -- | 29 | -- |
29 | 1.9.1 | 30 | 2.17.1 |
30 | 31 | ||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index c03a8b8ef..2bfb2267d 100755 --- a/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest +++ b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | make -k runtest-PTEST | sed -e '/: passed/ s/^/PASS: /g' \ | 2 | make -k runtest-PTEST | sed -e '/: passed/ s/^/PASS: /g' \ |
3 | -e '/: failed/ s/^/FAIL: /g' \ | 3 | -e '/: TEST FAILED.*/ s/^/FAIL: /g' \ |
4 | -e 's/: passed//g' \ | 4 | -e 's/: passed//g' \ |
5 | -e 's/: failed//g' | 5 | -e 's/: TEST FAILED.*//g' |
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index 69d68baac..8793bf7a3 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch | |||
@@ -15,15 +15,16 @@ Upstream-Status: Inappropriate [OE specific] | |||
15 | 15 | ||
16 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 16 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
17 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 17 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
18 | Signed-off-by: Peiran Hong <peiran.hong@windriver.com> | ||
18 | --- | 19 | --- |
19 | configure.in | 4 +++- | 20 | configure.ac | 4 +++- |
20 | 1 file changed, 3 insertions(+), 1 deletion(-) | 21 | 1 file changed, 3 insertions(+), 1 deletion(-) |
21 | 22 | ||
22 | diff --git a/configure.in b/configure.in | 23 | diff --git a/configure.ac b/configure.ac |
23 | index b2305a5..c882909 100644 | 24 | index 56e2a624..3401a7a3 100644 |
24 | --- a/configure.in | 25 | --- a/configure.ac |
25 | +++ b/configure.in | 26 | +++ b/configure.ac |
26 | @@ -418,7 +418,9 @@ dnl Some platforms may need -lnsl for getrpcbynumber. | 27 | @@ -404,7 +404,9 @@ dnl Some platforms may need -lnsl for getrpcbynumber. |
27 | AC_SEARCH_LIBS(getrpcbynumber, nsl, | 28 | AC_SEARCH_LIBS(getrpcbynumber, nsl, |
28 | AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) | 29 | AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) |
29 | 30 | ||
@@ -35,5 +36,5 @@ index b2305a5..c882909 100644 | |||
35 | # | 36 | # |
36 | # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate | 37 | # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate |
37 | -- | 38 | -- |
38 | 1.9.1 | 39 | 2.17.1 |
39 | 40 | ||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb index 9bd861cd4..3cd12aee7 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb | |||
@@ -6,17 +6,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" | |||
6 | 6 | ||
7 | DEPENDS = "libpcap" | 7 | DEPENDS = "libpcap" |
8 | 8 | ||
9 | RDEPENDS_${PN}-ptest += " make perl \ | ||
10 | perl-module-file-basename \ | ||
11 | perl-module-posix \ | ||
12 | perl-module-carp" | ||
13 | |||
9 | SRC_URI = " \ | 14 | SRC_URI = " \ |
10 | http://www.tcpdump.org/release/${BP}.tar.gz \ | 15 | http://www.tcpdump.org/release/${BP}.tar.gz \ |
11 | file://unnecessary-to-check-libpcap.patch \ | 16 | file://unnecessary-to-check-libpcap.patch \ |
12 | file://avoid-absolute-path-when-searching-for-libdlpi.patch \ | 17 | file://avoid-absolute-path-when-searching-for-libdlpi.patch \ |
13 | file://add-ptest.patch \ | 18 | file://add-ptest.patch \ |
14 | file://run-ptest \ | 19 | file://run-ptest \ |
15 | file://0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch \ | ||
16 | " | 20 | " |
17 | 21 | ||
18 | SRC_URI[md5sum] = "9bbc1ee33dab61302411b02dd0515576" | 22 | SRC_URI[md5sum] = "a4ead41d371f91aa0a2287f589958bae" |
19 | SRC_URI[sha256sum] = "798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79" | 23 | SRC_URI[sha256sum] = "2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410" |
20 | 24 | ||
21 | inherit autotools-brokensep ptest | 25 | inherit autotools-brokensep ptest |
22 | 26 | ||
@@ -25,6 +29,8 @@ PACKAGECONFIG ?= "openssl" | |||
25 | PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" | 29 | PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" |
26 | PACKAGECONFIG[openssl] = "--with-crypto,--without-openssl --without-crypto,openssl" | 30 | PACKAGECONFIG[openssl] = "--with-crypto,--without-openssl --without-crypto,openssl" |
27 | PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" | 31 | PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" |
32 | # Note: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled) | ||
33 | PACKAGECONFIG[smb] = "--enable-smb,--disable-smb" | ||
28 | 34 | ||
29 | EXTRA_AUTORECONF += "-I m4" | 35 | EXTRA_AUTORECONF += "-I m4" |
30 | 36 | ||