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-18 10:40:26 +0100 |
commit | aa4f7c8b142be76d77e172e83e1b176d83e050d4 (patch) | |
tree | df6af50c5b10fa0e1cfe03f64804fa24d814d793 /meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch | |
parent | 3561875077faab8fed746b1dc61e1aea5850ab67 (diff) | |
download | poky-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/nss/0001-Fix-warnings-found-with-gcc7.patch')
-rw-r--r-- | meta/recipes-support/nss/nss/0001-Fix-warnings-found-with-gcc7.patch | 41 |
1 files changed, 0 insertions, 41 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 @@ | |||
1 | From a1d2ef6a8e1bc721e44640bdb85747deaf8edcca Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 19 Apr 2017 10:50:37 -0700 | ||
4 | Subject: [PATCH] Fix warnings found with gcc7 | ||
5 | |||
6 | GCC7 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 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-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 | |||
26 | 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 | ||
27 | index 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 | -- | ||
40 | 2.12.2 | ||
41 | |||