meta-openembedded: subtree update:08c0280b7c..4fe1065655

Alexander Kanavin (1):
      libmicrohttpd: remove the recipe

Andreas Müller (4):
      jack: upgrade 1.19.17 -> 1.19.18
      xfce4-settings: upgrade 4.16.0 -> 4.16.1
      zsh: reduce priority slightly to avoid conflict with bash
      mutter/wayland: replace xserver-xorg-xwayland by xwayland in rdep

Andrej Kozemcak (1):
      proftpd: Update to 1.3.7a release

Armin Kuster (3):
      wireguard: update to v1.0.20210219 +1
      nostromo: remove recipe
      packagegroup-meta-webserver: remove nostromo from pkg grp

Chen Qi (3):
      tigervnc: upgrade to 1.11.0
      python3-django: upgrade to 2.2.20
      tigervnc: fix do_package error when enabling user merge

Gianfranco (1):
      vboxguestdrivers: upgrade 6.1.18 -> 6.1.20

Hongxu Jia (1):
      debootstrap: explicitly add virtual/fakeroot-native to depends

Joe Hershberger (1):
      strongswan: Make PACKAGECONFIG a default value

Justin Standring (1):
      tslib: add PACKAGECONFIG for evthres, one-wire-ts-input

Kai Kang (1):
      freeradius: check existence of openssl's commands in bootstrap

Khem Raj (36):
      nss: Re-enable -Werror
      gimp: Disable vector icon generation on mips/glibc too
      iwd: Upgade to 1.13
      python3-icu: Upgrade to 2.7.2
      nodejs: Update to 14.16.1
      nodejs: Fix build with icu-69
      nodejs: Use qemu usermode to run target binaries during build
      nodejs: Fix build on mips
      nodejs: Fix build with clang for x86 target
      tbb: Re-introduce PE
      bearssl: Update to tip of master
      gimp: Disable vector icons on musl/x86
      gd: Replace deprecated types from tiff
      nodejs: Enable snapshot
      python3-docutils: Delete
      libchamplain: Require opengl distro feature
      aom: Match the name for AOM-Patent-License-1.0
      libdevmapper,lvm2: Do not inherit license
      gnome-disk-utility: Require polkit in distro features
      README: Make git send-email example work
      sysprof: Enable sysprofd/libsysprof only when polkit in DISTRO_FEATURES
      packagegroup-gnome-apps: Add gnome-disk-utility only if polkit is in DISTRO_FEATURES
      python3-jinja2_2.%.bbappend: Delete
      python3-pyyaml: Do not check for meta-python
      python3-pyyaml: Delete
      python3-markupsafe: Delete bbappend
      snort,proftpd,net-snmp: Deal with -ffile-prefix-map as well
      apache2: Deal with -ffile-prefix-map
      vk-gl-cts: Fix build with GCC 11
      gegl: Update to 0.4.30
      python3-m2crypto: Upgrade to 0.37.1
      libupnp: Upgrade to 1.14.6
      ctags: Switch to universal ctags
      dibbler: Add libpthread to linker flags
      libowfat: Replace __pure__ with pure and remove using __deprecated__
      emacs: Do not use SIGSTKSZ

Leon Anavi (21):
      python3-bitarray: Upgrade 1.9.2 -> 2.0.0
      python3-xxhash: Upgrade 2.0.0 -> 2.0.2
      python3-xlsxwriter: Upgrade 1.3.8 -> 1.3.9
      python3-docutils: Upgrade 0.17 -> 0.17.1
      python3-portion: Upgrade 2.1.5 -> 2.1.6
      python3-huey: Upgrade 2.3.1 -> 2.3.2
      python3-pysonos: Upgrade 0.0.42 -> 0.0.43
      python3-asttokens: Upgrade 2.0.4 -> 2.0.5
      python3-hyperframe: Upgrade 6.0.0 -> 6.0.1
      python3-argcomplete: Upgrade 1.12.2 -> 1.12.3
      python3-python-vlc: Upgrade 3.0.12117 -> 3.0.12118
      python3-bitarray: Upgrade 2.0.0 -> 2.0.1
      python3-sqlalchemy: Upgrade 1.4.7 -> 1.4.11
      python3-watchdog: Upgrade 2.0.2 -> 2.0.3
      python3-pytest-asyncio: Upgrade 0.14.0 -> 0.15.1
      python3-xlsxwriter: Upgrade 1.3.9 -> 1.4.0
      python3-astroid: Upgrade 2.5.3 -> 2.5.6
      python3-arpeggio: Upgrade 1.10.1 -> 1.10.2
      python3-cachetools: Upgrade 4.2.1 -> 4.2.2
      python3-pymisp: Upgrade 2.4.141.1 -> 2.4.142
      python3-et-xmlfile: Upgrade 1.0.1 -> 1.1.0

