From 62605b96c662b60cb8bc52c00b97d3465fb61e5d7d2ccf329550eed7668eaef8 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Fri, 18 Oct 2019 20:55:17 +0000
Subject: [PATCH] - update to NSS 3.46.1   * required by Firefox 70.0   Notable
 changes in 3.46   * The following CA certificates were Removed:     expired
 Class 2 Primary root certificate     expired UTN-USERFirst-Client root
 certificate     expired Deutsche Telekom Root CA 2 root certificate    
 Swisscom Root CA 2 root certificate   * Significant improvements to AES-GCM
 performance on ARM   Many bugfixes   Bug fixes in 3.46.1   * Soft token MAC
 verification not constant time (bmo#1582343)   * Remove arbitrary HKDF output
 limit by allocating space as needed     (bmo#1577953) - requires NSPR 4.22

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=293
---
 baselibs.conf       |  2 +-
 mozilla-nss.changes | 19 +++++++++++++++++++
 mozilla-nss.spec    |  8 ++++----
 nss-3.45.tar.gz     |  3 ---
 nss-3.46.1.tar.gz   |  3 +++
 5 files changed, 27 insertions(+), 8 deletions(-)
 delete mode 100644 nss-3.45.tar.gz
 create mode 100644 nss-3.46.1.tar.gz

diff --git a/baselibs.conf b/baselibs.conf
index 63dcb8f..a5fabbd 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,5 +1,5 @@
 mozilla-nss
-  requires "mozilla-nspr-<targettype> >= 4.21"
+  requires "mozilla-nspr-<targettype> >= 4.22"
   requires "libfreebl3-<targettype>"
   requires "libsoftokn3-<targettype>"
   requires "mozilla-nss-certs-<targettype>"
diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index e184348..b369c25 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Oct 18 20:07:18 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- update to NSS 3.46.1
+  * required by Firefox 70.0
+  Notable changes in 3.46
+  * The following CA certificates were Removed:
+    expired Class 2 Primary root certificate
+    expired UTN-USERFirst-Client root certificate
+    expired Deutsche Telekom Root CA 2 root certificate
+    Swisscom Root CA 2 root certificate
+  * Significant improvements to AES-GCM performance on ARM
+  Many bugfixes
+  Bug fixes in 3.46.1
+  * Soft token MAC verification not constant time (bmo#1582343)
+  * Remove arbitrary HKDF output limit by allocating space as needed
+    (bmo#1577953)
+- requires NSPR 4.22
+
 -------------------------------------------------------------------
 Thu Aug 29 01:14:49 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index 41848f6..4159955 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -17,14 +17,14 @@
 #
 
 
-%global nss_softokn_fips_version 3.45
-%define NSPR_min_version 4.21
+%global nss_softokn_fips_version 3.46
+%define NSPR_min_version 4.22
 %define nspr_ver %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr)
 %define nssdbdir %{_sysconfdir}/pki/nssdb
 Name:           mozilla-nss
-Version:        3.45
+Version:        3.46.1
 Release:        0
-%define underscore_version 3_45
+%define underscore_version 3_46_1
 Summary:        Network Security Services
 License:        MPL-2.0
 Group:          System/Libraries
diff --git a/nss-3.45.tar.gz b/nss-3.45.tar.gz
deleted file mode 100644
index dd9bf1c..0000000
--- a/nss-3.45.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:112f05223d1fde902c170966bfc6f011b24a838be16969b110ecf2bb7bc24e8b
-size 76017462
diff --git a/nss-3.46.1.tar.gz b/nss-3.46.1.tar.gz
new file mode 100644
index 0000000..5d96914
--- /dev/null
+++ b/nss-3.46.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bf7e0ed7db98803f134c527c436cc68415ff17257d34bd75de14e9a09d13651
+size 76417797