meta-openembedded: subtree update:17fd382f34..679bb49126

Andreas Müller (9):
      gparted: upgrade 0.33.0 -> 1.1.0
      gjs: 1.58.6 -> 1.58.7
      nautilus: upgrade 3.34.2 -> 3.34.3
      xfce4-whiskermenu-plugin: upgrade 2.4.3 -> 2.4.4
      xfce4-panel: upgrade 4.14.3 -> 4.14.4
      poppler: upgrade 0.86.1 -> 0.88.0
      mutter: upgrade 3.34.5 -> 3.34.6
      openvpn: upgrade 2.4.8 -> 2.4.9
      file-roller: upgrade 3.32.4 -> 3.32.5

Honggyu Kim (1):
      uftrace: update commit hash to more robust version

Khem Raj (6):
      luajit: Disable on rv32
      abseil-cpp: Fix build on riscv32
      rsyslog: Enable atomic builtins on rv32
      python3-grpcio: Fix build with riscv32
      waf: Add cross answers for riscv32
      libnma: Fix build on riscv32

Mingli Yu (1):
      nss: enable uint128 support on mips64

Peter Kjellerstedt (2):
      samba: Remove the dependency on libbsd
      paho-mqtt-c: Update to the real 1.3.2, and correct the license

Slater, Joseph (1):
      syslog-ng: change shebang to python3

Trevor Gamblin (2):
      python3-atomicwrites: add python3-misc to RDEPENDS
      python3-pysocks: add python3-logging to RDEPENDS

zhengruoqin (4):
      python3-pytoml: Modify ptest output format
      python3-pytz: Modify ptest output format
      python3-scrypt: Modify ptest output format
      python3-serpent: Modify ptest output format

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

5 files changed, 70 insertions, 2 deletions

diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch
new file mode 100644
index 000000000..90ec379c6
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch
@@ -0,0 +1,48 @@
+From 8cf7afb5417e23cd3ebf8141239bf020f5dd2ac8 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 30 Apr 2020 06:56:09 +0000
+Subject: [PATCH] Enable uint128 on mips64
+
+Fix below error:
+| verified/kremlin/kremlib/dist/minimal/FStar_UInt128.h:22:1: error: 'FStar_UInt128___proj__Mkuint128__item__low' declared 'static' but never defined [-Werror=unused-function]
+|   22 | FStar_UInt128___proj__Mkuint128__item__low(FStar_UInt128_uint128 projectee);
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ .../freebl/verified/kremlin/include/kremlin/internal/types.h   | 3 ++-
+ .../kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h         | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
+index 801e78f..cdac61e 100644
+--- a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
++++ b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
+@@ -57,7 +57,8 @@ typedef const char *Prims_string;
+ typedef __m128i FStar_UInt128_uint128;
+ #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
+     (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__riscv) && __riscv_xlen == 64))
++     (defined(__riscv) && __riscv_xlen == 64) || \
++     defined(__mips64))
+ typedef unsigned __int128 FStar_UInt128_uint128;
+ #else
+ typedef struct FStar_UInt128_uint128_s {
+diff --git a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
+index f38fda3..7ca67d2 100644
+--- a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
++++ b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
+@@ -26,7 +26,8 @@
+ #include <stdint.h>
+ #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
+     (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__riscv) && __riscv_xlen == 64))
++     (defined(__riscv) && __riscv_xlen == 64) || \
++     defined(__mips64))
+ 
+ /* GCC + using native unsigned __int128 support */
+ 
+-- 
+2.24.1
+
diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb
index 001124011..fba80ce2a 100644
--- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb
+++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb
@@ -33,6 +33,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
            file://nss-fix-nsinstall-build.patch \
            file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
            file://riscv.patch \
+           file://0001-Enable-uint128-on-mips64.patch \
            "
 
 SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233"
diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.86.1.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.88.0.bb
index a6067e634..d6a27f923 100644
--- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.86.1.bb
+++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.88.0.bb
@@ -7,8 +7,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
            file://0001-Do-not-overwrite-all-our-build-flags.patch \
            file://basename-include.patch \
            "
-SRC_URI[md5sum] = "2a638739f29e82a0a57b633ea39c87f3"
-SRC_URI[sha256sum] = "af630a277c8e194c31339c5446241834aed6ed3d4b4dc7080311e51c66257f6c"
+SRC_URI[md5sum] = "d9aafddce4c079c9ebc7405e42ac25ba"
+SRC_URI[sha256sum] = "b4453804e9a5a519e6ceee0ac8f5efc229e3b0bf70419263c239124474d256c7"
 
 DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
 
diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/shebang.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/shebang.patch
new file mode 100644
index 000000000..35d967753
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/shebang.patch
@@ -0,0 +1,18 @@
+syslog-ng: change shebang to use python3
+
+Correct shebang for python3.  This is far from the only python file with an out of date shebang,
+but it is the only one that winds up on a target.
+
+Upstream-Status: Pending
+
+Signed-off-by: Joe Slater <joe.slater@windriver.com>
+
+
+--- a/lib/merge-grammar.py
++++ b/lib/merge-grammar.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #############################################################################
+ # Copyright (c) 2010-2017 Balabit
+ #
diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb
index 01ed76765..10bf00fdc 100644
--- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb
+++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb
@@ -7,6 +7,7 @@ SRC_URI += " \
            file://fix-invalid-ownership.patch \
            file://syslog-ng.service-the-syslog-ng-service.patch \
            file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \
+           file://shebang.patch \
            file://syslog-ng-tmp.conf \
            "