meta-openembedded: subtree update:629696b64b..e93d527a33

Adrian (1):
      firewalld: upgrade 0.7.3 -> 0.7.5

Andre Carvalho (1):
      netcat: Set CVE_PRODUCT

Andreas Müller (6):
      networkmanager: upgrade 1.22.10 -> 1.22.14
      blueman: upgrade 2.1.1 -> 2.1.3
      modemmanager: upgrade 1.12.10 -> 1.12.12
      ibus: upgrade 1.5.21 -> 1.5.22
      network-manager-applet: upgrade 1.16.0 -> 1.18.0
      sysprof: remove linux-gnueabi-patch

Armin Kuster (2):
      net-snmp: Security fix CVE-2019-20892
      wireshark: Update to 3.2.5

Changqing Li (1):
      libmcrypt: set CLEANBROKEN

Daniel Gomez (1):
      ttf-fonts: Update ttf-ubuntu-font-family recipe

Fagundes, Paulo (1):
      redis-plus-plus: add recipe

Hongxu Jia (1):
      networkmanager: fix Files/directories were installed but not shipped

Jacopo Dall'Aglio (2):
      netplan: upgrade 0.98 -> 0.99
      python3-libconf: add recipe version 2.0.1

Khem Raj (1):
      lirc: Inherit distutils-common-base

Konrad Weihmann (6):
      ntop: remove static libs from dev package
      ruli: recipe cleanup
      postgresql: remove vacuumlo from contrib
      libconfig: remove cmake append from base package
      gattlib: remove includedir from base package
      openldap: packaging fixes

Leon Anavi (63):
      python3-pyro4: Upgrade 4.77 -> 4.80
      python3-rdflib: Upgrade 4.2.2 -> 5.0.0
      python3-httplib2: Upgrade 0.17.3 -> 0.18.1
      python3-cppy: Add new recipe
      python3-kiwisolver: Upgrade 1.1.0 -> 1.2.0
      python3-sqlalchemy: Upgrade 1.3.17 -> 1.3.18
      python3-greenlet: Upgrade 0.4.15 -> 0.4.16
      python3-pkgconfig: Upgrade 1.4.0 -> 1.5.1
      python3-msm: Upgrade 0.8.3 -> 0.8.7
      python3-pulsectl: Upgrade 20.2.4 -> 20.5.1
      python3-pybind11: Consolidate in a single file
      python3-pybind11: Upgrade 2.4.3 -> 2.5.0
      python3-pyparted: Consolidate in a single file
      python3-pyparted: Upgrade 3.11.3 -> 3.11.6
      python3-pywbem: Consolidate in a single file
      python3-pywbem: Upgrade 0.15.0 -> 0.17.2
      python3-jsonrpcserver: Upgrade 4.1.2 -> 4.1.3
      python3-humanize: Upgrade 2.4.0 -> 2.4.1
      python3-autobahn: Upgrade 20.4.3 -> 20.6.2
      python3-yappi: Upgrade 1.0 -> 1.2.5
      python3-sympy: Upgrade 1.5.1 -> 1.6
      python3-watchdog: Upgrade 0.10.2 -> 0.10.3
      python3-tqdm: Upgrade 4.43.0 -> 4.47.0
      python3-pyflakes: Upgrade 2.1.1 -> 2.2.0
      python3-pymisp: Upgrade 2.4.122 -> 2.4.128
      python3-pychromecast: Upgrade 4.2.3 -> 7.0.1
      python3-py: Upgrade 1.8.2 -> 1.9.0
      python3-html5lib: Upgrade 1.0.1 -> 1.1
      python3-lz4: Upgrade 3.0.2 -> 3.1.0
      python3-cassandra-driver: Upgrade 3.14.0 -> 3.24.0
      python3-configargparse: Upgrade 0.15.1 -> 1.2.3
      python3-cachetools: Upgrade 4.1.0 -> 4.1.1
      python3-keras-preprocessing: Upgrade 1.1.0 -> 1.1.2
      python3-pywbem: Upgrade 0.17.2 -> 0.17.3
      python3-h2: Consolidate in a single file
      python3-h2: Upgrade 3.1.1 -> 3.2.0
      python3-requests: Upgrade 2.23.0 -> 2.24.0
      python3-google-api-python-client: Upgrade 1.7.11 -> 1.9.3
      python3-pyperclip: Upgrade 1.7.0 -> 1.8.0
      python3-pyhamcrest: Upgrade 1.9.0 -> 2.0.2
      python3-pint: Upgrade 0.13 -> 0.14
      python3-dbus-next: Upgrade 0.1.2 -> 0.1.3
      python3-pybluez: Upgrade 0.22 -> 0.23
      python3-stevedore: Upgrade 1.31.0 -> 2.0.1
      python3-h5py: Upgrade 2.9.0 -> 2.10.0
      python3-cryptography-vectors: Upgrade 2.8 -> 2.9.2
      python3-importlib-metadata: Upgrade 1.6.1 -> 1.7.0
      python3-websocket-client: Upgrade 0.56.0 -> 0.57.0
      python3-sentry-sdk: Upgrade 0.14.0 -> 0.16.0
      python3-regex: Upgrade 2020.1.8 -> 2020.6.8
      python3-python-vlc: Upgrade 3.0.9113 -> 3.0.10114
      python3-robotframework: Upgrade 3.0.4 -> 3.2.1
      python3-pychromecast: Upgrade 7.0.1 -> 7.1.0
      python3-pyasn1-modules: Consolidate in a single file
      python3-pyasn1-modules: Upgrade 0.2.7 -> 0.2.8
      python3-sympy: Upgrade 1.6 -> 1.6.1
      python3-pychromecast: Upgrade 7.1.0 -> 7.1.1
      python3-imageio: Upgrade 2.8.0 -> 2.9.0
      python3-humanize: Upgrade 2.4.1 -> 2.5.0
      python3-tinyrecord: Upgrade 0.1.5 -> 0.2.0
      python3-luma-oled: Upgrade 3.4.0 -> 3.5.0
      python3-pyconnman: Consolidate in a single file
      python3-jsonref: Consolidate in a single file

