summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nss
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2017-08-16 23:30:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:26 +0100
commitaa4f7c8b142be76d77e172e83e1b176d83e050d4 (patch)
treedf6af50c5b10fa0e1cfe03f64804fa24d814d793 /meta/recipes-support/nss
parent3561875077faab8fed746b1dc61e1aea5850ab67 (diff)
downloadpoky-aa4f7c8b142be76d77e172e83e1b176d83e050d4.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 (From OE-Core rev: 86838f1c06002a62ded12a9a66d1eb82093c85a9) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nss')
-rw-r--r--meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch41
-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 @@
1From a1d2ef6a8e1bc721e44640bdb85747deaf8edcca Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 19 Apr 2017 10:50:37 -0700
4Subject: [PATCH] Fix warnings found with gcc7
5
6GCC7 finds more type conversion issues
7
8| pkix_pl_ocsprequest.c: In function 'pkix_pl_OcspRequest_Hashcode':
9| pkix_pl_ocsprequest.c:92:60: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
10| *pHashcode = (((((extensionHash << 8) || certHash) << 8) ||
11| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
12| pkix_pl_ocsprequest.c:93:27: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
13| *pHashcode = (((((extensionHash << 8) || certHash) << 8) ||
14| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15| dateHash) << 8) || signerHash;
16| ~~~~~~~~~~^~~~~
17| cc1: all warnings being treated as errors
18
19Upstream-Status: Pending
20
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22---
23 nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --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
27index 171a3d2..d5eef88 100644
28--- a/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c
29+++ b/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c
30@@ -89,7 +89,7 @@ pkix_pl_OcspRequest_Hashcode(
31 PKIX_HASHCODE(ocspRq->signerCert, &signerHash, plContext,
32 PKIX_CERTHASHCODEFAILED);
33
34- *pHashcode = (((((extensionHash << 8) || certHash) << 8) ||
35+ *pHashcode = ((PKIX_UInt32)(((PKIX_UInt32)((extensionHash << 8) || certHash) << 8) ||
36 dateHash) << 8) || signerHash;
37
38 cleanup:
39--
402.12.2
41
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 \
14 file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ 14 file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
15 file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" 15 file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132"
16 16
17SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_30_2_RTM/src/${BP}.tar.gz \ 17VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}"
18
19SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \
18 file://nss.pc.in \ 20 file://nss.pc.in \
19 file://signlibs.sh \ 21 file://signlibs.sh \
20 file://0001-nss-fix-support-cross-compiling.patch \ 22 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
24 file://disable-Wvarargs-with-clang.patch \ 26 file://disable-Wvarargs-with-clang.patch \
25 file://pqg.c-ULL_addend.patch \ 27 file://pqg.c-ULL_addend.patch \
26 file://Fix-compilation-for-X32.patch \ 28 file://Fix-compilation-for-X32.patch \
27 file://0001-Fix-warnings-found-with-gcc7.patch \
28 " 29 "
29SRC_URI[md5sum] = "42c22dd8ec6254f846259f1d8dd2eb76" 30
30SRC_URI[sha256sum] = "0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24" 31SRC_URI[md5sum] = "ebb44f1394250d2cf6ec3c2e3d71fa20"
32SRC_URI[sha256sum] = "933439214dc03ee60e86d1419c19e1568998b0776dde987f41fa70ced6cd08dc"
31 33
32UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" 34UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
33UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" 35UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"