diff options
Diffstat (limited to 'meta-networking/recipes-support/tcpdump')
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch | 28 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch | 31 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch | 40 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb (renamed from meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb) | 37 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch | 75 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch | 15 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb | 36 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb | 24 |
8 files changed, 62 insertions, 224 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index f8ff354fe1..c46de4b963 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,6 +1,6 @@ -From 8c9c728757f89ebe6c4019114b83a63c63596f69 Mon Sep 17 00:00:00 2001 -From: "Hongjun.Yang" <hongjun.yang@windriver.com> -Date: Wed, 2 Oct 2019 16:57:06 -0400 +From 5f0f70192b0e20336e642b02ca9662ba2fef66cf Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Fri, 19 Feb 2021 15:21:18 -0500 Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending @@ -8,15 +8,21 @@ Upstream-Status: Pending Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> Signed-off-by: Peiran Hong <peiran.hong@windriver.com> +remove perl script not required by ptest causing QA problems + +reference upstream issue/commit: +https://github.com/the-tcpdump-group/tcpdump/issues/26 + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- - Makefile.in | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + Makefile.in | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 3b589184..7b10e38c 100644 +index ea1ef1d0..e7987bd8 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -437,9 +437,17 @@ distclean: +@@ -445,9 +445,18 @@ distclean: tests/failure-outputs.txt rm -rf autom4te.cache tests/DIFF tests/NEW @@ -24,14 +30,18 @@ index 3b589184..7b10e38c 100644 +buildtest-TESTS: tcpdump + +runtest-PTEST: - (mkdir -p tests && SRCDIR=`cd ${srcdir}; pwd` && export SRCDIR && $$SRCDIR/tests/TESTrun.sh ) + $(srcdir)/tests/TESTrun +install-ptest: + cp -r tests $(DESTDIR) ++ rm $(DESTDIR)/tests/setkey2esp-secrets.pl + cp -r config.h $(DESTDIR) + install -m 0755 Makefile $(DESTDIR) -+ ln -sf /usr/sbin/tcpdump $(DESTDIR)/tcpdump ++ ln -s /usr/bin/tcpdump $(DESTDIR)/tcpdump + extags: $(TAGFILES) ctags $(TAGFILES) +-- +2.29.2 + 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 deleted file mode 100644 index 977ab95b78..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 02085028cdaf075943c27ebc02bb6de0289ec1d3 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -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. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> -Signed-off-by: Peiran Hong <peiran.hong@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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. --AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) -+AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi") - - dnl - dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()", --- -2.17.1 - 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 deleted file mode 100644 index 8793bf7a37..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ /dev/null @@ -1,40 +0,0 @@ -From dd023c133980fcc0cff5896e85377675e0571894 Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Tue, 8 Jul 2014 13:20:47 +0800 -Subject: [PATCH] unnecessary to check libpcap - -since the check of libpcap did not consider the cross-compile, lead to the -below error: - This autoconf log indicates errors, it looked at host include and/or - library paths while determining system capabilities. - -In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to -check if libpcap existed. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> -Signed-off-by: Peiran Hong <peiran.hong@windriver.com> ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -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()])) - --AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) -+# Simplified (more cross compile friendly) check for libpcap. All we really -+# need is to sanity check that libpcap is available and add -lpcap to LIBS. -+AC_CHECK_LIB(pcap, pcap_compile, LIBS="$LIBS -lpcap") - - # - # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate --- -2.17.1 - diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb index 94543dd1da..803a9bb5f5 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb @@ -2,27 +2,35 @@ SUMMARY = "A sophisticated network protocol analyzer" HOMEPAGE = "http://www.tcpdump.org/" SECTION = "net" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453" DEPENDS = "libpcap" -RDEPENDS_${PN}-ptest += " make perl \ +RDEPENDS:${PN}-ptest += " make perl \ perl-module-file-basename \ + perl-module-file-spec \ + perl-module-file-spec-unix \ + perl-module-file-path \ + perl-module-file-glob \ + perl-module-data-dumper \ + perl-module-bytes \ perl-module-posix \ - perl-module-carp" + perl-module-carp \ + perl-module-cwd \ + perl-module-constant \ +" 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" +SRC_URI[sha256sum] = "0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea" + +UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" -inherit autotools-brokensep ptest +inherit autotools-brokensep pkgconfig ptest PACKAGECONFIG ?= "openssl" @@ -32,18 +40,11 @@ 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() { +do_install:append() { # make install installs an unneeded extra copy of the tcpdump binary - rm -f ${D}${sbindir}/tcpdump.${PV} + rm ${D}${bindir}/tcpdump.${PV} } do_compile_ptest() { diff --git a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch b/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch deleted file mode 100644 index 386b7f83ac..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch +++ /dev/null @@ -1,75 +0,0 @@ -Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> - ---- tcpslice-1.2a3.orig/search.c 2000-09-10 10:52:40.000000000 +0200 -+++ tcpslice-1.2a3/search.c 2006-07-28 14:56:55.000000000 +0200 -@@ -53,7 +53,7 @@ - /* Size of a packet header in bytes; easier than typing the sizeof() all - * the time ... - */ --#define PACKET_HDR_LEN (sizeof( struct pcap_pkthdr )) -+#define PACKET_HDR_LEN (sizeof( struct pcap_sf_pkthdr )) - - extern int snaplen; - -@@ -111,16 +111,24 @@ - static void - extract_header( pcap_t *p, u_char *buf, struct pcap_pkthdr *hdr ) - { -- memcpy((char *) hdr, (char *) buf, sizeof(struct pcap_pkthdr)); -+ struct pcap_sf_pkthdr hdri; -+ -+ memcpy((char *) &hdri, (char *) buf, sizeof(struct pcap_sf_pkthdr)); - - if ( pcap_is_swapped( p ) ) - { -- hdr->ts.tv_sec = SWAPLONG(hdr->ts.tv_sec); -- hdr->ts.tv_usec = SWAPLONG(hdr->ts.tv_usec); -- hdr->len = SWAPLONG(hdr->len); -- hdr->caplen = SWAPLONG(hdr->caplen); -+ hdr->ts.tv_sec = SWAPLONG(hdri.ts.tv_sec); -+ hdr->ts.tv_usec = SWAPLONG(hdri.ts.tv_usec); -+ hdr->len = SWAPLONG(hdri.len); -+ hdr->caplen = SWAPLONG(hdri.caplen); -+ } -+ else -+ { -+ hdr->ts.tv_sec = hdri.ts.tv_sec; -+ hdr->ts.tv_usec = hdri.ts.tv_usec; -+ hdr->len = hdri.len; -+ hdr->caplen = hdri.caplen; - } -- - /* - * From bpf/libpcap/savefile.c: - * ---- tcpslice-1.2a3.orig/tcpslice.h 1995-11-02 00:40:53.000000000 +0100 -+++ tcpslice-1.2a3/tcpslice.h 2006-07-28 14:56:55.000000000 +0200 -@@ -20,6 +20,26 @@ - */ - - -+#include <time.h> -+/* #include <net/bpf.h> */ -+ -+/* -+ * This is a timeval as stored in disk in a dumpfile. -+ * It has to use the same types everywhere, independent of the actual -+ * `struct timeval' -+ */ -+ -+struct pcap_timeval { -+ bpf_int32 tv_sec; /* seconds */ -+ bpf_int32 tv_usec; /* microseconds */ -+}; -+ -+struct pcap_sf_pkthdr { -+ struct pcap_timeval ts; /* time stamp */ -+ bpf_u_int32 caplen; /* length of portion present */ -+ bpf_u_int32 len; /* length this packet (off wire) */ -+}; -+ - time_t gwtm2secs( struct tm *tm ); - - int sf_find_end( struct pcap *p, struct timeval *first_timestamp, diff --git a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch b/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch deleted file mode 100644 index 0a7359311d..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -diff -ur tcpdump-3.8.1/tcpslice/tcpslice.c tcpdump-3.8.1.new/tcpslice/tcpslice.c ---- tcpslice/tcpslice.c 2004-01-15 17:35:53.000000000 +0100 -+++ tcpslice/tcpslice.c 2004-01-15 16:12:57.000000000 +0100 -@@ -35,7 +35,7 @@ - #include <sys/file.h> - #include <sys/stat.h> - --#include <net/bpf.h> -+/* #include <net/bpf.h> */ - - #include <ctype.h> - #ifdef HAVE_FCNTL_H diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb deleted file mode 100644 index e65739a5c7..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "tcpslice" -DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace." -HOMEPAGE = "http://www.tcpdump.org/related.html" -SECTION = "net" - -LICENSE = "BSD-4-Clause" -LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e" - -SRC_URI = "ftp://ftp.ee.lbl.gov/${BP}.tar.gz \ - file://tcpslice-1.2a3-time.patch \ - file://tcpslice-CVS.20010207-bpf.patch \ - " -SRC_URI[md5sum] = "e329cbeb7e589f132d92c3447c477190" -SRC_URI[sha256sum] = "4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840" - -inherit autotools-brokensep - -DEPENDS += "libpcap" - -# We do not want to autoreconf. We must specify srcdir as ".". -# We have to set the ac_cv_* cache variables as well as pass the normal -# cross-compilation options to configure! -# -do_configure () { - oe_runconf \ - --srcdir="." \ - ac_cv_build=${BUILD_SYS} \ - ac_cv_host=${HOST_SYS} \ - ac_cv_target=${HOST_SYS} -} - -do_install () { - mkdir -p ${D}/usr/sbin - install -c -m 555 tcpslice ${D}/usr/sbin -} - diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb new file mode 100644 index 0000000000..93197dc3bc --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb @@ -0,0 +1,24 @@ +SUMMARY = "tcpslice" +DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace." +HOMEPAGE = "http://www.tcpdump.org/related.html" +SECTION = "net" + +LICENSE = "BSD-4-Clause" +LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e" + +SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ + " +SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903" + +UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar" + +inherit autotools-brokensep pkgconfig + +DEPENDS = "libpcap" + +EXTRA_AUTORECONF += "--exclude=aclocal" + +do_install () { + install -d ${D}${sbindir} + install -m 0755 tcpslice ${D}${sbindir} +} |