diff options
| author |   Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2019-11-19 11:39:33 +0200 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2019-11-24 08:55:09 -0800 |
| commit | d0e3d1f9437b2e2c6284d9fad51bb11ebe72a46c (patch) | |
| tree | 54d2acda5d29ab49994f0da78eb1461995271128 | |
| parent | afc529aa689daed18af29ecc64f3dae1fcbdc282 (diff) | |
| download | openembedded-core-d0e3d1f9437b2e2c6284d9fad51bb11ebe72a46c.tar.gz | |
libpcap: upgrade 1.9.0 -> 1.9.1
-libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch
Removed since this is included in 1.9.1.
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[CVE-2018-16301 CVE-2019-15161 CVE-2019-15162 CVE-2019-15163 CVE-2019-15164 CVE-2019-15165]
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap_1.9.1.bb (renamed from meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb) | 5 |
2 files changed, 2 insertions, 32 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch b/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch deleted file mode 100644 index 01773834c7..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00 2001 -From: maxice8 <thinkabit.ukim@gmail.com> -Date: Sun, 22 Jul 2018 18:54:17 -0300 -Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl systems. - -fix compilation on musl libc systems like Void Linux and Alpine. - -Upstream-Status: Backport [https://github.com/the-tcpdump-group/libpcap/commit/d557c98a16dc254aaff03762b694fe624e180bea] - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - pcap-usb-linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c -index 6f8adf65..b92c05ea 100644 ---- a/pcap-usb-linux.c -+++ b/pcap-usb-linux.c -@@ -50,6 +50,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <fcntl.h> -+#include <limits.h> - #include <string.h> - #include <dirent.h> - #include <byteswap.h> --- -2.17.1 - diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb b/meta/recipes-connectivity/libpcap/libpcap_1.9.1.bb index 78361561e6..a0f66ac0fa 100644 --- a/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb +++ b/meta/recipes-connectivity/libpcap/libpcap_1.9.1.bb @@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \ DEPENDS = "flex-native bison-native" SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \ - file://0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch \ " -SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33" -SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019" +SRC_URI[md5sum] = "21af603d9a591c7d96a6457021d84e6c" +SRC_URI[sha256sum] = "635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094" inherit autotools binconfig-disabled pkgconfig bluetooth |