From 3f35603021e226f0966f02540125d2cf7e37e445 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 1 Jun 2020 08:08:02 +0200 Subject: [PATCH] Update to NSS 3.53 --- .gitignore | 1 + nss-kremlin-ppc64le.patch | 31 ------------------------------- nss.spec | 9 +++++---- sources | 2 +- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 nss-kremlin-ppc64le.patch diff --git a/.gitignore b/.gitignore index 3cbf5bc..5d009e7 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ TestUser51.cert /nss-3.51.tar.gz /nss-3.51.1.tar.gz /nss-3.52.tar.gz +/nss-3.53.tar.gz diff --git a/nss-kremlin-ppc64le.patch b/nss-kremlin-ppc64le.patch deleted file mode 100644 index b5f4700..0000000 --- a/nss-kremlin-ppc64le.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -=================================================================== ---- nss.orig/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -+++ nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -@@ -56,9 +56,10 @@ typedef const char *Prims_string; - !defined(__clang__) - #include - typedef __m128i FStar_UInt128_uint128; --#elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ -+#elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ - (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -- (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__))) -+ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \ -+ defined(__s390x__)) - typedef unsigned __int128 FStar_UInt128_uint128; - #elif !defined(KRML_VERIFIED_UINT128) && defined(_MSC_VER) && defined(__clang__) - typedef __uint128_t FStar_UInt128_uint128; -Index: nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -=================================================================== ---- nss.orig/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -+++ nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -@@ -26,7 +26,8 @@ - - #if !defined(KRML_VERIFIED_UINT128) && (!defined(_MSC_VER) || defined(__clang__)) && \ - (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -- (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__))) -+ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \ -+ defined(__s390x__)) - - /* GCC + using native unsigned __int128 support */ - diff --git a/nss.spec b/nss.spec index d7d288f..ddb157d 100644 --- a/nss.spec +++ b/nss.spec @@ -1,5 +1,5 @@ %global nspr_version 4.25.0 -%global nss_version 3.52.0 +%global nss_version 3.53.0 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global saved_files_dir %{_libdir}/nss/saved %global dracutlibdir %{_prefix}/lib/dracut @@ -44,7 +44,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM", Summary: Network Security Services Name: nss Version: %{nss_version} -Release: 2%{?dist} +Release: 1%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Requires: nspr >= %{nspr_version} @@ -107,8 +107,6 @@ Patch2: nss-539183.patch # but it doesn't hurt to keep it. Patch4: iquote.patch Patch12: nss-signtool-format.patch -# https://github.com/FStarLang/kremlin/issues/166 -Patch13: nss-kremlin-ppc64le.patch %if 0%{?fedora} < 34 %if 0%{?rhel} < 9 Patch20: nss-gcm-param-default-pkcs11v2.patch @@ -892,6 +890,9 @@ update-crypto-policies &> /dev/null || : %changelog +* Mon Jun 1 2020 Daiki Ueno - 3.53.0-1 +- Update to NSS 3.53 + * Wed May 13 2020 Bob Relyea - 3.52.0-2 - Delay CK_GCM_PARAMS semantics until fedora 34 diff --git a/sources b/sources index 2f019bb..77bf7ca 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403 SHA512 (blank-key3.db) = 01f7314e9fc8a7c9aa997652624cfcde213d18a6b3bb31840c1a60bbd662e56b5bc3221d13874abb42ce78163b225a6dfce2e1326cf6dd29366ad9c28ba5a71c SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7 SHA512 (blank-secmod.db) = 06a2dbd861839ef6315093459328b500d3832333a34b30e6fac4a2503af337f014a4d319f0f93322409e719142904ce8bc08252ae9a4f37f30d4c3312e900310 -SHA512 (nss-3.52.tar.gz) = a45baf38717bceda03c292b2c01def680a24a846327e17d36044a85e30ed40c68220c78c0a2c3025c11778ee58f5d5eb0fff1b4cd274b95c408fb59e394e62c6 +SHA512 (nss-3.53.tar.gz) = 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503