summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2019-11-19 11:39:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:38:52 +0000
commit366e5937f396f6da353f903340a37db1b4bc84b5 (patch)
tree35f11280b5848f9a98660f303aa5118f6f3f940e /meta
parent2969279a63c6302f1976ab3092f8ac0ed9ae4bbe (diff)
downloadpoky-366e5937f396f6da353f903340a37db1b4bc84b5.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. (From OE-Core rev: d0e3d1f9437b2e2c6284d9fad51bb11ebe72a46c) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch29
-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 @@
1From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00 2001
2From: maxice8 <thinkabit.ukim@gmail.com>
3Date: Sun, 22 Jul 2018 18:54:17 -0300
4Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl systems.
5
6fix compilation on musl libc systems like Void Linux and Alpine.
7
8Upstream-Status: Backport [https://github.com/the-tcpdump-group/libpcap/commit/d557c98a16dc254aaff03762b694fe624e180bea]
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 pcap-usb-linux.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
16index 6f8adf65..b92c05ea 100644
17--- a/pcap-usb-linux.c
18+++ b/pcap-usb-linux.c
19@@ -50,6 +50,7 @@
20 #include <stdlib.h>
21 #include <unistd.h>
22 #include <fcntl.h>
23+#include <limits.h>
24 #include <string.h>
25 #include <dirent.h>
26 #include <byteswap.h>
27--
282.17.1
29
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 \
11DEPENDS = "flex-native bison-native" 11DEPENDS = "flex-native bison-native"
12 12
13SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \ 13SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \
14 file://0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch \
15 " 14 "
16SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33" 15SRC_URI[md5sum] = "21af603d9a591c7d96a6457021d84e6c"
17SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019" 16SRC_URI[sha256sum] = "635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094"
18 17
19inherit autotools binconfig-disabled pkgconfig bluetooth 18inherit autotools binconfig-disabled pkgconfig bluetooth
20 19