From 1dda6d788777056836eb40f46882cb06fd594ae2 Mon Sep 17 00:00:00 2001 From: Bob Relyea Date: Wed, 11 Aug 2021 09:31:27 -0700 Subject: [PATCH] Update f35 to the same rebase and lto as f36. We have to use release 2 here because release 1 is taked f36, but has f35 in the dist name. --- .gitignore | 2 ++ nss.spec | 18 ++++++++++++------ sources | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2911bbd..96a8369 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,5 @@ TestUser51.cert /nss-3.65.tar.gz /nss-3.67.tar.gz /nspr-4.31.tar.gz +/nss-3.69.tar.gz +/nspr-4.32.tar.gz diff --git a/nss.spec b/nss.spec index e7834f9..e5f1d86 100644 --- a/nss.spec +++ b/nss.spec @@ -1,11 +1,11 @@ -%global nspr_version 4.31.0 -%global nss_version 3.67.0 +%global nspr_version 4.32.0 +%global nss_version 3.69.0 # NOTE: To avoid NVR clashes of nspr* packages: # - reset %%{nspr_release} to 1, when updating %%{nspr_version} # - increment %%{nspr_version}, when updating the NSS part only -%global baserelease 4 +%global baserelease 2 %global nss_release %baserelease -# use %global nspr_release %[%baserelease+n] to handle offsets when +# use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when # release number between nss and nspr are different. %global nspr_release %baserelease # only need to update this as we added new @@ -130,7 +130,6 @@ Patch2: nss-539183.patch # but it doesn't hurt to keep it. Patch4: iquote.patch Patch12: nss-signtool-format.patch -Patch30: nss-fedora-btrf-sql-hack.patch # fedora disabled dbm by default Patch40: nss-no-dbm-man-page.patch @@ -353,7 +352,7 @@ popd # Build NSS # # This package fails its testsuite with LTO. Disable LTO for now -%global _lto_cflags %{nil} +#%global _lto_cflags %{nil} #export FREEBL_NO_DEPEND=1 @@ -1060,6 +1059,13 @@ update-crypto-policies &> /dev/null || : %changelog +* Tue Aug 10 2021 Bob Relyea - 3.69.0-2 +- turn on lto + +* Tue Aug 10 2021 Bob Relyea - 3.69.0-1 +- Update to 3.69 +- Update to NSPR 4.31 + * Tue Jul 27 2021 Bob Relyea - 3.67.0-4 - switch to baserelease so rpmdev-bumpspec will work next time diff --git a/sources b/sources index 1dae6c2..db9e33d 100644 --- a/sources +++ b/sources @@ -3,5 +3,5 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403 SHA512 (blank-key3.db) = 01f7314e9fc8a7c9aa997652624cfcde213d18a6b3bb31840c1a60bbd662e56b5bc3221d13874abb42ce78163b225a6dfce2e1326cf6dd29366ad9c28ba5a71c SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7 SHA512 (blank-secmod.db) = 06a2dbd861839ef6315093459328b500d3832333a34b30e6fac4a2503af337f014a4d319f0f93322409e719142904ce8bc08252ae9a4f37f30d4c3312e900310 -SHA512 (nss-3.67.tar.gz) = 1d3fa3fafbf3e54c9c3b54b0b3c291aebb48542380a1b704fa07359d3cefab93f166b31928c9db190ed58118e289e67ce8aa1619e4219d69b2c098484a22bc9d -SHA512 (nspr-4.31.tar.gz) = 1f37d04721335288dd8a5cf700ead5a56cee73365e619f3da90f6067830b78a050a525950686bcdd14fcf61faffd1141ec46d4180a0dd10375f7e9fef6eac6ed +SHA512 (nss-3.69.tar.gz) = 9dd824b3e96aa5a032d5005cdf60a55efac23f69f3857cd1f4337f3ebad92fc2354bb05ed85f04a368e55306a46ebd17a91f7f432f1c191a96e99aecfa62cfdf +SHA512 (nspr-4.32.tar.gz) = da9b65b374783d20a2e589211b411816d899e296e91175d376e59df1919144c1808c155a234d6ceefdf7b8ae8f47cec98d92a5aa3150a579513251860e50dcb7