diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/poky/meta/recipes-support/nss/nss | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/poky/meta/recipes-support/nss/nss')
12 files changed, 0 insertions, 346 deletions
diff --git a/external/poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/external/poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d5403397..00000000 --- a/external/poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -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] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/external/poky/meta/recipes-support/nss/nss/blank-cert9.db b/external/poky/meta/recipes-support/nss/nss/blank-cert9.db Binary files differdeleted file mode 100644 index 7d4bcf25..00000000 --- a/external/poky/meta/recipes-support/nss/nss/blank-cert9.db +++ /dev/null diff --git a/external/poky/meta/recipes-support/nss/nss/blank-key4.db b/external/poky/meta/recipes-support/nss/nss/blank-key4.db Binary files differdeleted file mode 100644 index d47f08d0..00000000 --- a/external/poky/meta/recipes-support/nss/nss/blank-key4.db +++ /dev/null diff --git a/external/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/external/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d27..00000000 --- a/external/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -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 <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/external/poky/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch b/external/poky/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch deleted file mode 100644 index bb1c6e3b..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch +++ /dev/null @@ -1,34 +0,0 @@ -Subject: [PATCH] Fix SHA_HTONL bug for arm 32be. - -In arm 32be, there is no need to reverse the host value. - -Upstream-Status: Pending - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - lib/freebl/sha_fast.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/nss/lib/freebl/sha_fast.h b/nss/lib/freebl/sha_fast.h -index 4f37d13..8072eda 100644 ---- a/nss/lib/freebl/sha_fast.h -+++ b/nss/lib/freebl/sha_fast.h -@@ -99,6 +99,7 @@ swap4b(PRUint32 value) - defined(__ARM_ARCH_7__) || \ - defined(__ARM_ARCH_7A__) || \ - defined(__ARM_ARCH_7R__))) -+#if defined(IS_LITTLE_ENDIAN) - static __inline__ PRUint32 - swap4b(PRUint32 value) - { -@@ -109,6 +110,7 @@ swap4b(PRUint32 value) - return ret; - } - #define SHA_HTONL(x) swap4b(x) -+#endif - - #endif /* x86 family */ - --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/external/poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d5..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/external/poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/external/poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 181c69ad..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -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: Pending - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/external/poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/external/poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc93..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/external/poky/meta/recipes-support/nss/nss/nss.pc.in b/external/poky/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 200f635c..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/external/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/external/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817faa..00000000 --- a/external/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 <raj.khem@gmail.com> -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/external/poky/meta/recipes-support/nss/nss/signlibs.sh b/external/poky/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499f..00000000 --- a/external/poky/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/external/poky/meta/recipes-support/nss/nss/system-pkcs11.txt b/external/poky/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9c..00000000 --- a/external/poky/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - |