meta-openembedded: subtree update:4599fea881..fd123c9bb2

Adrian (1):
      networkmanager: add missing readline depends

Adrian Freihofer (2):
      nftables: upgrade 0.9.7 -> 0.9.8
      firewalld: upgrade 0.9.2 -> 0.9.3

Adrian Herrera (2):
      cppunit: add support for native version
      protobuf: apply fix for pkg-config pthread flags

Alejandro Enedino Hernandez Samaniego (2):
      remmina: Update to 1.4.10
      imapfilter: Upgrade 2.6.16 -> 2.7.5

Anatol Belski (1):
      xmlsec1: Fix configure QA error caused by host lookup path

Andreas Müller (24):
      libunique: remove
      xfce4-screenshooter: replace gtk+ -> gtk+3 in DEPENDS
      libxfce4ui: Fix sporadic install error
      poppler: upgrade 20.12.1 -> 21.01.0
      dconf: upgrade 0.36.0 -> 0.38.0
      dconf-editor: upgrade 3.36.2 -> 3.38.2
      amtk: upgrade 5.1.1 -> 5.2.0
      evince: upgrade 3.36.7 -> 3.38.0
      catfish: upgrade 1.4.13 -> 4.16.0
      xfwm4: upgrade 4.16.0 -> 4.16.1
      parole: upgrade 1.0.5 -> 4.16.0
      garcon: upgrade 0.8.0 -> 4.16.1
      xfce4-whiskermenu-plugin: upgrade 2.5.1 -> 2.5.2
      thunar: upgrade 4.16.0 -> 4.16.2
      jack: upgrade 1.19.16 -> 1.19.17
      networkmanager: upgrade 1.22.14 -> 1.28.0
      appstream-glib: upgrade 0.7.17 -> 0.7.18
      vlc: upgrade 3.0.11.1 -> 3.0.12
      python3-mypy-extensions: Initial add 0.4.3
      python3-mypy: initial add 0.800
      python3-send2trash_ initial add 1.5.0
      python3-asttokens: initial add 2.0.4
      python3-typed-ast: Initial add 1.4.1
      packagegroup-meta-python: Add asttokens/mypy/mypy-extensions/typed-ast/send2trash

Andrew Jeffery (2):
      meta-python: Add hexdump package
      meta-python: Add jstyleson

Armin Kuster (3):
      wireshark: Several securtiy fixes
      ipset: add recipe
      lua: update to 5.3.6

Clément Péron (2):
      re2: Add recipe for Google RE2 library
      abseil-cpp: bump to LTS 2020_09_23 Patch Release 3

Daniel Gomez (2):
      zbar: Add support for mchehab/zbar
      zbar: Remove support for 0.10 version

Diego Santa Cruz (1):
      net-snmp: control smux via PACKAGECONFIG

Gianfranco (2):
      vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
      vboxguestdrivers: Add patch proposed upstream to fix a build failure on i386

Gianfranco Costamagna (1):
      dlt-daemon: update to new release 2.18.6

Harpritkaur Bhandari (1):
      rapidjson: Upgrade SRCREV to latest

He Zhe (2):
      lmbench: Fix webpage-lm and manual page typos
      lmbench: lat_fifo: Fix cleanup sequence

Junjie Mao (1):
      python3-xmlschema: Yocto recipes for validating against XSD 1.1

Kai Kang (4):
      xfce4-panel-profiles: fix do install failure with dash
      xfce4-panel-profiles: update remove-bashisms.patch for centos 7
      blueman: refresh patch
      mariadb: add package config zstd

Khem Raj (6):
      influxdb: Fix build on mips
      packagegroup-meta-oe: Add new package influxdb
      packagegroup-meta-networking: Add ipset
      packagegroup-meta-oe: Add re2
      autoconf-2.13-native,xserver-xorg-cvt-native: Move inheriting native to the end
      dfu-util-native: Adjust Inherit order