Mingli Yu (4):
      python3-cryptography: Upgrade to 3.3.2
      onig: add oniguruma to PROVIDES
      php: Upgrade to 7.4.16
      tk: adapt to potential pseudo changes

Persian Prince (1):
      libdvdnav 6.1.1

Peter Kjellerstedt (1):
      syslog-ng: Merge .bb and .inc

Ramon Fried (1):
      bitwise: Upgrade 0.41 -> 0.42

Reto Schneider (1):
      nng: Upgrade 1.2.5 -> 1.4.0

Saul Wold (2):
      tbb: Disable PPC as COMPATIBLE_MACHINE
      packagegroup-meta-oe: conditional remove tbb for powerpc

Silcet (2):
      ufw: fix python shebang
      ufw: bump version to 0.36 and add services

Sinan Kaya (1):
      zram: add support for mem_limit

Stefan Ghinea (1):
      python3-django: fix CVE-2021-28658

Ulrich Ölmann (1):
      v4l-utils: fix reproducibility

Yi Fan Yu (3):
      syslog-ng: upgrade 3.24.1 -> 3.31.2
      syslog-ng: remove CONFIG_TLS override for arm DEBUG_BUILD
      syslog-ng: Drop an obsolete patch to add --enable-libnet

Yi Zhao (1):
      gvfs: rdepend on gsettings-desktop-schemas

zangrc (19):
      fuse3: upgrade 3.10.2 -> 3.10.3
      cifs-utils: upgrade 6.12 -> 6.13
      dnsmasq: upgrade 2.84 -> 2.85
      nbdkit: upgrade 1.25.5 -> 1.25.6
      wolfssl: upgrade 4.7.0 -> 4.7.1
      networkmanager: upgrade 1.30.2 -> 1.30.4
      libdvdread: upgrade 6.1.1 -> 6.1.2
      libwebsockets: upgrade 4.1.6 -> 4.2.0
      ostree: upgrade 2021.1 -> 2021.2
      redis: upgrade 6.2.1 -> 6.2.2
      tinyproxy: upgrade 1.10.0 -> 1.11.0
      nss: upgrade 3.63 -> 3.64
      babeld: upgrade 1.9.2 -> 1.10
      fetchmail: upgrade 6.4.18 -> 6.4.19
      openvpn: upgrade 2.5.1 -> 2.5.2
      wireshark: upgrade 3.4.4 -> 3.4.5
      debootstrap: upgrade 1.0.123 -> 1.0.124
      mailcap: upgrade 2.1.52 -> 2.1.53
      rsyslog: upgrade 8.2102.0 -> 8.2104.0

