* Refresh patches. Signed-off-by: Yi Zhao <[email protected]> --- .../0001-nss-fix-support-cross-compiling.patch | 13 ++++++++----- ... 0002-nss-no-rpath-for-cross-compiling.patch} | 9 ++++++--- ...0003-nss-fix-incorrect-shebang-of-perl.patch} | 9 ++++++--- ...> 0004-nss-disable-Wvarargs-with-clang.patch} | 9 ++++++--- ...uild-on-mips-with-clang-because-wrong-.patch} | 13 ++++++++----- ...-multilib-build-on-openSUSE-11.x-32bit.patch} | 13 +++++++------ ...onfigure-option-to-disable-ARM-HW-cryp.patch} | 15 +++++++++------ .../nss/{nss_3.103.bb => nss_3.107.bb} | 16 ++++++++-------- 8 files changed, 58 insertions(+), 39 deletions(-) rename meta-oe/recipes-support/nss/nss/{nss-no-rpath-for-cross-compiling.patch => 0002-nss-no-rpath-for-cross-compiling.patch} (87%) rename meta-oe/recipes-support/nss/nss/{nss-fix-incorrect-shebang-of-perl.patch => 0003-nss-fix-incorrect-shebang-of-perl.patch} (97%) rename meta-oe/recipes-support/nss/nss/{disable-Wvarargs-with-clang.patch => 0004-nss-disable-Wvarargs-with-clang.patch} (92%) rename meta-oe/recipes-support/nss/nss/{pqg.c-ULL_addend.patch => 0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch} (83%) rename meta-oe/recipes-support/nss/nss/{nss-fix-nsinstall-build.patch => 0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch} (83%) rename meta-oe/recipes-support/nss/nss/{0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch => 0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch} (88%) rename meta-oe/recipes-support/nss/{nss_3.103.bb => nss_3.107.bb} (94%)
diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch index 2385fd3b9d..5733bb068f 100644 --- a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -1,21 +1,21 @@ -From 46ab1ca6e6fb8e1196e0665a54506dff370f8f2a Mon Sep 17 00:00:00 2001 +From c15470d6b52986a8e41f9be4579c88ed80413b44 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 22 Feb 2017 11:36:11 +0200 Subject: [PATCH] nss: fix support cross compiling Let some make variables be assigned from outside makefile. -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [oe specific] + Signed-off-by: Hongxu Jia <[email protected]> Signed-off-by: Alexander Kanavin <[email protected]> - --- nss/coreconf/arch.mk | 4 ++-- nss/lib/freebl/Makefile | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 17e9fae..bc4180a 100644 +index 711d19d..a163d24 100644 --- a/nss/coreconf/arch.mk +++ b/nss/coreconf/arch.mk @@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) @@ -33,7 +33,7 @@ index 17e9fae..bc4180a 100644 diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index eeee90a..7ee8736 100644 +index e744314..0ebfc92 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile @@ -36,6 +36,12 @@ ifdef USE_64 @@ -49,3 +49,6 @@ index eeee90a..7ee8736 100644 ifdef USE_ABI32_FPU DEFINES += -DNSS_USE_ABI32_FPU endif +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch similarity index 87% rename from meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch rename to meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch index 8c715cc447..19fa5a7261 100644 --- a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ b/meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch @@ -1,11 +1,11 @@ -From 73edfbdf33fe4e41724e7e947033d8caeec8f3d0 Mon Sep 17 00:00:00 2001 +From 621023bc696d3d26a4179dbbafb42d79bef1faf9 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] nss:no rpath for cross compiling -Signed-off-by: Hongxu Jia <[email protected]> -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Hongxu Jia <[email protected]> --- nss/cmd/platlibs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -26,3 +26,6 @@ index 6401778..e5c4e16 100644 endif endif +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch similarity index 97% rename from meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch rename to meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch index 735b06b5ca..61b7565739 100644 --- a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ b/meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch @@ -1,14 +1,14 @@ -From 2ce67b1f4b1f582d556ae058da10698bbaa0edc1 Mon Sep 17 00:00:00 2001 +From 6aec640342088498cb1b0a2e395eb3da297a48b4 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait <[email protected]> Date: Mon, 13 Jul 2020 12:12:31 +0300 Subject: [PATCH] nss: fix incorrect shebang of perl Replace incorrect shebang of perl with `#!/usr/bin/env perl'. -Signed-off-by: Hongxu Jia <[email protected]> Upstream-Status: Pending -Signed-off-by: Ovidiu Panait <[email protected]> +Signed-off-by: Hongxu Jia <[email protected]> +Signed-off-by: Ovidiu Panait <[email protected]> --- nss/cmd/signver/examples/1/form.pl | 2 +- nss/cmd/signver/examples/1/signedForm.pl | 2 +- @@ -89,3 +89,6 @@ index f29f60a..850332a 100755 ######################################################################## # +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch similarity index 92% rename from meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch rename to meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch index 4c9bea30c0..fa4c5bacbf 100644 --- a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ b/meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch @@ -1,7 +1,7 @@ -From f613c9a9107435a40d91329f33f12cfb16927f07 Mon Sep 17 00:00:00 2001 +From 72c3150300975524bb0001b5a731f077852c95ab Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 7 Mar 2020 08:34:02 -0800 -Subject: [PATCH] nss,nspr: Add recipes +Subject: [PATCH] nss: disable Wvarargs with clang clang 3.9 add this warning to rightly flag undefined behavior, we relegate this to be just a warning instead @@ -20,9 +20,9 @@ see https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start for more details -Signed-off-by: Khem Raj <[email protected]> Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> --- nss/coreconf/Werror.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -40,3 +40,6 @@ index a569a49..687fe58 100644 # -Wno-parentheses-equality : because clang warns about macro expansions WARNING_CFLAGS += $(call disable_warning,parentheses-equality) ifdef BUILD_OPT +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch similarity index 83% rename from meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch rename to meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch index 589b4d5e7f..f12a278ef2 100644 --- a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ b/meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch @@ -1,22 +1,22 @@ -From cbd367160338847b28fc801a12c74f1c8b5b03ee Mon Sep 17 00:00:00 2001 +From 5935755eef43ac7cb8f4567e7bed5892180f954c Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 7 Mar 2020 08:34:02 -0800 -Subject: [PATCH] nss does not build on mips with clang because wrong types are - used? +Subject: [PATCH] nss: does not build on mips with clang because wrong types + are used pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] if (addend < MP_DIGIT_MAX) { ~~~~~~ ^ ~~~~~~~~~~~~ -Signed-off-by: Khem Raj <[email protected]> Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> --- nss/lib/freebl/pqg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c -index 1b03278..ad895b7 100644 +index 62d46b5..8c8665d 100644 --- a/nss/lib/freebl/pqg.c +++ b/nss/lib/freebl/pqg.c @@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) @@ -30,3 +30,6 @@ index 1b03278..ad895b7 100644 SECItem *seedout) { mp_int s, sum, modulus, tmp; +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch similarity index 83% rename from meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch rename to meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch index a1897f88d8..afe11821af 100644 --- a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ b/meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch @@ -1,4 +1,4 @@ -From f9b2b1c738576a17460aebd005f511f427aa1974 Mon Sep 17 00:00:00 2001 +From 895e76e75dbb993a8f445072c190a9db4ee50d15 Mon Sep 17 00:00:00 2001 From: Wenzong Fan <[email protected]> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit @@ -15,17 +15,15 @@ on host to install built files, it doesn't need any cross-compling or multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this error. -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Wenzong Fan <[email protected]> -=================================================== - --- nss/coreconf/nsinstall/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile -index 08dfbc2..e97fb5f 100644 +index 337cbeb..dd77fbe 100644 --- a/nss/coreconf/nsinstall/Makefile +++ b/nss/coreconf/nsinstall/Makefile @@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 @@ -39,6 +37,9 @@ index 08dfbc2..e97fb5f 100644 +LDFLAGS = +# CFLAGS = + - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + ifeq (,$(filter-out WIN%,$(OS_TARGET))) PROGRAM = TARGETS = +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch similarity index 88% rename from meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch rename to meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index b7f1b01a14..5debd13488 100644 --- a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -1,4 +1,4 @@ -From 7c8f367faf8848a43a414079189e10270d6c0fcc Mon Sep 17 00:00:00 2001 +From 781a21fa9b0d8d8d6df0de45e3c9dc3f3e74be8f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 18 Dec 2019 12:29:50 +0100 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto @@ -7,15 +7,15 @@ Not all current hardware supports it, particularly anything prior to armv8 does not. Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> +Signed-off-by: Alexander Kanavin <[email protected]> --- nss/lib/freebl/Makefile | 3 +++ nss/lib/freebl/gcm.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 7ee8736..f9b4925 100644 +index 0ebfc92..3ee7623 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile @@ -142,6 +142,8 @@ endif @@ -33,10 +33,10 @@ index 7ee8736..f9b4925 100644 endif +endif - ifeq (OS2,$(OS_TARGET)) - ASFILES = mpi_x86_os2.s + ifeq (,$(filter-out WINNT,$(OS_TARGET))) + ifndef USE_64 diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c -index 2dae724..9ee7fc8 100644 +index d728867..8b4de1d 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c @@ -18,6 +18,7 @@ @@ -55,3 +55,6 @@ index 2dae724..9ee7fc8 100644 /* Forward declarations */ SECStatus gcm_HashInit_hw(gcmHashContext *ghash); +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss_3.103.bb b/meta-oe/recipes-support/nss/nss_3.107.bb similarity index 94% rename from meta-oe/recipes-support/nss/nss_3.103.bb rename to meta-oe/recipes-support/nss/nss_3.107.bb index 64141e9383..23e046b0a9 100644 --- a/meta-oe/recipes-support/nss/nss_3.103.bb +++ b/meta-oe/recipes-support/nss/nss_3.107.bb @@ -22,18 +22,18 @@ VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + ' SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ file://nss.pc.in \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ file://blank-cert9.db \ file://blank-key4.db \ 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-nss-fix-support-cross-compiling.patch \ + file://0002-nss-no-rpath-for-cross-compiling.patch \ + file://0003-nss-fix-incorrect-shebang-of-perl.patch \ + file://0004-nss-disable-Wvarargs-with-clang.patch \ + file://0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch \ + file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \ + file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[sha256sum] = "7b4ab657f772dc7520c46e8d481940b292dcfc6a4c90150a7c26672384cee962" +SRC_URI[sha256sum] = "7f7e96473e38150771a615f5d40e8c41ba3a19385301ae0c525091f2fc9d6729" UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/"; UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#114599): https://lists.openembedded.org/g/openembedded-devel/message/114599 Mute This Topic: https://lists.openembedded.org/mt/110354039/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