Leon Anavi (75):
      python3-aiohttp: Upgrade 3.7.2 -> 3.7.3
      python3-coloredlogs: Upgrade 14.0 -> 15.0
      python3-jsonrpcserver: Upgrade 4.1.3 -> 4.2.0
      python3-pymisp: Upgrade 2.4.133 -> 2.4.135.3
      python3-parso: Upgrade 0.8.0 -> 0.8.1
      python3-pillow: Upgrade 7.2.0 -> 8.1.0
      python3-croniter: Upgrade 0.3.37 -> 1.0.1
      python3-pychromecast: Upgrade 7.7.1 -> 7.7.2
      python3-hyperlink: Upgrade 20.0.1 -> 21.0.0
      python3-dnspython: Upgrade 2.0.0 -> 2.1.0
      python3-prompt-toolkit: Upgrade 3.0.9 -> 3.0.10
      python3-ptyprocess: Upgrade 0.6.0 -> 0.7.0
      python3-certifi: Upgrade 2020.11.8 -> 2020.12.5
      python3-jedi: Upgrade 0.17.2 -> 0.18.0
      python3-mock: Upgrade 4.0.2 -> 4.0.3
      python3-pyscaffold: Upgrade 3.2.3 -> 3.3
      python3-cffi: Upgrade 1.14.3 -> 1.14.4
      python3-rsa: Upgrade 4.6 -> 4.7
      python3-pyjwt: Upgrade 1.7.1 -> 2.0.0
      python3-isort: Upgrade 5.6.4 -> 5.7.0
      python3-lz4: Upgrade 3.1.0 -> 3.1.1
      python3-msgpack: Upgrade 1.0.0 -> 1.0.2
      python3-pyopenssl: Upgrade 19.1.0 -> 20.0.1
      python3-ecdsa: Upgrade 0.16.0 -> 0.16.1
      python3-regex: Upgrade 2020.10.28 -> 2020.11.13
      python3-cryptography: Upgrade 3.2 -> 3.3.1
      python3-cryptography-vectors: Upgrade 3.2 -> 3.3.1
      python3-wheel: Upgrade 0.35.1 -> 0.36.2
      python3-pyzmq: Upgrade 19.0.2 -> 20.0.0
      python3-greenlet: Upgrade 0.4.17 -> 1.0.0
      python3-parse: Upgrade 1.18.0 -> 1.19.0
      python3-colorlog: Upgrade 4.6.2 -> 4.7.2
      python3-pyephem: Upgrade 3.7.7.0 -> 3.7.7.1
      python3-pyperf: Upgrade 2.0.0 -> 2.1.0
      python3-cheetah: Upgrade 3.2.5 -> 3.2.6
      python3-pyscaffold: Upgrade 3.3 -> 3.3.1
      python3-lxml: Upgrade 4.6.1 -> 4.6.2
      python3-openpyxl: Upgrade 3.0.5 -> 3.0.6
      python3-pymysql: Upgrade 0.10.1 -> 1.0.2
      python3-dbus-next: Upgrade 0.1.4 -> 0.2.2
      python3-yappi: Upgrade 1.3.0 -> 1.3.2
      python3-pyyaml: Upgrade 5.3.1 -> 5.4
      python3-google-api-python-client: Upgrade 1.12.5 -> 1.12.8
      python3-evdev: Upgrade 1.3.0 -> 1.4.0
      python3-pyusb: Upgrade 1.1.0 -> 1.1.1
      python3-pyserial: Upgrade 3.4 -> 3.5
      python3-pandas: Upgrade 1.2.0 -> 1.2.1
      python3-alembic: Upgrade 1.4.3 -> 1.5.1
      python3-coverage: Upgrade 5.3 -> 5.3.1
      python3-lz4: Upgrade 3.1.1 -> 3.1.3
      python3-bitarray: Upgrade 1.6.1 -> 1.6.3
      python3-pykwalify: Upgrade 1.7.0 -> 1.8.0
      python3-croniter: Upgrade 1.0.1 -> 1.0.2
      python3-ujson: Upgrade 4.0.1 -> 4.0.2
      python3-smbus2: Upgrade 0.4.0 -> 0.4.1
      python3-pyzmq: Upgrade 20.0.0 -> 21.0.1
      python3-alembic: Upgrade 1.5.1 -> 1.5.2
      python3-prompt-toolkit: Upgrade 3.0.10 -> 3.0.11
      python3-pyjwt: Upgrade 2.0.0 -> 2.0.1
      python3-pyyaml: Upgrade 5.4 -> 5.4.1
      python3-natsort: Upgrade 7.1.0 -> 7.1.1
      python3-pymisp: Upgrade 2.4.135.3 -> 2.4.137.1
      python3-socketio: Upgrade 4.6.0 -> 5.0.4
      python3-lazy-object-proxy: Upgrade 1.5.1 -> 1.5.2
      python3-custom-inherit: Upgrade 2.3.0 -> 2.3.1
      python3-cachetools: Upgrade 4.2.0 -> 4.2.1
      python3-coverage: Upgrade 5.3.1 -> 5.4
      python3-diskcache: Upgrade 5.1.0 -> 5.2.1
      python3-aenum: Upgrade 2.2.6 -> 3.0.0
      python3-xmlschema: Upgrade 1.4.1 -> 1.4.2
      python3-intervals: Upgrade 1.10.0 -> 1.10.0.post1
      python3-portion: Add recipe
      python3-pako: Upgrade 0.2.3 -> 0.3.0
      python3-typed-ast: Upgrade 1.4.1 -> 1.4.2
      python3-pyzmq: Upgrade 21.0.1 -> 21.0.2