Pierre-Jean Texier (4):
      minicoredumper: update SRC_URI to use github instead
      tslib: upgrade 1.21 -> 1.22
      haveged: upgrade 1.9.9 -> 1.9.13
      xxhash: upgrade 0.7.3 -> 0.7.4

Qi.Chen@windriver.com (1):
      multipath-tools: disable parallel build as a workaround

Robert Yang (1):
      drbd-utils: Add CLEANBROKEN to fix rebuild errors

Sakib Sajal (2):
      python3-betamax: add recipe
      cunit: add ptest

Wang Mingyu (2):
      nspr: upgrade 4.25 -> 4.26
      python3-pytest: upgrade 5.4.2 -> 5.4.3

Zang Ruochen (20):
      python3-ansicolors: Enable ptest
      python3-anyjson: Enable ptest
      python3-atomicwrites: upgrade 1.3.0 -> 1.4.0
      python3-backports-functools-lru-cache: Enable ptest
      python3-bcrypt: Enable ptest
      nftables: upgrade 0.9.5 -> 0.9.6
      ccid: upgrade 1.4.32 -> 1.4.33
      docopt.cpp: upgrade 0.6.2 -> 0.6.3
      libiio: upgrade 0.20 -> 0.21
      librelp: upgrade 1.5.0 -> 1.6.0
      redis: upgrade 6.0.4 -> 6.0.5
      rsyslog: upgrade 0.2004.0 -> 0.2006.0
      libnet-dns-perl: upgrade 1.24 -> 1.25
      python3-blinker: Enable ptest
      python3-cbor2: Enable ptest
      python3-click: Enable ptest
      python3-u-msgpack-python: Enable ptest
      fuse3: Enable ptest
      sshfs-fuse: Enable ptest
      python3-wcwidth: Enable ptest

