From 73106743c16254b8b3db2d95d3f3d0530e4ff0e0 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 8 Feb 2017 16:33:58 +0100 Subject: [PATCH] Update to NSS 3.29.0 --- .gitignore | 1 + nss-gcc7.patch | 12 ++++++++++++ nss.spec | 14 ++++++++++---- sources | 2 +- 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 nss-gcc7.patch diff --git a/.gitignore b/.gitignore index aebed9a..e6f87f6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ TestUser51.cert /nss-3.27.0.tar.gz /nss-3.27.2.tar.gz /nss-3.28.1.tar.gz +/nss-3.29.0.tar.gz diff --git a/nss-gcc7.patch b/nss-gcc7.patch new file mode 100644 index 0000000..a224c35 --- /dev/null +++ b/nss-gcc7.patch @@ -0,0 +1,12 @@ +diff -up nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c.gcc7 nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c +--- nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c.gcc7 2017-02-08 14:34:04.212655936 +0100 ++++ nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c 2017-02-08 14:37:33.326388891 +0100 +@@ -89,7 +89,7 @@ pkix_pl_OcspRequest_Hashcode( + PKIX_HASHCODE(ocspRq->signerCert, &signerHash, plContext, + PKIX_CERTHASHCODEFAILED); + +- *pHashcode = (((((extensionHash << 8) || certHash) << 8) || ++ *pHashcode = ((PKIX_UInt32)(((PKIX_UInt32)((extensionHash << 8) || certHash) << 8) || + dateHash) << 8) || signerHash; + + cleanup: diff --git a/nss.spec b/nss.spec index 5b3cc2b..8925cad 100644 --- a/nss.spec +++ b/nss.spec @@ -1,6 +1,6 @@ %global nspr_version 4.13.0 -%global nss_util_version 3.28.1 -%global nss_softokn_version 3.28.1 +%global nss_util_version 3.29.0 +%global nss_softokn_version 3.29.0 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv" @@ -18,10 +18,10 @@ Summary: Network Security Services Name: nss -Version: 3.28.1 +Version: 3.29.0 # for Rawhide, please always use release >= 2 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...) -Release: 6%{?dist} +Release: 2%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -113,6 +113,7 @@ Patch58: rhbz1185708-enable-ecc-3des-ciphers-by-default.patch Patch59: nss-check-policy-file.patch # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1280846 Patch62: nss-skip-util-gtest.patch +Patch63: nss-gcc7.patch %description Network Security Services (NSS) is a set of libraries designed to @@ -196,6 +197,7 @@ low level services. pushd nss %patch59 -p1 -b .check_policy_file %patch62 -p0 -b .skip_util_gtest +%patch63 -p1 -b .gcc7 popd ######################################################### @@ -804,6 +806,10 @@ fi %changelog +* Wed Feb 8 2017 Daiki Ueno - 3.29.0-2 +- Rebase to NSS 3.29.0 +- Suppress -Werror=int-in-bool-context warnings with GCC7 + * Mon Jan 23 2017 Daiki Ueno - 3.28.1-6 - Work around pkgconfig -> pkgconf transition issue (releng#6597) diff --git a/sources b/sources index 26a895f..3b69fea 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.28.1.tar.gz) = f10c8e404741fafe5e5772dc754ff4503ec1826942db5fbc13b99155fcac50f29e1405dd249b69a27f27ebcfef73849b1f0f636a2076ab761384e8a0ed9a2b8b +SHA512 (nss-3.29.0.tar.gz) = 32404bec9b12e75b1c2f2d26915f65258e0a2f751c3599d797137a6047b0d64f78d97fe51a5d74f04a96c49d294c1fb0f7e851e48fb532a853ca2b42e7937a51