[hardknott 00/14] Patch review May 3

[hardknott 00/14] Patch review May 3

[Armin Kuster]

Please have feedback back by Wednesday.

The following changes since commit 71b546ed8595b14d29efc1e8b951f8c845ad10c4:

  python3-cryptography: Upgrade to 3.3.2 (2021-04-23 19:09:56 -0700)

are available in the Git repository at:

  git://git.openembedded.org/meta-openembedded-contrib stable/hardknott-nut
  http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/hardknott-nut

Armin Kuster (2):
  nostromo: Blacklist and exclude from world builds
  packagegroup-meta-webserver: remove nostromo from pkg grp

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

Khem Raj (2):
  tbb: Re-introduce PE
  gimp: Disable vector icons on musl/x86

Leon Anavi (3):
  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

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

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

zangrc (4):
  networkmanager: upgrade 1.30.2 -> 1.30.4
  libdvdread: upgrade 6.1.1 -> 6.1.2
  redis: upgrade 6.2.1 -> 6.2.2
  nss: upgrade 3.63 -> 3.64

 meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb  |  1 +
 meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb  |  2 +
 ...eck-openssl-cmds-in-script-bootstrap.patch | 38 +++++++++++++++++++
 .../freeradius/freeradius_3.0.21.bb           |  1 +
 ...ger_1.30.2.bb => networkmanager_1.30.4.bb} |  2 +-
 .../redis/{redis_6.2.1.bb => redis_6.2.2.bb}  |  2 +-
 .../recipes-extended/zram/zram/zram-swap-init |  5 +++
 ...ibdvdread_6.1.1.bb => libdvdread_6.1.2.bb} |  4 +-
 .../nss/{nss_3.63.bb => nss_3.64.bb}          |  7 ++--
 meta-oe/recipes-support/tbb/tbb_2021.2.0.bb   |  2 +
 ...e_6.0.0.bb => python3-hyperframe_6.0.1.bb} |  3 +-
 ...ns_2.0.4.bb => python3-asttokens_2.0.5.bb} |  2 +-
 ...os_0.0.42.bb => python3-pysonos_0.0.43.bb} |  2 +-
 .../packagegroup-meta-webserver.bb            |  1 -
 .../recipes-httpd/nostromo/nostromo_1.9.9.bb  |  3 ++
 15 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.30.2.bb => networkmanager_1.30.4.bb} (98%)
 rename meta-oe/recipes-extended/redis/{redis_6.2.1.bb => redis_6.2.2.bb} (96%)
 rename meta-oe/recipes-multimedia/libdvdread/{libdvdread_6.1.1.bb => libdvdread_6.1.2.bb} (71%)
 rename meta-oe/recipes-support/nss/{nss_3.63.bb => nss_3.64.bb} (96%)
 rename meta-python/recipes-connectivity/python-hyperframe/{python3-hyperframe_6.0.0.bb => python3-hyperframe_6.0.1.bb} (61%)
 rename meta-python/recipes-devtools/python/{python3-asttokens_2.0.4.bb => python3-asttokens_2.0.5.bb} (81%)
 rename meta-python/recipes-devtools/python/{python3-pysonos_0.0.42.bb => python3-pysonos_0.0.43.bb} (79%)

-- 
2.17.1

[hardknott 01/14] freeradius: check existence of openssl's commands in bootstrap

[Armin Kuster]

From: Kai Kang <kai.kang@windriver.com>

It calls openssl's commands 'dhparam' and 'pkcs12' in script bootstrap.
These commands are configurable based on configure options 'no-dh' and
'no-des', and may not be provided by openssl. So check existence of
these commands. If not, abort running of script bootstrap.

1. https://github.com/openssl/openssl/blob/master/apps/build.info#L37
2. https://github.com/openssl/openssl/blob/master/apps/build.info#L22

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit c8ceefc5c3fa5ce87f0e1b0a8f5bb06b259d1e76)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...eck-openssl-cmds-in-script-bootstrap.patch | 38 +++++++++++++++++++
 .../freeradius/freeradius_3.0.21.bb           |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch

diff --git a/meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch b/meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch
new file mode 100644
index 0000000000..fcadae93a0
--- /dev/null
+++ b/meta-networking/recipes-connectivity/freeradius/files/check-openssl-cmds-in-script-bootstrap.patch
@@ -0,0 +1,38 @@
+bootstrap: check commands of openssl exist
+
+It calls openssl commands dhparam and pkcs12 in script bootstrap. These
+commands are configurable based on configure options 'no-dh' and
+'no-des', and may not be provided by openssl. So check existence of
+these commands. If not, abort running of script bootstrap.
+
+1. https://github.com/openssl/openssl/blob/master/apps/build.info#L37
+2. https://github.com/openssl/openssl/blob/master/apps/build.info#L22
+
+Upstream-Status: Denied [https://github.com/FreeRADIUS/freeradius-server/pull/4059]
+				 The maintainer commented in the pull that the script could
+				 be run on a host which provides these openssl commands.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ raddb/certs/bootstrap | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/raddb/certs/bootstrap b/raddb/certs/bootstrap
+index 0f719aafd4..17feddbeeb 100755
+--- a/raddb/certs/bootstrap
++++ b/raddb/certs/bootstrap
+@@ -13,6 +13,14 @@
+ umask 027
+ cd `dirname $0`
+ 
++#  check commands of openssl exist
++for cmd in dhparam pkcs12; do
++	if ! openssl ${cmd} -help >/dev/null 2>&1; then
++		echo "Error: command ${cmd} is not supported by openssl."
++		exit 1
++	fi
++done
++
+ make -h > /dev/null 2>&1
+ 
+ #
diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb
index 864a4e9447..a6df2aeb03 100644
--- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb
+++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb
@@ -31,6 +31,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0
     file://0001-workaround-error-with-autoconf-2.7.patch \
     file://radiusd.service \
     file://radiusd-volatiles.conf \
+    file://check-openssl-cmds-in-script-bootstrap.patch \
 "
 
 SRCREV = "af428abda249b2279ba0582180985a9f6f4a144a"
-- 
2.17.1

[hardknott 02/14] tbb: Re-introduce PE

[Armin Kuster]

From: Khem Raj <raj.khem@gmail.com>

It was accidentally dropped in last upgrade for this recipe

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Martin Jansa <martin.jansa@gmail.com>
Cc: Naveen Saini <naveen.kumar.saini@intel.com>
(cherry picked from commit b5ad9c011db2581cc84e5daa139acf73a0f6f5c0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/tbb/tbb_2021.2.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb
index b05a59dc70..7e57ebf555 100644
--- a/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb
+++ b/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb
@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327"
 
 DEPENDS_append_libc-musl = " libucontext"
 
+PE = "1"
+
 BRANCH = "onetbb_2021"
 SRCREV = "2dba2072869a189b9fdab3ffa431d3ea49059a19"
 SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
-- 
2.17.1

[hardknott 03/14] python3-pysonos: Upgrade 0.0.42 -> 0.0.43

[Armin Kuster]

From: Leon Anavi <leon.anavi@konsulko.com>

Upgrade to release 0.0.43:

- Downgrade asyncio log severity

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 2d9aca131f4885d78a3d5470f2ef9a8b3fb68a19)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../{python3-pysonos_0.0.42.bb => python3-pysonos_0.0.43.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-python/recipes-devtools/python/{python3-pysonos_0.0.42.bb => python3-pysonos_0.0.43.bb} (79%)

diff --git a/meta-python/recipes-devtools/python/python3-pysonos_0.0.42.bb b/meta-python/recipes-devtools/python/python3-pysonos_0.0.43.bb
similarity index 79%
rename from meta-python/recipes-devtools/python/python3-pysonos_0.0.42.bb
rename to meta-python/recipes-devtools/python/python3-pysonos_0.0.43.bb
index 25defabc51..dbb6a8d8f6 100644
--- a/meta-python/recipes-devtools/python/python3-pysonos_0.0.42.bb
+++ b/meta-python/recipes-devtools/python/python3-pysonos_0.0.43.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=07b0e2ca9ac77cd65cd4edf2e13367ea"
 
-SRC_URI[sha256sum] = "20b45fa1779a01325e67822d243e1a3f7657d8b515308d84c1eb3c805cc3bdb5"
+SRC_URI[sha256sum] = "47be2b37defc856f15d7e7a419cfb939e9822750efe968db192156ebeba31684"
 
 inherit pypi setuptools3
 
-- 
2.17.1

[hardknott 04/14] python3-asttokens: Upgrade 2.0.4 -> 2.0.5

[Armin Kuster]

From: Leon Anavi <leon.anavi@konsulko.com>

Upgrade to release 2.0.5:

- setup.cfg: remove wheel dependency
- Handle starred expressions in tests
- Make 3.9 support official
- pypy2 instead of pypy2.7
- pypy3 instead of pypy3.5

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 3bef475e7618ab54f5666ccacbdd892b86ce96a0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../{python3-asttokens_2.0.4.bb => python3-asttokens_2.0.5.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-python/recipes-devtools/python/{python3-asttokens_2.0.4.bb => python3-asttokens_2.0.5.bb} (81%)

diff --git a/meta-python/recipes-devtools/python/python3-asttokens_2.0.4.bb b/meta-python/recipes-devtools/python/python3-asttokens_2.0.5.bb
similarity index 81%
rename from meta-python/recipes-devtools/python/python3-asttokens_2.0.4.bb
rename to meta-python/recipes-devtools/python/python3-asttokens_2.0.5.bb
index c2149336fd..429a56bae6 100644
--- a/meta-python/recipes-devtools/python/python3-asttokens_2.0.4.bb
+++ b/meta-python/recipes-devtools/python/python3-asttokens_2.0.5.bb
@@ -7,7 +7,7 @@ PYPI_PACKAGE = "asttokens"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "a42e57e28f2ac1c85ed9b1f84109401427e5c63c04f61d15b8842b027eec5128"
+SRC_URI[sha256sum] = "9a54c114f02c7a9480d56550932546a3f1fe71d8a02f1bc7ccd0ee3ee35cf4d5"
 
 DEPENDS += "\
     python3-setuptools-scm-native \
-- 
2.17.1

[hardknott 05/14] python3-hyperframe: Upgrade 6.0.0 -> 6.0.1

[Armin Kuster]

From: Leon Anavi <leon.anavi@konsulko.com>

Upgrade to release 6.0.1 with the following API changes:

- Added support for Python 3.9
- Added type hints

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 239a3a3a3a95a6b2d75bf81a3b5ef1f7ab64abb3)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...python3-hyperframe_6.0.0.bb => python3-hyperframe_6.0.1.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-python/recipes-connectivity/python-hyperframe/{python3-hyperframe_6.0.0.bb => python3-hyperframe_6.0.1.bb} (61%)

diff --git a/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.0.bb b/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.1.bb
similarity index 61%
rename from meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.0.bb
rename to meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.1.bb
index 4a936b49af..2d46e96112 100644
--- a/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.0.bb
+++ b/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_6.0.1.bb
@@ -4,7 +4,6 @@ LICENSE = "MIT"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5bf1c68e73fbaec2b1687b7e71514393"
 
-SRC_URI[md5sum] = "30136a712e092b1a45ae3cad3ae93131"
-SRC_URI[sha256sum] = "742d2a4bc3152a340a49d59f32e33ec420aa8e7054c1444ef5c7efff255842f1"
+SRC_URI[sha256sum] = "ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"
 
 inherit pypi setuptools3
-- 
2.17.1

[hardknott 06/14] networkmanager: upgrade 1.30.2 -> 1.30.4

[Armin Kuster]

From: zangrc <zangrc.fnst@fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 56782012e3f647dd1808aa08fc20ca759bce2b82)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../{networkmanager_1.30.2.bb => networkmanager_1.30.4.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.30.2.bb => networkmanager_1.30.4.bb} (98%)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.4.bb
similarity index 98%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.4.bb
index ec3bdd22bd..7c07b0a34d 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.4.bb
@@ -31,7 +31,7 @@ SRC_URI_append_libc-musl = " \
     file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
     file://musl/0002-Fix-build-with-musl-systemd-specific.patch \
 "
-SRC_URI[sha256sum] = "0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2"
+SRC_URI[sha256sum] = "6050b724212ea3ce7386113359bea9afa1f679a54f60d999a5999892e672c190"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
-- 
2.17.1

[hardknott 07/14] libdvdread: upgrade 6.1.1 -> 6.1.2

[Armin Kuster]

From: zangrc <zangrc.fnst@fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1dc583540355ab6af483b20b945cbd7c42984ccf)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../libdvdread/{libdvdread_6.1.1.bb => libdvdread_6.1.2.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-multimedia/libdvdread/{libdvdread_6.1.1.bb => libdvdread_6.1.2.bb} (71%)

diff --git a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb
similarity index 71%
rename from meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb
rename to meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb
index 65f5b6adf4..ed7443dfd4 100644
--- a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb
+++ b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2"
-SRC_URI[md5sum] = "09c7423568fb679279fd2a2bc6b10b6e"
-SRC_URI[sha256sum] = "3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796"
+SRC_URI[md5sum] = "034581479968405ed415c34a50d00224"
+SRC_URI[sha256sum] = "cc190f553758ced7571859e301f802cb4821f164d02bfacfd320c14a4e0da763"
 
 inherit autotools lib_package binconfig pkgconfig
 
-- 
2.17.1

[hardknott 08/14] redis: upgrade 6.2.1 -> 6.2.2

[Armin Kuster]

From: zangrc <zangrc.fnst@fujitsu.com>

Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4b04112fddb7b2ef5d4b61975d385b386bbd9f5b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-extended/redis/{redis_6.2.1.bb => redis_6.2.2.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-extended/redis/{redis_6.2.1.bb => redis_6.2.2.bb} (96%)

diff --git a/meta-oe/recipes-extended/redis/redis_6.2.1.bb b/meta-oe/recipes-extended/redis/redis_6.2.2.bb
similarity index 96%
rename from meta-oe/recipes-extended/redis/redis_6.2.1.bb
rename to meta-oe/recipes-extended/redis/redis_6.2.2.bb
index 89990df3de..65b525709e 100644
--- a/meta-oe/recipes-extended/redis/redis_6.2.1.bb
+++ b/meta-oe/recipes-extended/redis/redis_6.2.2.bb
@@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://GNU_SOURCE.patch \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
            "
-SRC_URI[sha256sum] = "cd222505012cce20b25682fca931ec93bd21ae92cb4abfe742cf7b76aa907520"
+SRC_URI[sha256sum] = "7a260bb74860f1b88c3d5942bf8ba60ca59f121c6dce42d3017bed6add0b9535"
 
 inherit autotools-brokensep update-rc.d systemd useradd
 
-- 
2.17.1

[hardknott 09/14] gimp: Disable vector icons on musl/x86

[Armin Kuster]

From: Khem Raj <raj.khem@gmail.com>

it uses qemu underneath which segfaults on musl/x86
until its fixed, we disable vector icons

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 44ca91f0fe174f9a69bc3e66ce17e1a2ae8447a4)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
index a5e6990580..717716e1f9 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
@@ -55,6 +55,7 @@ EXTRA_OECONF = "--disable-python \
 
 EXTRA_OECONF_append_mipsarch = " --disable-vector-icons"
 EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons"
+EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons"
 EXTRA_OECONF_append_arm = " --disable-vector-icons"
 
 do_configure_append() {
-- 
2.17.1

[hardknott 10/14] gvfs: rdepend on gsettings-desktop-schemas

[Armin Kuster]

From: Yi Zhao <yi.zhao@windriver.com>

The gvfs-udisks2-volume-monitor requires gsettings-desktop-schemas.

Fixes:
gvfs-udisks2-vo[1780]: Settings schema 'org.gnome.desktop.lockdown' is not installed
kernel: show_signal: 26 callbacks suppressed
kernel: traps: gvfs-udisks2-vo[1780] trap int3 ip:7f856be349c7 sp:7ffe34561e60 error:0 in libglib-2.0.so.0.6600.7[7f856bdf8000+88000]
systemd[1637]: gvfs-udisks2-volume-monitor.service: Main process exited, code=killed, status=5/TRAP
systemd[1637]: gvfs-udisks2-volume-monitor.service: Failed with result 'signal'.
systemd[1637]: Failed to start Virtual filesystem service - disk device monitor.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 6710d0bba50a3e99f57997f8782835ebe0581458)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb
index ad5dab5ecc..c8c16a3c52 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb
@@ -8,6 +8,8 @@ inherit gnomebase gsettings bash-completion gettext upstream-version-is-even fea
 DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \
             gsettings-desktop-schemas dbus"
 
+RDEPENDS_${PN} += "gsettings-desktop-schemas"
+
 SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
 SRC_URI[archive.md5sum] = "72383474f52d05c21ef2be96d0b91974"
 SRC_URI[archive.sha256sum] = "50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46"
-- 
2.17.1

[hardknott 11/14] nss: upgrade 3.63 -> 3.64

[Armin Kuster]

From: zangrc <zangrc.fnst@fujitsu.com>

-License-Update: Add the license of MIT.

Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a7d0d878542ec24d718972423b34c59aa5bd2498)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/nss/{nss_3.63.bb => nss_3.64.bb} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/nss/{nss_3.63.bb => nss_3.64.bb} (96%)

diff --git a/meta-oe/recipes-support/nss/nss_3.63.bb b/meta-oe/recipes-support/nss/nss_3.64.bb
similarity index 96%
rename from meta-oe/recipes-support/nss/nss_3.63.bb
rename to meta-oe/recipes-support/nss/nss_3.64.bb
index b7192a46d1..1863db131b 100644
--- a/meta-oe/recipes-support/nss/nss_3.63.bb
+++ b/meta-oe/recipes-support/nss/nss_3.64.bb
@@ -11,11 +11,12 @@ SECTION = "libs"
 DEPENDS = "sqlite3 nspr zlib nss-native"
 DEPENDS_class-native = "sqlite3-native nspr-native zlib-native"
 
-LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)"
+LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0+ & MIT) | (MPL-2.0 & LGPL-2.1+ & MIT)"
 
 LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
                     file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
-                    file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132"
+                    file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132 \
+                    file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=d4096c1e4421ee56e9e0f441a8161f78"
 
 VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}"
 
@@ -32,7 +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 \
            "
-SRC_URI[sha256sum] = "182d2fef629102ae9423aabf2c192242b565cf5098e82c5a26cf70c5e4ea2221"
+SRC_URI[sha256sum] = "d3175427172e9c3a6f1ebc74452cb791590f28191c6a1a443dbc0d87c9df1126"
 
 UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
 UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