Zheng Ruoqin (7):
      Fix build error when enable multilib.
      tracker: Fix build error when enable multilib.
      mraa: Disable python2, otherwise, there is a build error when enable multilib.
      paho-mqtt-c: Fix build error when enable multilib.
      upm:Fix build error when enable multilib.
      python3-unidiff: Enable ptest
      python3-uritemplate: Enable ptest

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I26a4e709d5f1416e73ec42e6dfc0e702dd1079bb
diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch
deleted file mode 100644
index d4c7765..0000000
--- a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a47ca75702318ff43446c70120f7aacde4ccee1b Mon Sep 17 00:00:00 2001
-From: Eero Aaltonen <eero.aaltonen@vaisala.com>
-Date: Thu, 20 Jun 2019 16:21:20 +0300
-Subject: [PATCH] Set library VERSION and SOVERSION
-
-With soversion and version specified, `install` target will install the
-library with the specified version and also create the proper symlink.
-
-Upstream-Status: Submitted [https://github.com/docopt/docopt.cpp/pull/112]
-but unlikely to be merged soon as it is a duplicate of
-[https://github.com/docopt/docopt.cpp/pull/112] which has been **Open**
-since 2016-12-08.
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23da468..feff32e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,6 +50,10 @@ else()
-     set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
- 
-     add_library(docopt SHARED $<TARGET_OBJECTS:docopt_o>)
-+	set_target_properties(docopt PROPERTIES
-+		VERSION ${PROJECT_VERSION}
-+		SOVERSION ${PROJECT_VERSION_MAJOR}
-+		)
-     add_library(docopt_s STATIC $<TARGET_OBJECTS:docopt_o>)
- endif()
- 
diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
index aa55ebf..7a6b0bf 100644
--- a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
@@ -14,12 +14,11 @@
 "
 
 DEPENDS = "boost"
-SRCREV = "3dd23e3280f213bacefdf5fcb04857bf52e90917"
-PV = "0.6.2+git${SRCPV}"
+SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196"
+PV = "0.6.3+git${SRCPV}"
 
 SRC_URI = "\
     git://github.com/docopt/docopt.cpp.git;protocol=https \
-    file://0001-Set-library-VERSION-and-SOVERSION.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
similarity index 96%
rename from meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb
rename to meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
index c1839b3..50326ea 100644
--- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
@@ -6,7 +6,7 @@
 LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 # v1.9.9
-SRCREV = "6da706c8026b629d9bb7ebebc32239305a03da8e"
+SRCREV = "1283a65c541c4a83e152024a63faf7b267b9b1cd"
 SRC_URI = "git://github.com/jirka-h/haveged.git \
 "
 S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb
index eb0a2c3..148e85c 100644
--- a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb
@@ -13,7 +13,3 @@
 
 SRC_URI[md5sum] = "6bd98ee3a6e6b9126c82c916d7a9e690"
 SRC_URI[sha256sum] = "7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9"
-
-FILES_${PN}_append = " \
-    ${libdir}/cmake \
-"
diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
index 7c24416..8bd8e90 100644
--- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
@@ -22,7 +22,7 @@
 
 DEPENDS += "json-c"
 
-EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON \
+EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON -DPYTHON2_LIBRARY=OFF \
                          -DPYTHON3_PACKAGES_PATH:PATH=${baselib}/python${PYTHON_BASEVERSION}/site-packages \
                          -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \
                          -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb
new file mode 100644
index 0000000..e23733b
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "C++ client for Redis based on hiredis"
+HOMEPAGE = "https://github.com/sewenew/redis-plus-plus"
+SECTION = "libs"
+
+DEPENDS += "hiredis"
+RDEPENDS_${PN} += "hiredis"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+SRCREV = "b08b36a9a91de00636e583307610f49af7876f50"
+SRC_URI = "git://github.com/sewenew/redis-plus-plus"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+FILES_SOLIBSDEV = ""
+FILES_${PN} += " ${libdir}/libredis++.so"
diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb
index ffa28cc..893f323 100644
--- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb
@@ -17,8 +17,8 @@
            file://GNU_SOURCE.patch \
            "
 
-SRC_URI[md5sum] = "37200b25c282f94da4521bc510d79ced"
-SRC_URI[sha256sum] = "3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de"
+SRC_URI[md5sum] = "617d680fc0944c217e2350a365686eb0"
+SRC_URI[sha256sum] = "42cf86a114d2a451b898fcda96acd4d01062a7dbaaad2801d9164a36f898f596"
 
 inherit autotools-brokensep update-rc.d systemd useradd
 
diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.6.0.bb
similarity index 87%
rename from meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.5.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.6.0.bb
index a466314..f3933f9 100644
--- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.5.0.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.6.0.bb
@@ -9,7 +9,7 @@
 SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https \
 "
 
-SRCREV = "0beb2258e12e4131dc31e261078ea53d18f787d7"
+SRCREV = "fe366f3770320cbe76bac7e84b26a48491d14531"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2004.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb
similarity index 97%
rename from meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2004.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb
index 68e96ef..ff66995 100644
--- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2004.0.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb
@@ -29,8 +29,8 @@
     file://0001-Include-sys-time-h.patch \
 "
 
-SRC_URI[md5sum] = "375a60ab0f461367f84f07a5dbda6de2"
-SRC_URI[sha256sum] = "5fc3d7b775f0879a40606d960491812a602e22f62e006ce027ed7bcf4c9f27d9"
+SRC_URI[md5sum] = "33de768941953ceeca9d1a437b47891b"
+SRC_URI[sha256sum] = "d9589e64866f2fdc5636af4cae9d60ebf1e3257bb84b81ee953ede6a05878e97"
 
 UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb
index 5b3585c..6a7611f 100644
--- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb
@@ -46,6 +46,10 @@
 PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN},"
 PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native,"
 
+do_configure_prepend() {
+    sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake
+}
+
 FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
 RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}"