summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-03-10 11:07:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-11 05:32:17 -0700
commit0de293ce514c24305a520b2291158477f77cb3ac (patch)
tree7218b48378638ae554c88fb86e4d94ed2d1f63de
parentbff8b18aef79a4190b040a1af25e004e9a5f7007 (diff)
downloadopenembedded-core-0de293ce514c24305a520b2291158477f77cb3ac.tar.gz
openembedded-core-0de293ce514c24305a520b2291158477f77cb3ac.tar.bz2
openembedded-core-0de293ce514c24305a520b2291158477f77cb3ac.zip
nss: update to 3.42.1
remove nss-fix-SHA_HTONL-bug-for-arm-32be.patch now included Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch34
-rw-r--r--meta/recipes-support/nss/nss_3.42.1.bb (renamed from meta/recipes-support/nss/nss_3.41.bb)5
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
deleted file mode 100644
index bb1c6e3b34..0000000000
--- a/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/meta/recipes-support/nss/nss_3.41.bb b/meta/recipes-support/nss/nss_3.42.1.bb
index 5ab22b1226..b6bbd800fc 100644
--- a/meta/recipes-support/nss/nss_3.41.bb
+++ b/meta/recipes-support/nss/nss_3.42.1.bb
@@ -28,11 +28,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
file://blank-cert9.db \
file://blank-key4.db \
file://system-pkcs11.txt \
- file://nss-fix-SHA_HTONL-bug-for-arm-32be.patch \
"
-SRC_URI[md5sum] = "eec62a289387a7ce2fd9cca1f76600f3"
-SRC_URI[sha256sum] = "ab2e18f5d0dd0079c0005396f9beb9a41e9a1bbc7e6c1d0a99affcef0471712d"
+SRC_URI[md5sum] = "1f6cc6c702379478a3a72298caaef0a7"
+SRC_URI[sha256sum] = "087db37d38fd49dfd584dd2a8b5baa7fc88de7c9bd97c0c2d5be4abcafc61fc6"
UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"