diff --git a/.gitignore b/.gitignore index 426bcfc..c20f175 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ TestUser51.cert /nss-3.28.1.tar.gz /nss-3.29.0.tar.gz /nss-3.29.1.tar.gz +/nss-3.29.3.tar.gz diff --git a/nss.spec b/nss.spec index 43ef4e4..9600df5 100644 --- a/nss.spec +++ b/nss.spec @@ -1,6 +1,6 @@ -%global nspr_version 4.13.0 -%global nss_util_version 3.29.1 -%global nss_softokn_version 3.29.1 +%global nspr_version 4.13.1 +%global nss_util_version 3.29.3 +%global nss_softokn_version 3.29.3 %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.29.1 +Version: 3.29.3 # for Rawhide, please always use release >= 2 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...) -Release: 2.1%{?dist} +Release: 1.0%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -114,7 +114,6 @@ 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 -Patch64: nss-1334976-1336487.patch %description Network Security Services (NSS) is a set of libraries designed to @@ -199,7 +198,6 @@ pushd nss %patch59 -p1 -b .check_policy_file %patch62 -p0 -b .skip_util_gtest %patch63 -p1 -b .gcc7 -%patch64 -p1 -b .1334976-1336487 popd ######################################################### @@ -808,6 +806,10 @@ fi %changelog +* Mon Mar 20 2017 Daiki Ueno - 3.29.3-1.0 +- Rebase to NSS 3.29.3 +- Remove upstreamed patch for fixing crash in tls13_DestroyKeyShares + * Thu Mar 02 2017 Kai Engert - 3.29.1-2.1 - Backport mozbz#1334976 and mozbz#1336487. diff --git a/sources b/sources index f2da5c0..a832b39 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.29.1.tar.gz) = c060f568a3243343b5a1315d632015373dc7dfd2ca9567fb484190dd56f87b1bc977539b9e28fe4fbfc6ee25409e69b1192a2b590031257dd8c89d162332e050 +SHA512 (nss-3.29.3.tar.gz) = eebc479521dc4e64565929620f60bf457875a2b21d7b5dc2b67f4e4279bfb1a814c31a7b17638052cec44ede9fb686a3ff776cd2239271142100e0fd5f769519