Luca Boccassi (4):
      dbus-broker: enable SO_PEERSEC usage by default
      fsverity: update to 1.3
      fsverity: fix MinGW build
      dbus-broker: update to v26

Mario Schuknecht (1):
      dnsmasq: Fix systemd service

Mikko Rapeli (3):
      fuse: set CVE_PRODUCT to "fuse_project:fuse"
      flatbuffers: whitelist CVE-2020-35864
      giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT

Mingli Yu (2):
      mcelog: fix the pfa test hang
      mariadb: upgrade to 10.5.8

Nicolas Jeker (1):
      networkmanager: Add Wireless Extensions to PACKAGECONFIG[wifi]

Oleksiy Obitotskyy (1):
      libsmi: set awk as target path

Robert Joslyn (1):
      htop: Update to 3.0.4

Ross Burton (1):
      libmicrohttpd: allow native/nativesdk builds

S. Lockwood-Childs (1):
      sip3: simplify recipe

Shlomi Vaknin (1):
      python3-sh: remove python3-tests from RDEPENDS

Stefano Babic (1):
      libconfig: split package for C++

Søren Andersen (1):
      zram: fix sourcing of zram parameters

Thomas Perrot (1):
      influxdb: add new recipe

Trevor Gamblin (2):
      packagegroup-meta-python: sort package names, add notes
      packagegroup-meta-python: add ptest packages to ptest group

Wang Mingyu (1):
      dovecot: upgrade 2.2.36.4 -> 2.3.13

Yi Zhao (1):
      nss: upgrade 3.60 -> 3.60.1

Zang Ruochen (9):
      c-periphery: upgrade 2.3.0 -> 2.3.1
      htop: upgrade 3.0.4 -> 3.0.5
      hwdata: upgrade 0.342 -> 0.343
      spitools: upgrade 0.8.6 -> 0.8.7
      librole-tiny-perl: upgrade 2.001004 -> 2.002003
      python3-smbus: upgrade 4.1 -> 4.2
      python3-snappy: upgrade 0.5.4 -> 0.6.0
      python3-zopeinterface: upgrade 5.1.0 -> 5.2.0
      python3-nmap: upgrade 1.4.8 -> 1.5.0

