meta-openembedded: subtree update:9fdc7960ba..e4a3c66505

Alexander Kanavin (4):
      msgpack-c: update 3.2.1 -> 4.0.0, add msgpack-cpp
      can-utils: rrecommend iproute2 to make it possible to configure can interfaces
      fmt: update 7.1.3 -> 8.0.1
      spdlog: update 1.8.2 -> 1.9.2

Changqing Li (3):
      ndpi: upgrade 3.4 -> 4.0
      ntopng: upgrade 4.2 -> 5.0
      postgresql: upgrade 13.3 -> 13.4

Jan-Simon Moeller (1):
      Remove patch that produces a segfault in the ptest of lua

Joe Slater (1):
      redis: advance to version 6.2.5

Khem Raj (10):
      gjs: Remove valgrind dependency on rv32/rv64
      toybox-inittab: Use 0BSD for LIC_FILES_CHKSUM
      python3-kivy: Remove hardcoded include paths
      python3-kivy: Check for x11 and opengl before enabling the recipe
      packagegroup-meta-python: Add python3-kivy
      packagegroup-meta-python: Add python3-portalocker
      gst-shark: Define SRCREV_FORMAT
      android-tools: Define SRCREV_FORMAT
      packagegroup-meta-oe: Add pahole
      pahole: Add missing rdep for python

Kristian Klausen (1):
      cryptsetup: Add runtime dependency on lvm2-udevrules for udev

Martin Jansa (1):
      python3-regex: upgrade to 2021.8.28

Matteo Croce (2):
      recipes-devtools: add pahole
      libbpf: bump to 0.5.0

Mingli Yu (1):
      polkit: add the CVE tag

Patrick Williams (2):
      gjs: fix typo in RDEPENDS variable name
      ndisc6: fix typo in DESCRIPTION variable name

Peter Morrow (1):
      libbpf: remove kernel configuration dependency

Samuel Dolt (4):
      python3-alembic: add native and nativesdk to BBCLASSEXTEND
      python3-editor: add native and nativesdk to BBCLASSEXTEND
      python3-sqlalchemy: add native and nativesdk to BBCLASSEXTEND
      python3-portalocker: add recipe

Trevor Gamblin (2):
      python3-pytest-subtests: add recipe
      python3-pillow: upgrade 8.3.1 -> 8.3.2

Wang Mingyu (3):
      python3-cryptography-vectors: upgrade 3.4.7 -> 3.4.8
      python3-google-api-python-client: upgrade 2.18.0 -> 2.19.1
      dnf-plugin-tui: upgrade 1.2 -> 1.3

William A. Kennington III (1):
      ndisc6: Upgrade 1.0.4 -> 1.0.5

William Huang (1):
      recipes-devtools: python: add support for Kivy

Yi Zhao (4):
      krb5: fix CVE-2021-36222
      krb5: fix CVE-2021-37750
      net-snmp: drop unused patch
      net-snmp: make sure snmpd always exit after displaying usage

wangmy (10):
      cjson: upgrade 1.7.14 -> 1.7.15
      libwebsockets: upgrade 4.2.1 -> 4.2.2
      monit: upgrade 5.28.1 -> 5.29.0
      nlohmann-json: upgrade 3.9.1 -> 3.10.2
      cppzmq: upgrade 4.7.1 -> 4.8.0
      dfu-util: upgrade 0.10 -> 0.11
      libqmi: upgrade 1.30.0 -> 1.30.2
      lockfile-progs: upgrade 0.1.18 -> 0.1.19
      poppler-data: upgrade 0.4.10 -> 0.4.11
      dnsmasq: upgrade 2.85 -> 2.86

zangrc (11):
      python3-ipython: upgrade 7.26.0 -> 7.27.0
      python3-kiwisolver: upgrade 1.3.1 -> 1.3.2
      python3-ruamel-yaml: upgrade 0.17.13 -> 0.17.16
      python3-traitlets: upgrade 5.0.5 -> 5.1.0
      gsl: upgrade 2.6 -> 2.7
      crash: upgrade 7.2.9 -> 7.3.0
      dash: upgrade 0.5.11.3 -> 0.5.11.5
      python3-bitarray: upgrade 2.3.2 -> 2.3.3
      python3-lrparsing: upgrade 1.0.16 -> 1.0.17
      python3-transitions: upgrade 0.8.8 -> 0.8.9
      libxmlb: upgrade 0.3.1 -> 0.3.2