zhengruoqin (7):
      irssi: upgrade 1.2.2 -> 1.2.3
      librsync: upgrade 2.3.1 -> 2.3.2
      hiawatha: upgrade 10.11 -> 10.12
      python3-supervisor: upgrade 4.2.1 -> 4.2.2
      python3-zopeinterface: upgrade 5.3.0 -> 5.4.0
      sdparm: upgrade 1.11 -> 1.12
      tcsh: upgrade 6.22.03 -> 6.22.04

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iaeb2fe4ee0a49cf44ea60bc3c1aef83528d92f55
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch
new file mode 100644
index 0000000..3c83663
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch
@@ -0,0 +1,47 @@
+From 73fbd1e646f6bbf202d4418bae80eb9941fbf552 Mon Sep 17 00:00:00 2001
+From: Casey Deccio <casey@deccio.net>
+Date: Fri, 8 Jan 2021 12:43:09 -0700
+Subject: [PATCH] Allow verify_cb_* to be called with ok=True
+
+With https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
+OpenSSL allowed verificaton to continue on UNABLE_TO_VERIFY_LEAF_SIGNATURE
+---
+ tests/test_ssl.py | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_ssl.py b/tests/test_ssl.py
+index 92b6942..7a3271a 100644
+--- a/tests/test_ssl.py
++++ b/tests/test_ssl.py
+@@ -59,8 +59,13 @@ def allocate_srv_port():
+ 
+ 
+ def verify_cb_new_function(ok, store):
+-    assert not ok
+     err = store.get_error()
++    # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
++    # aborting, this callback is called to retrieve additional error
++    # information.  In this case, ok might not be False.
++    # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
++    if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
++        assert not ok
+     assert err in [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
+                    m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
+                    m2.X509_V_ERR_CERT_UNTRUSTED,
+@@ -618,7 +623,12 @@ class MiscSSLClientTestCase(BaseSSLClientTestCase):
+ 
+     def verify_cb_old(self, ctx_ptr, x509_ptr, err, depth, ok):
+         try:
+-            self.assertFalse(ok)
++            # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
++            # aborting, this callback is called to retrieve additional error
++            # information.  In this case, ok might not be False.
++            # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
++            if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
++                self.assertFalse(ok)
+             self.assertIn(err,
+                           [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
+                            m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
+-- 
+2.29.2
+
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch
new file mode 100644
index 0000000..2313a32
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch
@@ -0,0 +1,29 @@
+From d06eaa88a5f491827733f32027c46de3557fbd05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
+Date: Fri, 19 Feb 2021 15:53:02 +0100
+Subject: [PATCH] Use of RSA_SSLV23_PADDING has been deprecated.
+
+Fixes #293.
+---
+ tests/test_rsa.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/tests/test_rsa.py b/tests/test_rsa.py
+index 3de5016..7299785 100644
+--- a/tests/test_rsa.py
++++ b/tests/test_rsa.py
+@@ -124,11 +124,6 @@ class RSATestCase(unittest.TestCase):
+             ptxt = priv.private_decrypt(ctxt, p)
+             self.assertEqual(ptxt, self.data)
+ 
+-        # sslv23_padding
+-        ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding)
+-        res = priv.private_decrypt(ctxt, RSA.sslv23_padding)
+-        self.assertEqual(res, self.data)
+-
+         # no_padding
+         with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
+             priv.public_encrypt(self.data, RSA.no_padding)
+-- 
+2.29.2
+
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
new file mode 100644
index 0000000..f4c7438
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
@@ -0,0 +1,33 @@
+From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 29 Mar 2013 15:17:17 +0100
+Subject: [PATCH] setup.py: link in sysroot, not in host directories
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+
+Upstream-status: Unknown
+---
+ setup.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/setup.py
++++ b/setup.py
+@@ -135,6 +135,7 @@ class _M2CryptoBuildExt(build_ext.build_
+         self.set_undefined_options('build', ('bundledlls', 'bundledlls'))
+ 
+         self.libraries = ['ssl', 'crypto']
++        self.openssl = os.environ.get( "STAGING_DIR" )
+         if sys.platform == 'win32':
+             self.libraries = ['ssleay32', 'libeay32']
+             if self.openssl and openssl_version(self.openssl,
+@@ -159,8 +160,8 @@ class _M2CryptoBuildExt(build_ext.build_
+ 
+         if self.openssl is not None:
+             log.debug('self.openssl = %s', self.openssl)
+-            openssl_library_dir = os.path.join(self.openssl, 'lib')
+-            openssl_include_dir = os.path.join(self.openssl, 'include')
++            openssl_library_dir = os.environ.get( "STAGING_LIBDIR" )
++            openssl_include_dir = os.environ.get( "STAGING_INCDIR" )
+ 
+             self.library_dirs.append(openssl_library_dir)
+             self.include_dirs.append(openssl_include_dir)
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch
new file mode 100644
index 0000000..f039ae8
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch
@@ -0,0 +1,31 @@
+Do not compute platform, this does not work in cross compile environment
+since it pokes at the system for getting architecture values
+
+Upstream-Status: Inappropriate
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/setup.py
++++ b/setup.py
+@@ -169,22 +169,6 @@ class _M2CryptoBuildExt(build_ext.build_
+             log.debug('self.include_dirs = %s', self.include_dirs)
+             log.debug('self.library_dirs = %s', self.library_dirs)
+ 
+-        if platform.system() == "Linux":
+-            # For RedHat-based distros, the '-D__{arch}__' option for
+-            # Swig needs to be normalized, particularly on i386.
+-            mach = platform.machine().lower()
+-            if mach in ('i386', 'i486', 'i586', 'i686'):
+-                arch = '__i386__'
+-            elif mach in ('ppc64', 'powerpc64', 'ppc64le', 'ppc64el'):
+-                arch = '__powerpc64__'
+-            elif mach in ('ppc', 'powerpc'):
+-                arch = '__powerpc__'
+-            else:
+-                arch = '__%s__' % mach
+-            self.swig_opts.append('-D%s' % arch)
+-            if mach in ('ppc64le', 'ppc64el'):
+-                self.swig_opts.append('-D_CALL_ELF=2')
+-
+         self.swig_opts.extend(['-I%s' % i for i in self.include_dirs])
+ 
+         # Some Linux distributor has added the following line in