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>
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch
index a5ac59f..02cd94a 100644
--- a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch
@@ -1,4 +1,4 @@
-From 81e3512718f80965c26ccb1f9d694c91b121fea0 Mon Sep 17 00:00:00 2001
+From d9458227ddb4bbb8c63c607202a6854886d66090 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Wed, 4 Nov 2020 06:28:28 +0000
 Subject: [PATCH] configure.seed: fix host contamination
@@ -11,14 +11,14 @@
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
- configure.seed | 47 +++++------------------------------------------
- 1 file changed, 5 insertions(+), 42 deletions(-)
+ configure.seed | 43 +++----------------------------------------
+ 1 file changed, 3 insertions(+), 40 deletions(-)
 
 diff --git a/configure.seed b/configure.seed
-index 03f9a31b0..58aebb5b8 100644
+index a148c530a..55bd49678 100644
 --- a/configure.seed
 +++ b/configure.seed
-@@ -79,31 +79,6 @@ fi
+@@ -144,31 +144,6 @@ fi
  #
  REVISION=`git log --pretty=oneline | wc -l`
  
@@ -50,7 +50,7 @@
  SHORT_MACHINE=`uname -m | cut -b1-3`
  
  GIT_RELEASE="@GIT_RELEASE@"
-@@ -214,23 +189,11 @@ dnl> fi
+@@ -293,23 +268,11 @@ fi
  pkg-config --exists libssl
  if test "$?" -ne 1; then
    AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
@@ -62,7 +62,7 @@
 -  if test -d "/usr/local/opt/openssl/lib"; then
 -    AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
 -    SSL_INC="-I/usr/local/opt/openssl/include"
--    SSL_LIB="-L/usr/local/opt/openssl/lib -lssl"
+-    SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto"
 -  dnl Workaround for FreeBSD
 -  elif test -f "/usr/lib/libssl.so"; then
 -    AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
@@ -78,5 +78,5 @@
  
  AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt"])
 -- 
-2.26.2
+2.17.1