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

1 files changed, 201 insertions, 0 deletions

diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb
new file mode 100644
index 000000000..ff6699509
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb
@@ -0,0 +1,201 @@
+SUMMARY = "Rsyslog is an enhanced multi-threaded syslogd"
+DESCRIPTION = "\
+Rsyslog is an enhanced syslogd supporting, among others, MySQL,\
+ PostgreSQL, failover log destinations, syslog/tcp, fine grain\
+ output format control, high precision timestamps, queued operations\
+ and the ability to filter on any message part. It is quite\
+ compatible to stock sysklogd and can be used as a drop-in replacement.\
+ Its advanced features make it suitable for enterprise-class,\
+ encryption protected syslog relay chains while at the same time being\
+ very easy to setup for the novice user."
+
+DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging"
+HOMEPAGE = "http://www.rsyslog.com/"
+LICENSE = "GPLv3 & LGPLv3 & Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \
+                    file://COPYING.LESSER;md5=cb7903f1e5c39ae838209e130dca270a \
+                    file://COPYING.ASL20;md5=052f8a09206615ab07326ff8ce2d9d32\
+"
+
+SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.tar.gz \
+           file://initscript \
+           file://rsyslog.conf \
+           file://rsyslog.logrotate \
+           file://use-pkgconfig-to-check-libgcrypt.patch \
+           file://run-ptest \
+"
+
+SRC_URI_append_libc-musl = " \
+    file://0001-Include-sys-time-h.patch \
+"
+
+SRC_URI[md5sum] = "33de768941953ceeca9d1a437b47891b"
+SRC_URI[sha256sum] = "d9589e64866f2fdc5636af4cae9d60ebf1e3257bb84b81ee953ede6a05878e97"
+
+UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
+inherit autotools pkgconfig systemd update-rc.d ptest
+
+EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes"
+EXTRA_OECONF += "--enable-imfile-tests"
+EXTRA_OECONF_remove_mipsarch = "ap_cv_atomic_builtins=yes"
+EXTRA_OECONF_remove_powerpc = "ap_cv_atomic_builtins=yes"
+EXTRA_OECONF_remove_riscv32 = "ap_cv_atomic_builtins=yes"
+
+# first line is default yes in configure
+PACKAGECONFIG ??= " \
+    rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \
+    fmhttp imdiag gnutls imfile \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \
+"
+
+# default yes in configure
+PACKAGECONFIG[relp] = "--enable-relp,--disable-relp,librelp,"
+PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,,"
+PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,,"
+PACKAGECONFIG[fmhttp] = "--enable-fmhttp,--disable-fmhttp,curl,"
+PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,,"
+PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,,"
+PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,,"
+PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
+PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt,"
+PACKAGECONFIG[testbench] = "--enable-testbench --enable-omstdout,--disable-testbench --disable-omstdout,,"
+
+# default no in configure
+PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
+PACKAGECONFIG[imdiag] = "--enable-imdiag,--disable-imdiag,,"
+PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,,"
+PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp,"
+PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls,"
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd,"
+PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal,"
+PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse,"
+PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,"
+PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql,"
+PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi,"
+PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,,"
+PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind,"
+
+do_configure_prepend() {
+    sed -i -e 's|python |python3 |g' ${S}/tests/*.sh
+    sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/tests/*.py
+    sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/tests/testsuites/*.py
+}
+
+TESTDIR = "tests"
+do_compile_ptest() {
+    echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile
+    oe_runmake -C ${TESTDIR} buildtest-TESTS
+}
+
+do_install_ptest() {
+    # install the tests
+    cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}
+    cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH}
+
+    # do NOT need to rebuild Makefile itself
+    sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+    # do NOT need to rebuild $(check_PROGRAMS)
+    sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+
+    # fix the srcdir, top_srcdir
+    sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+    sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+    # fix the abs_top_builddir
+    sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+
+    # valgrind is not compatible with arm and mips,
+    # so remove related test cases if there is no valgrind.
+    if [ x${VALGRIND} = x ]; then
+        sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+    fi
+
+    # install test-driver
+    install -m 644 ${S}/test-driver ${D}${PTEST_PATH}
+
+    # install necessary links
+    install -d ${D}${PTEST_PATH}/tools
+    ln -sf ${sbindir}/rsyslogd ${D}${PTEST_PATH}/tools/rsyslogd
+
+    install -d ${D}${PTEST_PATH}/runtime
+    install -d ${D}${PTEST_PATH}/runtime/.libs
+    (
+        cd ${D}/${libdir}/rsyslog
+        allso="*.so"
+        for i in $allso; do
+            ln -sf ${libdir}/rsyslog/$i ${D}${PTEST_PATH}/runtime/.libs/$i
+        done
+    )
+
+    # fix the module load path with runtime/.libs
+    find ${D}${PTEST_PATH}/${TESTDIR} -name "*.conf" -o -name "*.sh" -o -name "*.c" | xargs \
+        sed -i -e 's:../plugins/.*/.libs/:../runtime/.libs/:g'
+    # fix the python3 path for tests/set-envar
+    sed -i -e s:${HOSTTOOLS_DIR}:${bindir}:g ${D}${PTEST_PATH}/tests/set-envvars
+}
+
+do_install_append() {
+    install -d "${D}${sysconfdir}/init.d"
+    install -d "${D}${sysconfdir}/logrotate.d"
+    install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog
+    install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
+    install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
+    sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
+
+    if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then
+        install -d 0755 ${D}${sysconfdir}/rsyslog.d
+        echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf
+    fi
+    if ${@bb.utils.contains('PACKAGECONFIG', 'mmjsonparse', 'true', 'false', d)}; then
+        install -d 0755 ${D}${sysconfdir}/rsyslog.d
+        echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf
+    fi
+}
+
+FILES_${PN} += "${bindir}"
+
+INITSCRIPT_NAME = "syslog"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
+
+RCONFLICTS_${PN} = "busybox-syslog sysklogd syslog-ng"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+
+RDEPENDS_${PN} += "logrotate"
+
+# for rsyslog-ptest
+VALGRIND = "valgrind"
+
+# valgrind supports armv7 and above
+VALGRIND_armv4 = ''
+VALGRIND_armv5 = ''
+VALGRIND_armv6 = ''
+
+# X32 isn't supported by valgrind at this time
+VALGRIND_linux-gnux32 = ''
+VALGRIND_linux-muslx32 = ''
+
+# Disable for some MIPS variants
+VALGRIND_mipsarchr6 = ''
+VALGRIND_linux-gnun32 = ''
+
+# Disable for powerpc64 with musl
+VALGRIND_libc-musl_powerpc64 = ''
+VALGRIND_libc-musl_powerpc64le = ''
+
+# RISC-V support for valgrind is not there yet
+VALGRIND_riscv64 = ""
+VALGRIND_riscv32 = ""
+
+RDEPENDS_${PN}-ptest += "\
+  make diffutils gzip bash gawk coreutils procps \
+  libgcc python3-core python3-io \
+  "
+RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}"