Zheng Ruoqin (7):
      cifs-utils: upgrade 6.11 -> 6.12
      firewalld: upgrade 0.9.1 -> 0.9.2
      igmpproxy: upgrade 0.2.1 -> 0.3
      mdns: upgrade 1096.40.7 -> 1310.40.42
      opensc: Fix the wrong version number.
      python3-djangorestframework: upgrade 3.12.1 -> 3.12.2
      python3-ipy: upgrade 1.00 -> 1.01

changqing.li@windriver.com (1):
      celt051: update SRC_URI

zangrc (6):
      libnftnl: upgrade 1.1.8 -> 1.1.9
      czmq: upgrade 4.2.0 -> 4.2.1
      dialog: upgrade 1.3-20201126 -> 1.3-20210117
      modemanager: upgrade 1.14.8 -> 1.14.10
      monit: upgrade 5.27.1 -> 5.27.2
      python3-networkmanager: upgrade 2.1 -> 2.2

zhengruoqin (3):
      openldap: upgrade 2.4.56 -> 2.4.57
      satyr: upgrade 0.35 -> 0.36
      zeromq: upgrade 4.3.3 -> 4.3.4

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I2469d162f1db8072fec106f629872618082bbeac

2 files changed, 25 insertions, 14 deletions

diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
index fc0d86e33..93d6d5857 100644
--- a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
+++ b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
@@ -1,3 +1,8 @@
+From 14100c6fc2cce7260ca5ace81094aee0ae40dd07 Mon Sep 17 00:00:00 2001
+From: Paul Barker <pbarker@toganlabs.com>
+Date: Sun, 5 Nov 2017 22:07:30 +0000
+Subject: [PATCH] htop: Update to v2.0.2
+
 We need to use pkg-config to find the ncurses library instead of the
 ncurses*-config applications.
 
@@ -7,11 +12,15 @@ Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
 Upstream-status: Inappropriate
     (`ncurses*-config` can be used outside of OpenEmbedded)
 
+---
+ configure.ac | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
 diff --git a/configure.ac b/configure.ac
-index 559dc4d..77aea22 100644
+index 115d894..0e0a1eb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB],
+@@ -205,10 +205,10 @@ AS_VAR_POPDEF([CACHEVAR])dnl
  
  AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
  if test "x$enable_unicode" = xyes; then
@@ -26,9 +35,9 @@ index 559dc4d..77aea22 100644
         HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
          HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
           HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
-@@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then
-          [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-             [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+@@ -225,8 +225,8 @@ if test "x$enable_unicode" = xyes; then
+    # (at this point we already link against a working ncurses library with wide character support)
+    AC_SEARCH_LIBS([keypad], [tinfow tinfo])
  else
 -   HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
 -    HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb
index d677e36c0..8e9b95d91 100644
--- a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb
+++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb
@@ -9,23 +9,25 @@ DEPENDS = "ncurses"
 SRC_URI = "git://github.com/htop-dev/htop.git \
            file://0001-Use-pkg-config.patch \
            "
-SRCREV = "dace850fa6e27b5626115b366059258cfe4d60c9"
+SRCREV = "ce6d60e7def146c13d0b8bca4642e7401a0a8995"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-PACKAGECONFIG ??= "cgroup \
-                   taskstats \
-                   unicode \
-                   linux-affinity \
-                   delayacct"
+PACKAGECONFIG ??= " \
+    unicode \
+    linux-affinity \
+    delayacct \
+"
 PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz"
-PACKAGECONFIG[cgroup] = "--enable-cgroup,--disable-cgroup"
 PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver"
-PACKAGECONFIG[taskstats] = "--enable-taskstats,--disable-taskstats"
+PACKAGECONFIG[ancient-vserver] = "--enable-ancient-vserver,--disable-ancient-vserver"
 PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode"
-PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity"
 PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc"
+PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity"
 PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid"
 PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl"
+PACKAGECONFIG[sensors] = "--with-sensors,--without-sensors,lmsensors,lmsensors-libsensors"
+
+FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg"