meta-openembedded: subtree update:936f2380bb..4599fea881

Alexander Vickberg (1):
      mbedtls: upgrade to 2.25.0

Andreas Müller (44):
      xfce4-panel-profiles: upgrade 1.0.10 -> 1.0.12
      mousepad: upgrade 0.4.2 -> 0.5.2
      xfce4-screenshooter: upgrade 1.9.7 -> 1.9.8
      xfce4-taskmanager: upgrade 1.2.3 -> 1.4.0
      xfce4-calculator-plugin: upgrade 0.7.0 -> 0.7.1
      xfce4-cpugraph-plugin: upgrade 1.1.0 -> 1.2.0
      xfce4-datetime-plugin: upgrade 0.8.0 -> 0.8.1
      xfce4-diskperf-plugin: upgrade 2.6.2 -> 2.6.3
      xfce4-fsguard-plugin: upgrade 1.1.1 -> 1.1.2
      xfce4-smartbookmark-plugin: upgrade 0.5.1 -> 0.5.2
      xfce4-systemload-plugin: upgrade 1.2.3 -> 1.2.4
      xfce4-verve-plugin: upgrade 2.0.0 -> 2.0.1
      xfce4-wavelan-plugin: upgrade 0.6.1 -> 0.6.2
      xfce4-whiskermenu-plugin: upgrade 2.4.6 -> 2.5.1
      xfce4-xkb-plugin: upgrade 0.8.1 -> 0.8.2
      xfce4-mount-plugin: upgrade 1.1.3 -> 1.1.5
      xfce4-dev-tools: upgrade 4.14.0 -> 4.16.0
      libxfce4util: upgrade 4.14.0 -> 4.16.0
      xfconf: upgrade 4.14.3 -> 4.16.0
      libxfce4ui: upgrade 4.14.1 -> 4.16.0
      exo: upgrade 0.12.11 -> 4.16.0
      garcon: upgrade 0.7.0 -> 0.8.0
      xfwm4: upgrade 4.14.5 -> 4.16.0
      xfce4-settings: upgrade 4.14.3 -> 4.16.0
      xfce4-panel: upgrade 4.14.4 -> 4.16.0
      xfce4-session: upgrade 4.14.2 -> 4.16.0
      xfdesktop: upgrade 4.14.2 -> 4.16.0
      xfce4-power-manager: upgrade 1.6.6 -> 4.16.0
      tumbler: upgrade 0.3.1 -> 4.16.0
      thunar-volman: upgrade 0.9.5 -> 4.16.0
      thunar: upgrade 1.8.15 -> 4.16.0
      xfce4-appfinder: upgrade 4.14.0 -> 4.16.0
      xfce4-terminal: 0.8.9.2 -> 0.8.10
      xfce4-screensaver: upgrade 0.1.10 -> 4.16.0
      xfce4-taskmanager: remove exo-native from DEPENDS
      xfce4-closebutton-plugin: upgrade 0.1.0+ -> 4.16.0
      xfce4-sensors-plugin: upgrade 1.3.92 -> 1.3.95
      xfce4-genmon-plugin: upgrade 4.0.2 -> 4.1.0
      xfce4-hotcorner-plugin: remove
      xfce4-embed-plugin: remove for now
      xfce4-equake-plugin: remove for now
      xfce4-notes-plugin: remove for now
      fluidsynth: upgrade 2.1.5 -> 2.1.6
      blueman: upgrade 2.1.3 -> 2.1.4

Bruce Ashfield (1):
      vboxguestdrivers: fix build against kernel v5.10+

Caio Toledo (3):
      Add recipe for dbus-cxx
      Add dbus-cxx to packagegroup-meta-oe
      Fix dbus-cxx build for musl

Changqing Li (1):
      libssh2: enhance ptest

Chen Qi (1):
      tclap: fix branch

Chencheng Zhang (1):
      tclap: align version to tag v1.2.2

Diego Santa Cruz (2):
      gssdp: Upgrade to 1.2.2 -> 1.2.3
      gupnp: Upgrade to 1.2.2 -> 1.2.4

Dmitry Baryshkov (11):
      android-tools-conf-configfs: add an alternative to anrdoid-tools-conf
      android-tools-conf: fix android-tools build-deps warning
      conf/layer.conf: provide default PREFERRED_PROVIDER_android-tools-conf
      imlib2: add image manipulation libray from englightenment project
      feh: imlib2 based image viewer
      obconf: Openbox configuration tool
      xterm: install xterm and uxterm desktop files
      xterm: update to version 362
      xterm: provide virtual/x-terminal-emulator
      layer.conf: add gnome-layer dynamic entry
      openbox-xdgmenu: Openbox menu generator

He Zhe (2):
      ebtables: Add symbol link /sbin/ebtables
      lmbench: Fix setting LDLIBS failure

