From 3f3c20ae17b13966f2bed221db7089ddc7b2c94e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com>
Date: Thu, 29 Aug 2019 15:38:15 +0200
Subject: [PATCH] Update to NSS 3.45

---
 .gitignore            |  1 +
 nss-module-leak.patch | 35 -----------------------------------
 nss.spec              |  9 +++++----
 sources               |  2 +-
 4 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 nss-module-leak.patch

diff --git a/.gitignore b/.gitignore
index 23a0c00..e23f637 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ TestUser51.cert
 /nss-3.43.tar.gz
 /nss-3.44.tar.gz
 /nss-3.44.1.tar.gz
+/nss-3.45.tar.gz
diff --git a/nss-module-leak.patch b/nss-module-leak.patch
deleted file mode 100644
index 7acf3f3..0000000
--- a/nss-module-leak.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# HG changeset patch
-# User Daiki Ueno <dueno@redhat.com>
-# Date 1557150127 -7200
-#      Mon May 06 15:42:07 2019 +0200
-# Node ID 438ac983bda9ec7944990d22a37877e9111caa90
-# Parent  b018f3e84d87cce99a1fd81feeecb31123058687
-pk11slot: reference module from slot for finalization
-
-diff --git a/lib/pk11wrap/pk11slot.c b/lib/pk11wrap/pk11slot.c
---- a/lib/pk11wrap/pk11slot.c
-+++ b/lib/pk11wrap/pk11slot.c
-@@ -1439,6 +1439,11 @@ PK11_InitSlot(SECMODModule *mod, CK_SLOT
-     slot->slotID = slotID;
-     slot->isThreadSafe = mod->isThreadSafe;
-     slot->hasRSAInfo = PR_FALSE;
-+    slot->module = mod; /* NOTE: we don't make a reference here because
-+                         * modules have references to their slots. This
-+                         * works because modules keep implicit references
-+                         * from their slots, and won't unload and disappear
-+                         * until all their slots have been freed */
- 
-     if (PK11_GETTAB(slot)->C_GetSlotInfo(slotID, &slotInfo) != CKR_OK) {
-         slot->disabled = PR_TRUE;
-@@ -1448,11 +1453,6 @@ PK11_InitSlot(SECMODModule *mod, CK_SLOT
- 
-     /* test to make sure claimed mechanism work */
-     slot->needTest = mod->internal ? PR_FALSE : PR_TRUE;
--    slot->module = mod; /* NOTE: we don't make a reference here because
--                         * modules have references to their slots. This
--                         * works because modules keep implicit references
--                         * from their slots, and won't unload and disappear
--                         * until all their slots have been freed */
-     (void)PK11_MakeString(NULL, slot->slot_name,
-                           (char *)slotInfo.slotDescription, sizeof(slotInfo.slotDescription));
-     slot->isHW = (PRBool)((slotInfo.flags & CKF_HW_SLOT) == CKF_HW_SLOT);
diff --git a/nss.spec b/nss.spec
index aab54ef..9cab347 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
 %global nspr_version 4.21.0
-%global nss_version 3.44.1
+%global nss_version 3.45.0
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 %global dracutlibdir %{_prefix}/lib/dracut
@@ -43,7 +43,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
 Summary:          Network Security Services
 Name:             nss
 Version:          %{nss_version}
-Release:          2%{?dist}
+Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Requires:         nspr >= %{nspr_version}
@@ -93,8 +93,6 @@ Source28:         nss-p11-kit.config
 
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=617723
 Patch2:           nss-539183.patch
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1549382
-Patch3:           nss-module-leak.patch
 # This patch uses the GCC -iquote option documented at
 # http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
 # to give the in-tree headers a higher priority over the system headers,
@@ -874,6 +872,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Thu Aug 29 2019 Daiki Ueno <dueno@redhat.com> - 3.45.0-1
+- Update to NSS 3.45
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.44.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 53b9c62..d22c62c 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.44.1.tar.gz) = eb8777701a25b54377026633b6bf284e4c62308012058355f348a7c57525afe96db74a07de41ba01754e316a7dff06689de527359a5474ed7ab606779c4cf169
+SHA512 (nss-3.45.tar.gz) = 33360a1bb4e0a0a974070c354ee82c515d5cfa2a12c9c96817a9fdb3e4ca1ad62eb95886b9b0d60e2f69efda964376d0671c1e3c920b2ea614aeecb719c6ff29