zhengruoqin (15):
      wireshark: upgrade 3.4.7 -> 3.4.8
      uhubctl: upgrade 2.3.0 -> 2.4.0
      unclutter-xfixes: upgrade 1.5 -> 1.6
      avro-c: upgrade 1.9.2 -> 1.10.2
      ctags: upgrade 5.9.20210815 -> 5.9.20210905
      xf86-video-nouveau: upgrade 1.0.16 -> 1.0.17
      fuse3: upgrade 3.10.4 -> 3.10.5
      mosquitto: upgrade 2.0.11 -> 2.0.12
      poppler: upgrade 21.08.0 -> 21.09.0
      libbytesize: upgrade 2.4 -> 2.6
      libeigen: upgrade 3.3.9 -> 3.4.0
      libjcat: upgrade 0.1.7 -> 0.1.8
      unbound: upgrade 1.12.0 -> 1.13.2
      xterm: upgrade 367 -> 368
      zchunk: upgrade 1.1.9 -> 1.1.16

Change-Id: I5a866e7773b8c906bc2bd8a4ddf99f006534bf53
Signed-off-by: William A. Kennington III <wak@google.com>

3 files changed, 4 insertions, 160 deletions

diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch
deleted file mode 100644
index dc58b5b79..000000000
--- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 3a7d5396e633e6c02a4583be7faf3d79d0d33748 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 31 Aug 2017 11:14:41 -0700
-Subject: [PATCH 1/2] replace VLAIS with malloc/free pair
-
-Makes it compatible with non-gnu compilers
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- src/trace-icmp.c |  7 +++++--
- src/trace-tcp.c  | 14 ++++++++++----
- src/trace-udp.c  |  7 +++++--
- 3 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/src/trace-icmp.c b/src/trace-icmp.c
-index 842938e..c76cb54 100644
---- a/src/trace-icmp.c
-+++ b/src/trace-icmp.c
-@@ -43,16 +43,19 @@ send_echo_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port)
- 	struct
- 	{
- 		struct icmp6_hdr ih;
--		uint8_t payload[plen - sizeof (struct icmp6_hdr)];
-+		uint8_t *payload;
- 	} packet;
- 	memset (&packet, 0, plen);
-+	packet.payload = malloc(plen - sizeof (struct icmp6_hdr));
- 
- 	packet.ih.icmp6_type = ICMP6_ECHO_REQUEST;
- 	packet.ih.icmp6_id = htons (getpid ());
- 	packet.ih.icmp6_seq = htons ((ttl << 8) | (n & 0xff));
- 	(void)port;
- 
--	return send_payload (fd, &packet.ih, plen, ttl);
-+	ssize_t ret = send_payload (fd, &packet.ih, plen, ttl);
-+	free(packet.payload);
-+	return ret;
- }
- 
- 
-diff --git a/src/trace-tcp.c b/src/trace-tcp.c
-index 940f918..62d22ff 100644
---- a/src/trace-tcp.c
-+++ b/src/trace-tcp.c
-@@ -54,10 +54,11 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port)
- 	struct
- 	{
- 		struct tcphdr th;
--		uint8_t payload[plen - sizeof (struct tcphdr)];
-+		uint8_t *payload;
- 	} packet;
- 
- 	memset (&packet, 0, sizeof (packet));
-+	packet.payload = malloc(plen - sizeof (struct tcphdr));
- 	packet.th.th_sport = sport;
- 	packet.th.th_dport = port;
- 	packet.th.th_seq = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ());
-@@ -65,7 +66,9 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port)
- 	packet.th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0);
- 	packet.th.th_win = htons (TCP_WINDOW);
- 
--	return send_payload (fd, &packet, plen, ttl);
-+	ssize_t ret = send_payload (fd, &packet, plen, ttl);
-+	free(packet.payload);
-+	return ret;
- }
- 
- 
-@@ -131,10 +134,11 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port)
- 	struct
- 	{
- 		struct tcphdr th;
--		uint8_t payload[plen - sizeof (struct tcphdr)];
-+		uint8_t *payload;
- 	} packet;
- 
- 	memset (&packet, 0, sizeof (packet));
-+	packet.payload = malloc(plen - sizeof (struct tcphdr));
- 	packet.th.th_sport = sport;
- 	packet.th.th_dport = port;
- 	packet.th.th_ack = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ());
-@@ -142,7 +146,9 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port)
- 	packet.th.th_flags = TH_ACK;
- 	packet.th.th_win = htons (TCP_WINDOW);
- 
--	return send_payload (fd, &packet, plen, ttl);
-+	ssize_t ret = send_payload (fd, &packet, plen, ttl);
-+	free(packet.payload);
-+	return ret;
- }
- 
- 
-diff --git a/src/trace-udp.c b/src/trace-udp.c
-index 4adde6b..a6cbb07 100644
---- a/src/trace-udp.c
-+++ b/src/trace-udp.c
-@@ -46,9 +46,10 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port)
- 	struct
- 	{
- 		struct udphdr uh;
--		uint8_t payload[plen - sizeof (struct udphdr)];
-+		uint8_t *payload;
- 	} packet;
- 	memset (&packet, 0, plen);
-+	packet.payload = malloc(plen - sizeof (struct udphdr));
- 
- 	(void)n;
- 	packet.uh.uh_sport = sport;
-@@ -61,7 +62,9 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port)
- 	/*if (plen > sizeof (struct udphdr))
- 		packet.payload[0] = (uint8_t)ttl;*/
- 
--	return send_payload (fd, &packet, plen, ttl);
-+	ssize_t ret = send_payload (fd, &packet, plen, ttl);
-+	free(packet.payload);
-+	return ret;
- }
- 
- 
--- 
-2.14.1
-
diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch
deleted file mode 100644
index 3cc2ba80c..000000000
--- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2a50154fbce38fd36be7e14f5cd4a8b03c65c72f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 31 Aug 2017 11:15:37 -0700
-Subject: [PATCH 2/2] Do not undef _GNU_SOURCE
-
-There are functions from tcp.h which are under _GNU_SOURCE
-in musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- src/trace-tcp.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/trace-tcp.c b/src/trace-tcp.c
-index 62d22ff..380008e 100644
---- a/src/trace-tcp.c
-+++ b/src/trace-tcp.c
-@@ -21,7 +21,6 @@
- # include <config.h>
- #endif
- 
--#undef _GNU_SOURCE
- #define _DEFAULT_SOURCE 1
- 
- #include <string.h>
--- 
-2.14.1
-
diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb
index e9af2c43f..037d929b6 100644
--- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb
+++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb
@@ -5,11 +5,9 @@ HOMEPAGE = "http://www.remlab.net/ndisc6/"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-PV = "1.0.4+git${SRCPV}"
-SRCREV = "4c794b5512d23c649def1f94a684225dcbb6ac3e"
+PV = "1.0.5"
+SRCREV = "b706f5f01aa82aa0db678fffd15a1527f330c507"
 SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http \
-           file://0001-replace-VLAIS-with-malloc-free-pair.patch \
-           file://0002-Do-not-undef-_GNU_SOURCE.patch \
            file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \
            "
 
@@ -60,11 +58,11 @@ IPv4 world."
 DESCRIPTION:${PN}-rdisc6    = "ICMPv6 Router Discovery tool. \
 Queries IPv6 routers on the network for advertised prefixes. Can be used \
 to detect rogue IPv6 routers, monitor legitimate IPv6 routers."
-DESCRITPION_${PN}-tcpspray6    = "Performs bandwidth measurements of TCP \
+DESCRIPTION:${PN}-tcpspray6    = "Performs bandwidth measurements of TCP \
 sessions between the local system and a remote echo server in either IPv6 \
 or IPv4."
 
-DESCRITPION_${PN}-rdnssd       = "Daemon to autoconfigure the list of DNS \
+DESCRIPTION:${PN}-rdnssd       = "Daemon to autoconfigure the list of DNS \
 servers through slateless IPv6 autoconfiguration."
 
 # The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to