summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-support/nss
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-10-30 23:42:48 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-10-30 23:43:27 +0300
commitbbbd5f468dc9c43b203cac3775f6c1b782ca7cba (patch)
treec1102cd773825fb6d69caaff22011b069e71a646 /meta-openembedded/meta-oe/recipes-support/nss
parent157744bac930642ebf7952ec8dc3df2faffd0928 (diff)
downloadopenbmc-bbbd5f468dc9c43b203cac3775f6c1b782ca7cba.tar.xz
meta-openembedded: subtree update:2258c9a767..164a6030b0
Alejandro Hernandez Samaniego (1): emacs: Fix packaging for emacs-minimal Andreas Müller (8): fluidsynth: upgrade 2.1.3 -> 2.1.5 hdf5: Shorten SUMMARY and move long text to DESCRIPTION wxwidgets: add opengl PACKAGECONFIG / enable it if opengl is in DISTRO_FEATURES wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it wxwidgets: upgrade 3.1.3 -> 3.1.4 babl: upgrade 0.1.78 -> 0.1.82 gegl: upgrade 0.4.24 -> 0.4.26 gimp: upgrade 2.10.20 -> 2.10.22 Andrej Valek (2): nss: upgrade 3.56 -> 3.57 nspr: upgrade 4.26 -> 4.29 Chen Qi (2): open-isns: use /run instead of /var/run in systemd service file openhpi: use /run instead of /var/run in systemd service file Daniel Ammann (2): dhex: add homepage pcsc-tools: add new package Fagundes, Paulo (1): vnstat: add recipe Gianfranco Costamagna (1): vboxguestdrivers: upgrade 6.1.14 -> 6.1.16 Gianluca Pacchiella (1): Add missing dependencies for rsnapshot. Khem Raj (5): meta-openembedded: Add gatesgarth to LAYERSERIES_COMPAT apitrace: Disable secuirty flags for clang iscsi-initiator-utils: Silence a clang warning on 64bit systems minifi-cpp: Do not use lld on riscv32 redis: Fix build with clang on riscv32 Leon Anavi (44): python3-aiohttp: Upgrade 3.6.2 -> 3.6.3 python3-ujson: Upgrade 3.2.0 -> 4.0.1 python3-passlib: Upgrade 1.7.2 -> 1.7.4 python3-croniter: Upgrade 0.3.34 -> 0.3.35 python3-isort: Upgrade 5.5.4 -> 5.6.4 python3-prompt-toolkit: Upgrade 3.0.7 -> 3.0.8 python3-yarl: Upgrade 1.6.0 -> 1.6.2 python3-sqlparse: Upgrade 0.3.1 -> 0.4.1 python3-sqlalchemy: Upgrade 1.3.19 -> 1.3.20 python3-sentry-sdk: Upgrade 0.18.0 -> 0.19.0 python3-markdown: Upgrade 3.3 -> 3.3.1 python3-pywbemtools: Upgrade 0.7.3 -> 0.8.0 python3-xlsxwriter: Upgrade 1.3.6 -> 1.3.7 python3-luma-core: Upgrade 1.17.1 -> 1.17.2 python3-graphviz: Upgrade 0.14.1 -> 0.14.2 python3-yappi: Upgrade 1.2.5 -> 1.3.0 python3-iniconfig: Upgrade 1.0.1 -> 1.1.1 transmission: Upgrade 2.94 -> 3.00 python3-regex: Upgrade 2020.10.11 -> 2020.10.15 python3-colorama: Upgrade 0.4.3 -> 0.4.4 python3-zipp: Upgrade 3.3.0 -> 3.3.1 python3-pychromecast: Upgrade 7.5.0 -> 7.5.1 python3-semver: Upgrade 2.10.2 -> 2.13.0 python3-pydicti: Upgrade 1.1.3 -> 1.1.4 python3-humanize: Upgrade 3.0.1 -> 3.1.0 python3-dominate: Upgrade 2.5.2 -> 2.6.0 python3-urllib3: Upgrade 1.25.10 -> 1.25.11 python3-bitarray: Upgrade 1.5.3 -> 1.6.0 python3-markdown: Upgrade 3.3.1 -> 3.3.2 python3-pymisp: Upgrade 2.4.131 -> 2.4.133 python3-typeguard: Upgrade 2.9.1 -> 2.10.0 python3-traitlets: Upgrade 5.0.4 -> 5.0.5 python3-sentry-sdk: Upgrade 0.19.0 -> 0.19.1 python3-lxml: Upgrade 4.5.2 -> 4.6.1 python3-regex: Upgrade 2020.10.15 -> 2020.10.23 python3-google-api-python-client: Upgrade 1.12.3 -> 1.12.5 python3-cryptography: Upgrade 3.1.1 -> 3.2 python3-psutil: Upgrade 5.7.2 -> 5.7.3 python3-pyparted: Upgrade 3.11.6 -> 3.11.7 python3-tqdm: Upgrade 4.50.2 -> 4.51.0 python3-u-msgpack-python: Upgrade 2.7.0 -> 2.7.1 python3-luma-core: Upgrade 1.17.2 -> 1.17.3 python3-zipp: Upgrade 3.3.1 -> 3.4.0 python3-aiohttp: Upgrade 3.6.3 -> 3.7.1 Luca Boccassi (2): Add recipe for fsverity-utils Add new recipe for squashfs-tools-ng Mario Schuknecht (1): wireguard-tools: Fix systemd service installation Martin Jansa (3): packagegroup-meta-multimedia: include fdk-aac and mpd only with commercial in LICENSE_FLAGS_WHITELIST python3-colorama: add native and nativesdk to BBCLASSEXTEND mpd: add commercial LICENSE_FLAGS when ffmpeg or aac PACKAGECONFIG is enabled Michael Tretter (1): apitrace: add new recipe Mingli Yu (1): mariadb: Upgrade to 10.5.6 Pascal Bach (1): fmt: make available as native and nativesdk Pierre-Jean Texier (3): c-periphery: upgrade 2.2.1 -> 2.2.4 c-periphery: fix typo in SUMMARY stunnel: upgrade 5.56 -> 5.57 Qi.Chen@windriver.com (4): php: use /run instead /var/run in systemd service file lmsensors: use /run instead of /var/run for systemd service cyrus-sasl: use /run instead of /var/run for systemd service file freediameter: use /run instead of /var/run in systemd service file Ross Burton (2): mpv: fetch waf in do_fetch glmark2: no need to patch waf Sakib Sajal (1): python3-prettytable: add python3-wcwidth to RDEPENDS Siming Yuan (1): python3-paramiko: fixing runtime dependencies Taisei Nakano (1): anthy: add GPLv2 to LICENSE and add LIC_FILES_CHKSUM Ulrich Ölmann (1): usb-modeswitch, usb-modeswitch-data: fix usrmerge Yi Zhao (2): samba: upgrade 4.10.17 -> 4.10.18 networkmanager: remove PACKAGECONFIG[dhclient] Zang Ruochen (13): firewalld: upgrade 0.9.0 -> 0.9.1 mtr: upgrade 0.93 -> 0.94 wireshark: upgrade 3.2.6 -> 3.2.7 hwdata: upgrade 0.339 -> 0.340 libmbim: upgrade 1.24.2 -> 1.24.4 linuxptp: upgrade 3.0 -> 3.1 memtester: upgrade 4.4.0 -> 4.5.0 paho-mqtt-c: upgrade 1.3.5 -> 1.3.6 mm-common: upgrade 1.0.1 -> 1.0.2 poppler: upgrade 20.09.0 -> 20.10.0 spdlog: upgrade 1.8.0 -> 1.8.1 libcgi-perl: upgrade 4.50 -> 4.51 libcurses-perl: upgrade 1.36 -> 1.37 zangrc (8): gphoto2: upgrade 2.5.23 -> 2.5.26 libgphoto2: upgrade 2.5.25 -> 2.5.26 libmtp: upgrade 1.1.17 -> 1.1.18 libp11: upgrade 0.4.10 -> 0.4.11 libpwquality: upgrade 1.4.2 -> 1.4.4 libqmi: upgrade 1.26.4 -> 1.26.6 nano: upgrade 5.2 -> 5.3 protobuf: upgrade 3.13.0 -> 3.13.0.1 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: Ie105cfe99ae7dab0f6f1fd8d88d43a1979faf486
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/nss')
-rw-r--r--meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch36
-rw-r--r--meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch46
-rw-r--r--meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb (renamed from meta-openembedded/meta-oe/recipes-support/nss/nss_3.56.bb)3
3 files changed, 24 insertions, 61 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
index bfc375e83..65e1500ae 100644
--- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
+++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
@@ -10,22 +10,24 @@ Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- nss/lib/freebl/Makefile | 4 ++++
+ nss/lib/freebl/Makefile | 3 +++
nss/lib/freebl/gcm.c | 2 ++
- 2 files changed, 6 insertions(+)
+ 2 files changed, 5 insertions(+)
+diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
+index fe8c526..922f67c 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
-@@ -126,6 +126,8 @@ else
+@@ -125,6 +125,8 @@ else
+ DEFINES += -DNSS_X86
endif
endif
- ifdef NS_USE_GCC
+ifdef NSS_USE_ARM_HW_CRYPTO
+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO
ifeq ($(CPU_ARCH),aarch64)
- DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
- EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c
-@@ -150,6 +152,7 @@ endif
+ ifdef CC_IS_CLANG
+ DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
+@@ -166,6 +168,7 @@ endif
endif
endif
endif
@@ -33,15 +35,23 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
ifeq ($(OS_TARGET),OSF1)
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
+diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
+index c2cc18d..b77f573 100644
--- a/nss/lib/freebl/gcm.c
+++ b/nss/lib/freebl/gcm.c
-@@ -21,7 +21,9 @@
+@@ -18,6 +18,7 @@
+
+ #include <limits.h>
+
++#ifdef NSS_USE_ARM_HW_CRYPTO
/* old gcc doesn't support some poly64x2_t intrinsic */
#if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
(defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
-+# ifdef NSS_USE_ARM_HW_CRYPTO
- #define USE_ARM_GCM
-+# endif
- #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
- !defined(NSS_DISABLE_ARM32_NEON)
+@@ -27,6 +28,7 @@
/* We don't test on big endian platform, so disable this on big endian. */
+ #define USE_ARM_GCM
+ #endif
++#endif
+
+ /* Forward declarations */
+ SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch
deleted file mode 100644
index 432312da2..000000000
--- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1136cad77c2dc7d8e1daa317877676733e805f29 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 26 Aug 2020 17:30:40 -0700
-Subject: [PATCH] pkix: Do not use NULL where 0 is needed
-
-Clang finds this error
-
-pkix_logger.c:316:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast]
- logger->logComponent = (PKIX_ERRORCLASS)NULL;
- ^~~~~~~~~~~~~~~~~~~~~
-pkix_logger.c:617:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast]
- logger->logComponent = (PKIX_ERRORCLASS)NULL;
- ^~~~~~~~~~~~~~~~~~~~~
-2 errors generated.
-
-Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1661378]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- nss/lib/libpkix/pkix/util/pkix_logger.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nss/lib/libpkix/pkix/util/pkix_logger.c b/nss/lib/libpkix/pkix/util/pkix_logger.c
-index a916e6e..10f537a 100644
---- a/nss/lib/libpkix/pkix/util/pkix_logger.c
-+++ b/nss/lib/libpkix/pkix/util/pkix_logger.c
-@@ -313,7 +313,7 @@ pkix_Logger_Destroy(
-
- logger->callback = NULL;
- PKIX_DECREF(logger->context);
-- logger->logComponent = (PKIX_ERRORCLASS)NULL;
-+ logger->logComponent = (PKIX_ERRORCLASS)0;
-
- cleanup:
-
-@@ -614,7 +614,7 @@ PKIX_Logger_Create(
-
- logger->callback = callback;
- logger->maxLevel = 0;
-- logger->logComponent = (PKIX_ERRORCLASS)NULL;
-+ logger->logComponent = (PKIX_ERRORCLASS)0;
-
- PKIX_INCREF(loggerContext);
- logger->context = loggerContext;
---
-2.28.0
-
diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.56.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb
index 997f8950f..5d9318a92 100644
--- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.56.bb
+++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb
@@ -31,9 +31,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
file://system-pkcs11.txt \
file://nss-fix-nsinstall-build.patch \
file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
- file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \
"
-SRC_URI[sha256sum] = "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
+SRC_URI[sha256sum] = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382"
UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"