diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2017-08-16 23:30:01 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-17 10:04:30 +0100 |
| commit | 86838f1c06002a62ded12a9a66d1eb82093c85a9 (patch) | |
| tree | d0a16db4f79a826e187744c2af003129755b2801 /meta/recipes-support | |
| parent | f6f6d138028669acdbcfcce47afb3e9807d8db33 (diff) | |
| download | openembedded-core-contrib-86838f1c06002a62ded12a9a66d1eb82093c85a9.tar.gz | |
nss: 3.30.2 -> 3.31.1
Upgrade nss from 3.30.2 to latest stable version 3.31.1.
* remove 0001-Fix-warnings-found-with-gcc7.patch which is not needed now
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-support/nss/nss_3.31.1.bb (renamed from meta/recipes-support/nss/nss_3.30.2.bb) | 10 |
2 files changed, 6 insertions, 45 deletions
diff --git a/meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch b/meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch deleted file mode 100644 index b16fb020c1..0000000000 --- a/meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a1d2ef6a8e1bc721e44640bdb85747deaf8edcca Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 19 Apr 2017 10:50:37 -0700 -Subject: [PATCH] Fix warnings found with gcc7 - -GCC7 finds more type conversion issues - -| pkix_pl_ocsprequest.c: In function 'pkix_pl_OcspRequest_Hashcode': -| pkix_pl_ocsprequest.c:92:60: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context] -| *pHashcode = (((((extensionHash << 8) || certHash) << 8) || -| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ -| pkix_pl_ocsprequest.c:93:27: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context] -| *pHashcode = (((((extensionHash << 8) || certHash) << 8) || -| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| dateHash) << 8) || signerHash; -| ~~~~~~~~~~^~~~~ -| cc1: all warnings being treated as errors - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c b/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c -index 171a3d2..d5eef88 100644 ---- a/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c -+++ b/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c -@@ -89,7 +89,7 @@ pkix_pl_OcspRequest_Hashcode( - PKIX_HASHCODE(ocspRq->signerCert, &signerHash, plContext, - PKIX_CERTHASHCODEFAILED); - -- *pHashcode = (((((extensionHash << 8) || certHash) << 8) || -+ *pHashcode = ((PKIX_UInt32)(((PKIX_UInt32)((extensionHash << 8) || certHash) << 8) || - dateHash) << 8) || signerHash; - - cleanup: --- -2.12.2 - diff --git a/meta/recipes-support/nss/nss_3.30.2.bb b/meta/recipes-support/nss/nss_3.31.1.bb index 6683e5ce02..955862fddb 100644 --- a/meta/recipes-support/nss/nss_3.30.2.bb +++ b/meta/recipes-support/nss/nss_3.31.1.bb @@ -14,7 +14,9 @@ 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" -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_30_2_RTM/src/${BP}.tar.gz \ +VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ file://nss.pc.in \ file://signlibs.sh \ file://0001-nss-fix-support-cross-compiling.patch \ @@ -24,10 +26,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_30 file://disable-Wvarargs-with-clang.patch \ file://pqg.c-ULL_addend.patch \ file://Fix-compilation-for-X32.patch \ - file://0001-Fix-warnings-found-with-gcc7.patch \ " -SRC_URI[md5sum] = "42c22dd8ec6254f846259f1d8dd2eb76" -SRC_URI[sha256sum] = "0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24" + +SRC_URI[md5sum] = "ebb44f1394250d2cf6ec3c2e3d71fa20" +SRC_URI[sha256sum] = "933439214dc03ee60e86d1419c19e1568998b0776dde987f41fa70ced6cd08dc" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" |