Hongxu Jia (2):
      flatbuffers: add python3 support
      python3-wrapt: add native support

Joe Slater (1):
      multipath-tools: fix error handling for udev_monitor_set_receive_buffer_size

Khem Raj (9):
      pidgin-sipe: Do not add native libdir to pkgconfig search path
      sdbus-c++-libsystemd: Fix reallocarray check in meson
      networkmanager: Fix reallocarray check in meson and configure
      redis: Update to 6.0.9
      python3-matplotlib: Disable LTO on mips/clang
      cyrus-sasl: Disable ntlm plugin by default
      postgresql: Use /dev/urandom when openssl is not used
      xrdp: Upgrade to 0.9.14
      iwd: Upgrade to 1.10

Leon Anavi (33):
      python3-stevedore: Upgrade 3.2.2 -> 3.3.0
      python3-pychromecast: Upgrade 7.5.1 -> 7.6.0
      python3-humanize: Upgrade 3.1.0 -> 3.2.0
      python3-fasteners: Upgrade 0.15 -> 0.16
      python3-luma-core: Upgrade 2.0.1 -> 2.2.0
      python3-chardet: Upgrade 3.0.4 -> 4.0.0
      python3-watchdog: Upgrade 0.10.3 -> 1.0.2
      python3-natsort: Upgrade 7.0.1 -> 7.1.0
      python3-gmqtt: Upgrade 0.6.8 -> 0.6.9
      python3-pymongo: Upgrade 3.11.0 -> 3.11.2
      python3-requests: Upgrade 2.25.0 -> 2.25.1
      python3-nocasedict: Upgrade 1.0.1 -> 1.0.2
      python3-soupsieve: Upgrade 2.0.1 -> 2.1
      python3-jsonpatch: Upgrade 1.26 -> 1.28
      python3-psutil: Upgrade 5.7.3 -> 5.8.0
      python3-argcomplete: Upgrade 1.12.1 -> 1.12.2
      python3-multidict: Upgrade 5.0.0 -> 5.1.0
      python3-nocaselist: Upgrade 1.0.3 -> 1.0.4
      python3-prompt-toolkit: Upgrade 3.0.8 -> 3.0.9
      python3-pychromecast: Upgrade 7.6.0 -> 7.7.1
      python3-txaio: Upgrade 20.4.1 -> 20.12.1
      python3-croniter: Upgrade 0.3.36 -> 0.3.37
      python3-pandas: Upgrade 1.1.4 -> 1.2.0
      python3-sympy: Upgrade 1.6.2 -> 1.7.1
      python3-twine: Upgrade 3.2.0 -> 3.3.0
      python3-humanfriendly: Upgrade 8.2 -> 9.1
      python3-sqlalchemy: Upgrade 1.3.20 -> 1.3.22
      python3-transitions: Upgrade 0.8.5 -> 0.8.6
      python3-pytest-metadata: Upgrade 1.10.0 -> 1.11.0
      python3-smbus2: Upgrade 0.3.0 -> 0.4.0
      python3-cantools: Upgrade 35.5.0 -> 36.1.0
      python3-sentry-sdk: Upgrade 0.19.1 -> 0.19.5
      python3-babel: Upgrade 2.8.0 -> 2.9.0

Mark Jonas (1):
      beep: Update to 1.4.9 in new repository

Martin Jansa (1):
      linuxconsole: move jscal to separate package, add to packagegroup

Michael Vetter (1):
      jasper: upgrade 2.0.23 -> 2.0.24

Mingli Yu (3):
      traceroute: change the ALTERNATIVE_PRIORITY
      tftp-hpa: change the ALTERNATIVE_PRIORITY
      python3-astor: switch to python3

Ola X Nilsson (1):
      python3-idna Remove 2.8

Qi.Chen@windriver.com (1):
      python3-requests: upgrade to 2.25.0

Ramon Fried (2):
      bitwise: add new recipe
      yaml-cpp: add new recipe

Roland Hieber (3):
      openct: remove lines that resulted in a no-op
      openct: clean up do_install
      openct: allow building as native package

Sean Nyekjaer (1):
      nodejs: 12.19.1 -> 12.20.1

Stacy Gaikovaia (1):
      nodejs: 12.19.0 -> 12.19.1

Trevor Woerner (1):
      glmark2: fix precision handling bugs

Wang Mingyu (1):
      zabbix: CVE-2020-15803 Security Advisory

Wenlin Kang (1):
      syslog-ng: add bison-native to dependencies

Yi Zhao (9):
      ebtables: do not install /etc/ethertypes
      yaffs2-utils: update to latest git rev
      f2fs-tools: upgrade 1.13.0 -> 1.14.0
      dracut: upgrade 049 -> 051
      ebtables: add missing file ebtables.common
      ebtables: remove upstream ebtables-legacy-save
      ebtables: do not install /etc/ethertypes
      tcpdump: add UPSTREAM_CHECK_REGEX
      phpmyadmin: 5.0.2 -> 5.0.4

Zang Ruochen (5):
      mcpp: Normalize the patch format of CVE
      python3-aenum: upgrade 2.2.4 -> 2.2.6
      python3-autobahn: upgrade 20.7.1 -> 20.12.3
      python3-bandit: upgrade 1.6.2 -> 1.7.0
      python3-cachetools: upgrade 4.1.1 -> 4.2.0

Zheng Ruoqin (5):
      samba: CVE-2020-14318 Security Advisory
      samba: CVE-2020-14383 Security Advisory
      php: CVE-2020-7070
      php: CVE-2020-7069
      poppler: upgrade 20.11.0 -> 20.12.1

changqing.li@windriver.com (3):
      postgresql: upgrade 12.4 -> 13.1
      nginx: upgrade 1.16.1 -> 1.18.0
      nginx: upgrade 1.17.8 -> 1.19.6

jabdoa2 (2):
      libsdl2-mixer: Fix ogg/vorbis support in libsdl2-mixer
      libsdl2-mixer: set --disable-music-ogg-shared to link statically

lumag (2):
      android-tools: fix package split
      android-tools: split adbd to the separate package

zangrc (35):
      fuse3: upgrade 3.10.0 -> 3.10.1
      openipmi: upgrade 2.0.29 -> 2.0.30
      vblade: upgrade 24 -> 25
      dumb-init: upgrade 1.2.2 -> 1.2.5
      fio: upgrade 3.24 -> 3.25
      hwdata: upgrade 0.341 -> 0.342
      nano: upgrade 5.3 -> 5.4
      ocl-icd: upgrade 2.2.13 -> 2.2.14
      ebtables: upgrade 2.0.10-4 -> 2.0.11
      iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3
      opencl-headers: upgrade 2020.06.16 -> 2020.12.18
      opencl-icd-loader: upgrade 2020.06.16 -> 2020.12.18
      c-periphery: upgrade 2.2.5 -> 2.3.0
      opencl-clhpp: upgrade 2.0.12 -> 2.0.13
      uthash: upgrade 2.1.0 -> 2.2.0
      libtalloc: upgrade 2.3.0 -> 2.3.1
      libtevent: upgrade 0.10.1 -> 0.10.2
      ace: upgrade 6.5.10 -> 6.5.12
      python3-ldap: upgrade 3.2.0 -> 3.3.1
      wolfssl: upgrade 4.5.0 -> 4.6.0
      asio: upgrade 1.18.0 -> 1.18.1
      dash: upgrade 0.5.11.2 -> 0.5.11.3
      geoclue: upgrade 2.5.6 -> 2.5.7
      libmicrohttpd: upgrade 0.9.71 -> 0.9.72
      nss: upgrade 3.59 -> 3.60
      paho-mqtt-c: upgrade 1.3.7 -> 1.3.8
      terminus-font: upgrade 4.48 -> 4.49.1
      libnet-ldap-perl: upgrade 0.66 -> 0.67
      rdma-core: upgrade 32.0 -> 33.0
      can-utils: upgrade 2020.11.0 -> 2020.12.0
      cpprest: upgrade 2.10.16 -> 2.10.17
      haveged: upgrade 1.9.13 -> 1.9.14
      live555: upgrade 20201105 -> 20210101
      smartmontools: upgrade 7.1 -> 7.2
      openjpeg: upgrade 2.3.1 -> 2.4.0

zhengruoqin (12):
      pugixml: upgrade 1.11 -> 1.11.2
      spdlog: upgrade 1.8.1 -> 1.8.2
      spitools: upgrade 0.8.5 -> 0.8.6
      uhubctl: upgrade 2.2.0 -> 2.3.0
      xserver-xorg-cvt-native: upgrade 1.20.9 -> 1.20.10
      zchunk: upgrade 1.1.7 -> 1.1.8
      libencode-perl: upgrade 3.07 -> 3.08
      bridge-utils: upgrade 1.6 -> 1.7
      netplan: upgrade 0.100 -> 0.101
      opensaf: upgrade 5.20.08 -> 5.20.11
      cppzmq: upgrade 4.7.0 -> 4.7.1
      gperftools: upgrade 2.8 -> 2.8.1

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

4 files changed, 56 insertions, 17 deletions

diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch
index af28ba71e7..407e24ca0e 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch
+++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch
@@ -1,6 +1,3 @@
-From e5bd4c3853fb394edc8cbea17fad82ce23bd0fae Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 27 Nov 2020 12:21:32 -0800
 Subject: [PATCH 1/2] dbus: Remove unused variabes
 
 This issue is seen when using clang to compile it
@@ -19,11 +16,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  src/parse.c    | 1 -
  3 files changed, 5 deletions(-)
 
