summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-19 19:31:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-12 08:51:09 +0100
commit82b555aef24f7ca454a624f5dea2f222b3206663 (patch)
tree4d5df2fbe2a9d10839c2ae3d816662fcfcfbf557
parent13fcd3fdeceea7324f86087541b1b77fb52917bb (diff)
downloadpoky-82b555aef24f7ca454a624f5dea2f222b3206663.tar.gz
nss: Update to 3.29.1
Also fix build with gcc7 along (From OE-Core rev: 5b8c7e4cc54353014e9e023e29a6ff97aefd5179) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch41
-rw-r--r--meta/recipes-support/nss/nss_3.29.1.bb (renamed from meta/recipes-support/nss/nss_3.28.1.bb)28
2 files changed, 55 insertions, 14 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
new file mode 100644
index 0000000000..b16fb020c1
--- /dev/null
+++ b/meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch
@@ -0,0 +1,41 @@
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.28.1.bb b/meta/recipes-support/nss/nss_3.29.1.bb
index fed86fc8e9..48db0312b1 100644
--- a/meta/recipes-support/nss/nss_3.28.1.bb
+++ b/meta/recipes-support/nss/nss_3.29.1.bb
@@ -14,20 +14,20 @@ 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 = "\ 17SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_29_1_RTM/src/${BP}.tar.gz \
18 http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_28_1_RTM/src/${BP}.tar.gz \ 18 file://nss.pc.in \
19 file://0001-nss-fix-support-cross-compiling.patch \ 19 file://signlibs.sh \
20 file://nss-no-rpath-for-cross-compiling.patch \ 20 file://0001-nss-fix-support-cross-compiling.patch \
21 file://nss-fix-incorrect-shebang-of-perl.patch \ 21 file://nss-no-rpath-for-cross-compiling.patch \
22 file://nss-fix-nsinstall-build.patch \ 22 file://nss-fix-incorrect-shebang-of-perl.patch \
23 file://disable-Wvarargs-with-clang.patch \ 23 file://nss-fix-nsinstall-build.patch \
24 file://pqg.c-ULL_addend.patch \ 24 file://disable-Wvarargs-with-clang.patch \
25 file://Fix-compilation-for-X32.patch \ 25 file://pqg.c-ULL_addend.patch \
26 file://nss.pc.in \ 26 file://Fix-compilation-for-X32.patch \
27 file://signlibs.sh \ 27 file://0001-Fix-warnings-found-with-gcc7.patch \
28" 28 "
29SRC_URI[md5sum] = "e98d48435cee5792f97ef7fc35a602c3" 29SRC_URI[md5sum] = "0525d1a45931892daa0f368d379d4aa4"
30SRC_URI[sha256sum] = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad" 30SRC_URI[sha256sum] = "47259bc5c4439d8228d7c577ea652ed140588f27eae8ebb39cc91057aea37366"
31 31
32UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" 32UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
33UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" 33UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"