From d940c11e66efedfbd3cd5c694a8058464ca8ca70 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Wed, 8 Feb 2017 15:42:02 -0800 Subject: tcpdump: update to 4.9.0 for security fixes CVE included in this release: CVE-2016-7922 CVE-2016-7923 CVE-2016-7924 CVE-2016-7925 CVE-2016-7926 CVE-2016-7927 CVE-2016-7928 CVE-2016-7929 CVE-2016-7930 CVE-2016-7931 CVE-2016-7932 CVE-2016-7933 CVE-2016-7934 CVE-2016-7935 CVE-2016-7936 CVE-2016-7937 CVE-2016-7938 CVE-2016-7939 CVE-2016-7940 CVE-2016-7973 CVE-2016-7974 CVE-2016-7975 CVE-2016-7983 CVE-2016-7984 CVE-2016-7985 CVE-2016-7986 CVE-2016-7992 CVE-2016-7993 CVE-2016-8574 CVE-2016-8575 CVE-2017-5202 CVE-2017-5203 CVE-2017-5204 CVE-2017-5205 CVE-2017-5341 CVE-2017-5342 CVE-2017-5482 CVE-2017-5483 CVE-2017-5484 CVE-2017-5485 CVE-2017-5486 updated add-ptest patch to apply to Makefile.in Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../tcpdump/tcpdump/add-ptest.patch | 25 +++++------ .../recipes-support/tcpdump/tcpdump_4.8.1.bb | 50 --------------------- .../recipes-support/tcpdump/tcpdump_4.9.0.bb | 52 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 64 deletions(-) delete mode 100644 meta-networking/recipes-support/tcpdump/tcpdump_4.8.1.bb create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb (limited to 'meta-networking/recipes-support/tcpdump') diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index 358f6050f6..196cec7f20 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -10,11 +10,11 @@ Signed-off-by: Hongjun.Yang Makefile.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in -index 8c35a45..4fb8ae6 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -428,9 +428,17 @@ distclean: +Index: tcpdump-4.9.0/Makefile.in +=================================================================== +--- tcpdump-4.9.0.orig/Makefile.in ++++ tcpdump-4.9.0/Makefile.in +@@ -436,9 +436,17 @@ distclean: tests/failure-outputs.txt rm -rf autom4te.cache tests/DIFF tests/NEW @@ -25,14 +25,11 @@ index 8c35a45..4fb8ae6 100644 (cd tests && ./TESTrun.sh) +install-ptest: -+ cp -r tests $(DESTDIR) -+ cp -r config.h $(DESTDIR) -+ install -m 0755 Makefile $(DESTDIR) -+ ln -sf /usr/sbin/tcpdump $(DESTDIR)/tcpdump ++ cp -r tests $(DESTDIR) ++ cp -r config.h $(DESTDIR) ++ install -m 0755 Makefile $(DESTDIR) ++ ln -sf /usr/sbin/tcpdump $(DESTDIR)/tcpdump + - tags: $(TAGFILES) - ctags -wtd $(TAGFILES) + extags: $(TAGFILES) + ctags $(TAGFILES) --- -1.9.1 - diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.8.1.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.8.1.bb deleted file mode 100644 index 35a5cfed17..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.8.1.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" -SECTION = "net" -DEPENDS = "libpcap" - -SRC_URI = " \ - http://www.tcpdump.org/release/${BP}.tar.gz \ - file://unnecessary-to-check-libpcap.patch \ - file://tcpdump-configure-dlpi.patch \ - file://add-ptest.patch \ - file://run-ptest \ -" -SRC_URI[md5sum] = "32f57943649f276e09236ba66622bb0c" -SRC_URI[sha256sum] = "20e4341ec48fcf72abcae312ea913e6ba6b958617b2f3fb496d51f0ae88d831c" -export LIBS=" -lpcap" - -inherit autotools-brokensep ptest -CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" - -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-crypto=yes, --without-openssl --without-crypto, openssl" -PACKAGECONFIG[smi] = "--with-smi, --without-smi,libsmi" -PACKAGECONFIG[libcap-ng] = "--with-cap-ng=yes,--with-cap-ng=no,libcap-ng" - -EXTRA_AUTORECONF += " -I m4" - -do_configure_prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi - # AC_CHECK_LIB(dlpi.. was looking to host /lib - sed -i 's:-L/lib::g' ./configure.in -} -do_configure_append() { - sed -i 's:-L/usr/lib::' ./Makefile - sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile - sed -i 's:-I/usr/include::' ./Makefile -} - -do_install_append() { - # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 - rm -f ${D}${sbindir}/tcpdump.${PV} -} - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb new file mode 100644 index 0000000000..43e388ccc7 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.9.0.bb @@ -0,0 +1,52 @@ +SUMMARY = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" +SECTION = "net" +DEPENDS = "libpcap" + +SRC_URI = " \ + http://www.tcpdump.org/release/${BP}.tar.gz \ + file://unnecessary-to-check-libpcap.patch \ + file://tcpdump-configure-dlpi.patch \ + file://add-ptest.patch \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "2b83364eef53b63ca3181b4eb56dab0c" +SRC_URI[sha256sum] = "eae98121cbb1c9adbedd9a777bf2eae9fa1c1c676424a54740311c8abcee5a5e" + +export LIBS=" -lpcap" + +inherit autotools-brokensep ptest +CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" + +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--with-crypto=yes, --without-openssl --without-crypto, openssl" +PACKAGECONFIG[smi] = "--with-smi, --without-smi,libsmi" +PACKAGECONFIG[libcap-ng] = "--with-cap-ng=yes,--with-cap-ng=no,libcap-ng" + +EXTRA_AUTORECONF += " -I m4" + +do_configure_prepend() { + mkdir -p ${S}/m4 + if [ -f aclocal.m4 ]; then + mv aclocal.m4 ${S}/m4 + fi + # AC_CHECK_LIB(dlpi.. was looking to host /lib + sed -i 's:-L/lib::g' ./configure.in +} +do_configure_append() { + sed -i 's:-L/usr/lib::' ./Makefile + sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile + sed -i 's:-I/usr/include::' ./Makefile +} + +do_install_append() { + # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 + rm -f ${D}${sbindir}/tcpdump.${PV} +} + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} -- cgit 1.2.3-korg