+diff --git a/src/dbus.c b/src/dbus.c
+index 9606fea..8e1ed9d 100644
 --- a/src/dbus.c
 +++ b/src/dbus.c
-@@ -45,9 +45,6 @@ static int method_apply(sd_bus_message *
- 
- static int method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
+@@ -242,9 +242,6 @@ static int
+ method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error)
+ {
      sd_bus_message *reply = NULL;
 -    g_autoptr(GError) err = NULL;
 -    g_autofree gchar *stdout = NULL;
@@ -31,9 +30,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
      gint exit_status = 0;
  
      exit_status = sd_bus_message_new_method_return(m, &reply);
+diff --git a/src/networkd.c b/src/networkd.c
+index 7c86cd6..7200740 100644
 --- a/src/networkd.c
 +++ b/src/networkd.c
-@@ -896,7 +896,6 @@ append_wpa_auth_conf(GString* s, const N
+@@ -897,7 +897,6 @@ append_wpa_auth_conf(GString* s, const NetplanAuthenticationSettings* auth, cons
  static void
  write_wpa_unit(const NetplanNetDefinition* def, const char* rootdir)
  {
@@ -41,9 +42,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
      g_autofree gchar *stdouth = NULL;
  
      stdouth = systemd_escape(def->id);
+diff --git a/src/parse.c b/src/parse.c
+index 033c657..faca27f 100644
 --- a/src/parse.c
 +++ b/src/parse.c
-@@ -1898,7 +1898,6 @@ handle_wireguard_peers(yaml_document_t*
+@@ -1899,7 +1899,6 @@ handle_wireguard_peers(yaml_document_t* doc, yaml_node_t* node, const void* _, G
      }
  
      for (yaml_node_item_t *i = node->data.sequence.items.start; i < node->data.sequence.items.top; i++) {
@@ -51,3 +54,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
          yaml_node_t *entry = yaml_document_get_node(doc, *i);
          assert_type(entry, YAML_MAPPING_NODE);
  
+-- 
+2.25.1
+
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch
new file mode 100644
index 0000000000..dab8693c71
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch
@@ -0,0 +1,30 @@
+From ceb4111af317ecc54d97bb21878dcccbfdb2983e Mon Sep 17 00:00:00 2001
+From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
+Date: Fri, 25 Dec 2020 11:41:43 +0900
+Subject: [PATCH] don't fail if GLOB_BRACE is not defined
+
+Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
+---
+ src/util.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/util.c b/src/util.c
+index 7e59985..eb8e573 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -23,6 +23,12 @@
+ 
+ #include "util.h"
+ 
++/* Don't fail if the standard library
++ * doesn't provide brace expansion */
++#ifndef GLOB_BRACE
++#define GLOB_BRACE 0
++#endif
++
+ GHashTable* wifi_frequency_24;
+ GHashTable* wifi_frequency_5;
+ 
+-- 
+2.25.1
+
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch
index cd75d1cb1c..68aabd6a48 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch
+++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch
@@ -1,6 +1,3 @@
-From 5abb6b8343b5d2633844144979b40f398450b544 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 27 Nov 2020 12:22:32 -0800
 Subject: [PATCH 2/2] Makefile: Exclude .h files from target rule
 
 This ensures that src/_features.h is not added to compiler cmdline which
@@ -17,14 +14,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/Makefile b/Makefile
+index 4fa6bd8..567d326 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -47,7 +47,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER)
+@@ -46,7 +46,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER) nm.o networkd.o openvswitch.o generate.
  	$(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid`
  
- netplan-dbus: src/dbus.c src/_features.h
--	$(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0`
-+	$(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `pkg-config --cflags --libs libsystemd glib-2.0`
+ netplan-dbus: src/dbus.c src/_features.h util.o
+-	$(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0`
++	$(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0`
  
  src/_features.h: src/[^_]*.[hc]
  	printf "#include <stddef.h>\nstatic const char *feature_flags[] __attribute__((__unused__)) = {\n" > $@
+-- 
+2.25.1
+
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.101.bb
index 2f74a22c05..a3afcd2d56 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb
+++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.101.bb
@@ -11,14 +11,15 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 S = "${WORKDIR}/git"
-SRCREV = "b7d32aebc880f3161b8f97ee56b729c0c54dd0e4"
-PV = "0.100+git${SRCPV}"
+SRCREV = "e445b87b9dff439ec564c245d030b03d61eb0f24"
+PV = "0.101+git${SRCPV}"
 
 SRC_URI = " \
         git://github.com/CanonicalLtd/netplan.git \
         file://0001-dbus-Remove-unused-variabes.patch \
         file://0002-Makefile-Exclude-.h-files-from-target-rule.patch \
 "
+SRC_URI_append_libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch"
 
 DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"