-- 
2.17.1

[hardknott 12/14] zram: add support for mem_limit

[Armin Kuster]

From: Sinan Kaya <okaya@kernel.org>

Some targets might be interested in limiting how big
zram can grow. If the variable is set in /etc/default/zram file,
configure it in mem_limit sysfs attribute.

Signed-off-by: Sinan Kaya <okaya@kernel.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit cb1cf053785bcb5670b2eca7051aa11f29ef80b1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-extended/zram/zram/zram-swap-init | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-extended/zram/zram/zram-swap-init b/meta-oe/recipes-extended/zram/zram/zram-swap-init
index ccc3aafe3a..28082f7ff0 100755
--- a/meta-oe/recipes-extended/zram/zram/zram-swap-init
+++ b/meta-oe/recipes-extended/zram/zram/zram-swap-init
@@ -24,3 +24,8 @@ modprobe -q zram || true
 
 zramctl -a ${ZRAM_ALGORITHM} -s ${memzram}KB $device
 mkswap -L "zram-swap" $device
+
+devname="${device##*/}"
+if [ ! -z ${ZRAM_SIZE_LIMIT+x} ]; then
+	echo ${ZRAM_SIZE_LIMIT} > /sys/block/$devname/mem_limit
+fi
-- 
2.17.1

[hardknott 13/14] nostromo: Blacklist and exclude from world builds

[Armin Kuster]

Host site is dead.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb
index e726c9ac66..f1cf59355d 100644
--- a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb
+++ b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb
@@ -62,3 +62,6 @@ pkg_postinst_${PN} () {
         fi
     fi
 }
+
+PNBLACKLIST[nostromo] ?= "Host site for URI is dead"
+EXCLUDE_FROM_WORLD = "1"
-- 
2.17.1

[hardknott 14/14] packagegroup-meta-webserver: remove nostromo from pkg grp

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-core/packagesgroups/packagegroup-meta-webserver.bb   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
index 2fa5bc4a93..ec3334d8f0 100644
--- a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
+++ b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
@@ -26,7 +26,6 @@ RDEPENDS_packagegroup-meta-webserver-http = "\
     monkey \
     nginx \
     nginx \
-    nostromo \
     sthttpd \
 "
 
-- 
2.17.1