From 5de44ac988c63e5457908f1a0b728f01f1135e091e1387dc8e6fe9cfcf2b0e21 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Wed, 24 Feb 2021 08:07:17 +0000
Subject: [PATCH] - Mozilla Thunderbird 78.8.0   * various bugfixes   MFSA
 2021-09 (bsc#1182614)   * CVE-2021-23969 (bmo#1542194)     Content Security
 Policy violation report could have contained     the destination of a
 redirect   * CVE-2021-23968 (bmo#1687342)     Content Security Policy
 violation report could have contained     the destination of a redirect   *
 CVE-2021-23973 (bmo#1690976)     MediaError message property could have
 leaked information     about cross-origin resources   * CVE-2021-23978
 (bmo#786797, bmo#1682928, bmo#1687391,     bmo#1687597)     Memory safety
 bugs fixed in Firefox 86 and Firefox ESR 78.8

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=352
---
 mozilla-nss.changes | 13 +++++++++++++
 mozilla-nss.spec    |  8 +++++---
 nss-3.60.1.tar.gz   |  3 ---
 nss-3.61.tar.gz     |  3 +++
 4 files changed, 21 insertions(+), 6 deletions(-)
 delete mode 100644 nss-3.60.1.tar.gz
 create mode 100644 nss-3.61.tar.gz

diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index fa9329e..689506b 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Feb 21 14:46:47 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- update to NSS 3.61
+  * required for Firefox 86
+  * bmo#1682071 - Fix issue with IKE Quick mode deriving incorrect key
+                  values under certain conditions.
+  * bmo#1684300 - Fix default PBE iteration count when NSS is compiled
+                  with NSS_DISABLE_DBM.
+  * bmo#1651411 - Improve constant-timeness in RSA operations.
+  * bmo#1677207 - Upgrade Google Test version to latest release.
+  * bmo#1654332 - Add aarch64-make target to nss-try.
+
 -------------------------------------------------------------------
 Sun Jan 24 09:55:03 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index 6a353b2..a12bb6a 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -17,14 +17,14 @@
 #
 
 
-%global nss_softokn_fips_version 3.60
+%global nss_softokn_fips_version 3.61
 %define NSPR_min_version 4.29
 %define nspr_ver %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr)
 %define nssdbdir %{_sysconfdir}/pki/nssdb
 Name:           mozilla-nss
-Version:        3.60.1
+Version:        3.61
 Release:        0
-%define underscore_version 3_60_1
+%define underscore_version 3_61
 Summary:        Network Security Services
 License:        MPL-2.0
 Group:          System/Libraries
@@ -259,6 +259,7 @@ export LIBDIR=%{_libdir}
 %ifarch x86_64 s390x ppc64 ppc64le ia64 aarch64 riscv64
 export USE_64=1
 %endif
+export NSS_DISABLE_GTESTS=1
 export NSS_USE_SYSTEM_SQLITE=1
 #export SQLITE_LIB_NAME=nsssqlite3
 MAKE_FLAGS="BUILD_OPT=1"
@@ -396,6 +397,7 @@ install -m 644 %{SOURCE9} %{buildroot}%{nssdbdir}
 %postun -n libfreebl3 -p /sbin/ldconfig
 %post -n libsoftokn3 -p /sbin/ldconfig
 %postun -n libsoftokn3 -p /sbin/ldconfig
+
 %post sysinit
 /sbin/ldconfig
 # make sure the current config is enabled
diff --git a/nss-3.60.1.tar.gz b/nss-3.60.1.tar.gz
deleted file mode 100644
index 7938e5f..0000000
--- a/nss-3.60.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d
-size 82036869
diff --git a/nss-3.61.tar.gz b/nss-3.61.tar.gz
new file mode 100644
index 0000000..075bf77
--- /dev/null
+++ b/nss-3.61.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370
+size 82034245