From 5efb8c175690e0f9e342c1e70f034214eeb1cbf6 Mon Sep 17 00:00:00 2001
From: Robert Relyea <rrelyea@redhat.com>
Date: Tue, 11 Jun 2024 09:16:16 -0700
Subject: [PATCH 01/11] Update to NSS 3.101

---
 .gitignore | 1 +
 nss.spec   | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index da4e16f..896fc68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@ TestUser51.cert
 /nss-3.98-with-nspr-4.35.tar.gz
 /nss-3.99-with-nspr-4.35.tar.gz
 /nss-3.100-with-nspr-4.35.tar.gz
+/nss-3.101-with-nspr-4.35.tar.gz
diff --git a/nss.spec b/nss.spec
index 676dc0f..07c0e6b 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
 %global nspr_version 4.35.0
-%global nss_version 3.100.0
+%global nss_version 3.101.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
@@ -7,7 +7,7 @@
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
-%global nspr_release %[%baserelease+22]
+%global nspr_release %[%baserelease+23]
 # only need to update this as we added new
 # algorithms under nss policy control
 %global crypto_policies_version 20210118
@@ -1085,6 +1085,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Tue Jun 11 2024 Bob Relyea <rrelyea@redhat.com> - 3.101.0-1
+- Update NSS to 3.101.0
+
 * Tue May 28 2024 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.100.0-1
 - Update NSS to 3.100.0
 
diff --git a/sources b/sources
index d01a8dd..82834cf 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
-SHA512 (nss-3.100-with-nspr-4.35.tar.gz) = 02ca7ed086905ce80ea1a41fa1818a0625982a8b24ba418c56c3fb8744ae39a7bfead5a05c4054c7d3c8897a4e715d4c125257047e278787b5e1701ec9f87122
+SHA512 (nss-3.101-with-nspr-4.35.tar.gz) = 95c8ef1c12e1de7da4d918cebd1d5464b0ff4932083f6d395733345bd9f8598069028793fd1c08f974efcb31129cd84718487fd5326e45a878fba0d8c309bd39

From 5f29463491960f0d2783de0d48132cdeac8b5b5f Mon Sep 17 00:00:00 2001
From: Robert Relyea <rrelyea@redhat.com>
Date: Tue, 11 Jun 2024 13:50:01 -0700
Subject: [PATCH 02/11] Add nsshash.h to the manifest

---
 nss.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nss.spec b/nss.spec
index 07c0e6b..2e4f283 100644
--- a/nss.spec
+++ b/nss.spec
@@ -979,6 +979,7 @@ update-crypto-policies &> /dev/null || :
 %{_includedir}/nss3/nssb64.h
 %{_includedir}/nss3/nssb64t.h
 %{_includedir}/nss3/nsslocks.h
+%{_includedir}/nss3/nsshash.h
 %{_includedir}/nss3/nssilock.h
 %{_includedir}/nss3/nssilckt.h
 %{_includedir}/nss3/nssrwlk.h

From 5cebeab315cb928bc7b3fc8b92cc13d94b8fa5a8 Mon Sep 17 00:00:00 2001
From: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>
Date: Mon, 5 Aug 2024 15:16:13 +0200
Subject: [PATCH 03/11] Update NSS to 3.103.0

---
 .gitignore                         |  1 +
 nss-3.103-unused-cipherwrap2.patch | 17 +++++++++++++++++
 nss.spec                           | 10 ++++++++--
 sources                            |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 nss-3.103-unused-cipherwrap2.patch

diff --git a/.gitignore b/.gitignore
index 896fc68..97bcca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,4 @@ TestUser51.cert
 /nss-3.99-with-nspr-4.35.tar.gz
 /nss-3.100-with-nspr-4.35.tar.gz
 /nss-3.101-with-nspr-4.35.tar.gz
+/nss-3.103-with-nspr-4.35.tar.gz
diff --git a/nss-3.103-unused-cipherwrap2.patch b/nss-3.103-unused-cipherwrap2.patch
new file mode 100644
index 0000000..2c77239
--- /dev/null
+++ b/nss-3.103-unused-cipherwrap2.patch
@@ -0,0 +1,17 @@
+--- ./lib/softoken/pkcs11c.c.unused	2024-08-05 17:56:10.705414972 +0200
++++ ./lib/softoken/pkcs11c.c	2024-08-05 18:09:04.681015706 +0200
+@@ -165,10 +165,14 @@ SFTKCipherWrap(AESKeyWrapContext, AESKey
+         mmm##_DestroyContext(ctx, freeit);                                   \
+     }
+ 
++#ifndef NSS_DISABLE_DEPRECATED_RC2
+ SFTKCipherWrap2(RC2Context, RC2);
++#endif
+ SFTKCipherWrap2(RC4Context, RC4);
+ SFTKCipherWrap2(DESContext, DES);
++#ifndef NSS_DISABLE_DEPRECATED_SEED
+ SFTKCipherWrap2(SEEDContext, SEED);
++#endif
+ SFTKCipherWrap2(CamelliaContext, Camellia);
+ SFTKCipherWrap2(AESContext, AES);
+ SFTKCipherWrap2(AESKeyWrapContext, AESKeyWrap);
diff --git a/nss.spec b/nss.spec
index 2e4f283..4f10a65 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
 %global nspr_version 4.35.0
-%global nss_version 3.101.0
+%global nss_version 3.103.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
@@ -7,7 +7,7 @@
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
-%global nspr_release %[%baserelease+23]
+%global nspr_release %[%baserelease+27]
 # only need to update this as we added new
 # algorithms under nss policy control
 %global crypto_policies_version 20210118
@@ -132,6 +132,9 @@ Patch12:          nss-signtool-format.patch
 # fedora disabled dbm by default
 Patch40:          nss-no-dbm-man-page.patch
 
+# fix unused variable warnings
+Patch42:          nss-3.103-unused-cipherwrap2.patch
+
 Patch100:         nspr-config-pc.patch
 Patch101:         nspr-gcc-atomics.patch
 
@@ -1086,6 +1089,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Mon Aug 5 2024 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.103.0-1
+- Update NSS to 3.103.0
+
 * Tue Jun 11 2024 Bob Relyea <rrelyea@redhat.com> - 3.101.0-1
 - Update NSS to 3.101.0
 
diff --git a/sources b/sources
index 82834cf..c22c3f6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
-SHA512 (nss-3.101-with-nspr-4.35.tar.gz) = 95c8ef1c12e1de7da4d918cebd1d5464b0ff4932083f6d395733345bd9f8598069028793fd1c08f974efcb31129cd84718487fd5326e45a878fba0d8c309bd39
+SHA512 (nss-3.103-with-nspr-4.35.tar.gz) = 46d0c948da890bd57da0e8026ec5bd1c6de2d34f66836690fa11ffbb256c933e977a1ac1d0599ceaf1b416eafe6f6733609ff1efa51a744b431b9570afe092ff

From 0714108805b6acd44c68aaf9cf368b41fa6158ed Mon Sep 17 00:00:00 2001
From: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>
Date: Wed, 4 Sep 2024 14:49:26 +0200
Subject: [PATCH 04/11] Update NSS to 3.104.0

---
 .gitignore | 1 +
 nss.spec   | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 97bcca8..9d2e000 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,4 @@ TestUser51.cert
 /nss-3.100-with-nspr-4.35.tar.gz
 /nss-3.101-with-nspr-4.35.tar.gz
 /nss-3.103-with-nspr-4.35.tar.gz
+/nss-3.104-with-nspr-4.35.tar.gz
diff --git a/nss.spec b/nss.spec
index 4f10a65..6037661 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
 %global nspr_version 4.35.0
-%global nss_version 3.103.0
+%global nss_version 3.104.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
@@ -7,7 +7,7 @@
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
-%global nspr_release %[%baserelease+27]
+%global nspr_release %[%baserelease+28]
 # only need to update this as we added new
 # algorithms under nss policy control
 %global crypto_policies_version 20210118
@@ -1089,6 +1089,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Mon Sep 16 2024 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.104.0-1
+- Update NSS to 3.104.0
+
 * Mon Aug 5 2024 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.103.0-1
 - Update NSS to 3.103.0
 
diff --git a/sources b/sources
index c22c3f6..81e8a30 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
-SHA512 (nss-3.103-with-nspr-4.35.tar.gz) = 46d0c948da890bd57da0e8026ec5bd1c6de2d34f66836690fa11ffbb256c933e977a1ac1d0599ceaf1b416eafe6f6733609ff1efa51a744b431b9570afe092ff
+SHA512 (nss-3.104-with-nspr-4.35.tar.gz) = 15b3b3f7d29642d86e6930dbe07cc430dbe2c41a0a7bf22167ba37187157a7196d4a198ca788f74f38a60f67e410443e2509218dce6112c468e561fd265c780a

From d004c23efcae5af3cf7fea03e60137536d5b16bc Mon Sep 17 00:00:00 2001
From: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>
Date: Thu, 3 Oct 2024 14:28:23 +0200
Subject: [PATCH 05/11] Update NSS to 3.105.0

---
 .gitignore | 1 +
 nss.spec   | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9d2e000..23bbd8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,4 @@ TestUser51.cert
 /nss-3.101-with-nspr-4.35.tar.gz
 /nss-3.103-with-nspr-4.35.tar.gz
 /nss-3.104-with-nspr-4.35.tar.gz
+/nss-3.105-with-nspr-4.35.tar.gz
diff --git a/nss.spec b/nss.spec
index 6037661..e58d6e2 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
 %global nspr_version 4.35.0
-%global nss_version 3.104.0
+%global nss_version 3.105.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
@@ -7,7 +7,7 @@
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
-%global nspr_release %[%baserelease+28]
+%global nspr_release %[%baserelease+29]
 # only need to update this as we added new
 # algorithms under nss policy control
 %global crypto_policies_version 20210118
@@ -1089,6 +1089,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Thu Oct 3 2024 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.105.0-1
+- Update NSS to 3.105.0
+
 * Mon Sep 16 2024 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.104.0-1
 - Update NSS to 3.104.0
 
diff --git a/sources b/sources
index 81e8a30..4431210 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
-SHA512 (nss-3.104-with-nspr-4.35.tar.gz) = 15b3b3f7d29642d86e6930dbe07cc430dbe2c41a0a7bf22167ba37187157a7196d4a198ca788f74f38a60f67e410443e2509218dce6112c468e561fd265c780a
+SHA512 (nss-3.105-with-nspr-4.35.tar.gz) = 8fad30acf07bddb501811fac63330816a1b0aaee301d94a4798f08e81be243afe894bd2202996339a7716a60639c0d6c4d20cc2dd407c757a6d3074c5c975673

From 50210274e6a5709030d32a8e0a4885d5e6955d2f Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Wed, 20 Nov 2024 09:01:09 +1100
Subject: [PATCH 06/11] Update to 3.106.0

---
 .gitignore              |  1 +
 nss-3.106.0-tests.patch | 28 ++++++++++++++++++++++++++++
 nss.spec                | 10 +++++++---
 sources                 |  2 +-
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 nss-3.106.0-tests.patch

diff --git a/.gitignore b/.gitignore
index 23bbd8b..4db04a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,3 +96,4 @@ TestUser51.cert
 /nss-3.103-with-nspr-4.35.tar.gz
 /nss-3.104-with-nspr-4.35.tar.gz
 /nss-3.105-with-nspr-4.35.tar.gz
+/nss-3.106-with-nspr-4.36.tar.gz
diff --git a/nss-3.106.0-tests.patch b/nss-3.106.0-tests.patch
new file mode 100644
index 0000000..cb05304
--- /dev/null
+++ b/nss-3.106.0-tests.patch
@@ -0,0 +1,28 @@
+--- nss/tests/tools/tools.sh.org	2024-11-20 06:49:20.119509555 +1100
++++ nss/tests/tools/tools.sh	2024-11-20 06:51:00.246427318 +1100
+@@ -544,21 +544,22 @@ tools_p12_import_pbmac1_samples()
+   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
+   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
+   ret=$?
+-  html_msg $ret 19 "Fail to list private key with bad iterator"
++  echo "Fail to list private key with bad iterator val=$ret"
++  html_msg $ret 17 "Fail to list private key with bad iterator"
+   check_tmpfile
+ 
+   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
+   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
+   ret=$?
+   echo "Fail to list private key with bad salt val=$ret"
+-  html_msg $ret 19 "Fail to import private key with bad salt"
++  html_msg $ret 17 "Fail to import private key with bad salt"
+   check_tmpfile
+ 
+   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
+   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
+   ret=$?
+   echo "Fail to import private key with no length val=$ret"
+-  html_msg $ret 19 "Fail to import private key with no length"
++  html_msg $ret 17 "Fail to import private key with no length"
+   check_tmpfile
+ }
+ 
diff --git a/nss.spec b/nss.spec
index e58d6e2..46e6086 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
-%global nspr_version 4.35.0
-%global nss_version 3.105.0
+%global nspr_version 4.36.0
+%global nss_version 3.106.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
@@ -7,7 +7,7 @@
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
-%global nspr_release %[%baserelease+29]
+%global nspr_release %[%baserelease+0]
 # only need to update this as we added new
 # algorithms under nss policy control
 %global crypto_policies_version 20210118
@@ -134,6 +134,7 @@ Patch40:          nss-no-dbm-man-page.patch
 
 # fix unused variable warnings
 Patch42:          nss-3.103-unused-cipherwrap2.patch
+Patch43:          nss-3.106.0-tests.patch
 
 Patch100:         nspr-config-pc.patch
 Patch101:         nspr-gcc-atomics.patch
@@ -1089,6 +1090,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Tue Nov 19 2024 Bojan Smojver <bojan@rexursive.com> - 3.106.0-1
+- Update NSS to 3.106.0
+
 * Thu Oct 3 2024 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.105.0-1
 - Update NSS to 3.105.0
 
diff --git a/sources b/sources
index 4431210..96ace72 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
-SHA512 (nss-3.105-with-nspr-4.35.tar.gz) = 8fad30acf07bddb501811fac63330816a1b0aaee301d94a4798f08e81be243afe894bd2202996339a7716a60639c0d6c4d20cc2dd407c757a6d3074c5c975673
+SHA512 (nss-3.106-with-nspr-4.36.tar.gz) = c33f96e534f170bb085e1650964e25d9abd3213001e71dbdaaaf3a4b5893736e5201dd753efefa17e2d606e2cef41ca3c006afc1abb5a2ee7ef9f83e73b2403d

From ad960e81ab0a728995d44e3eb86ed3849779b7ab Mon Sep 17 00:00:00 2001
From: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>
Date: Mon, 9 Dec 2024 12:30:49 +0100
Subject: [PATCH 07/11] Update NSS to 3.107.0

---
 .gitignore              |  1 +
 nss-3.106.0-tests.patch | 28 ----------------------------
 nss.spec                |  8 +++++---
 sources                 |  2 +-
 4 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 nss-3.106.0-tests.patch

diff --git a/.gitignore b/.gitignore
index 4db04a8..eb7df0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,3 +97,4 @@ TestUser51.cert
 /nss-3.104-with-nspr-4.35.tar.gz
 /nss-3.105-with-nspr-4.35.tar.gz
 /nss-3.106-with-nspr-4.36.tar.gz
+/nss-3.107-with-nspr-4.36.tar.gz
diff --git a/nss-3.106.0-tests.patch b/nss-3.106.0-tests.patch
deleted file mode 100644
index cb05304..0000000
--- a/nss-3.106.0-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- nss/tests/tools/tools.sh.org	2024-11-20 06:49:20.119509555 +1100
-+++ nss/tests/tools/tools.sh	2024-11-20 06:51:00.246427318 +1100
-@@ -544,21 +544,22 @@ tools_p12_import_pbmac1_samples()
-   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-   ret=$?
--  html_msg $ret 19 "Fail to list private key with bad iterator"
-+  echo "Fail to list private key with bad iterator val=$ret"
-+  html_msg $ret 17 "Fail to list private key with bad iterator"
-   check_tmpfile
- 
-   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-   ret=$?
-   echo "Fail to list private key with bad salt val=$ret"
--  html_msg $ret 19 "Fail to import private key with bad salt"
-+  html_msg $ret 17 "Fail to import private key with bad salt"
-   check_tmpfile
- 
-   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-   ret=$?
-   echo "Fail to import private key with no length val=$ret"
--  html_msg $ret 19 "Fail to import private key with no length"
-+  html_msg $ret 17 "Fail to import private key with no length"
-   check_tmpfile
- }
- 
diff --git a/nss.spec b/nss.spec
index 46e6086..1e6b571 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
 %global nspr_version 4.36.0
-%global nss_version 3.106.0
+%global nss_version 3.107.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
@@ -7,7 +7,7 @@
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
-%global nspr_release %[%baserelease+0]
+%global nspr_release %[%baserelease+1]
 # only need to update this as we added new
 # algorithms under nss policy control
 %global crypto_policies_version 20210118
@@ -134,7 +134,6 @@ Patch40:          nss-no-dbm-man-page.patch
 
 # fix unused variable warnings
 Patch42:          nss-3.103-unused-cipherwrap2.patch
-Patch43:          nss-3.106.0-tests.patch
 
 Patch100:         nspr-config-pc.patch
 Patch101:         nspr-gcc-atomics.patch
@@ -1090,6 +1089,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Mon Dec 9 2024 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.107.0-1
+- Update NSS to 3.107.0
+
 * Tue Nov 19 2024 Bojan Smojver <bojan@rexursive.com> - 3.106.0-1
 - Update NSS to 3.106.0
 
diff --git a/sources b/sources
index 96ace72..e18730d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
-SHA512 (nss-3.106-with-nspr-4.36.tar.gz) = c33f96e534f170bb085e1650964e25d9abd3213001e71dbdaaaf3a4b5893736e5201dd753efefa17e2d606e2cef41ca3c006afc1abb5a2ee7ef9f83e73b2403d
+SHA512 (nss-3.107-with-nspr-4.36.tar.gz) = 0d0b34f698cd87058acb3c224298cae1b92f2f0e769c5e37abef7233f04327fead03a63f9bf3be21cf9c736ca9a485d0c2c75ca3ad76bd4610791f1c3c536805

From 9a944235bff5ff7a756a50229ede6eda17c37f84 Mon Sep 17 00:00:00 2001
From: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>
Date: Thu, 6 Feb 2025 14:16:07 +0100
Subject: [PATCH 08/11] Update NSS to 3.108.0

---
 .gitignore | 1 +
 nss.spec   | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index eb7df0b..aea47cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,4 @@ TestUser51.cert
 /nss-3.105-with-nspr-4.35.tar.gz
 /nss-3.106-with-nspr-4.36.tar.gz
 /nss-3.107-with-nspr-4.36.tar.gz
+/nss-3.108-with-nspr-4.36.tar.gz
diff --git a/nss.spec b/nss.spec
index 1e6b571..766f4f7 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
 %global nspr_version 4.36.0
-%global nss_version 3.107.0
+%global nss_version 3.108.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
@@ -7,7 +7,7 @@
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
-%global nspr_release %[%baserelease+1]
+%global nspr_release %[%baserelease+2]
 # only need to update this as we added new
 # algorithms under nss policy control
 %global crypto_policies_version 20210118
@@ -1089,6 +1089,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Thu Feb 6 2025 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.108.0-1
+- Update NSS to 3.108.0
+
 * Mon Dec 9 2024 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.107.0-1
 - Update NSS to 3.107.0
 
diff --git a/sources b/sources
index e18730d..f7cbdd3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
-SHA512 (nss-3.107-with-nspr-4.36.tar.gz) = 0d0b34f698cd87058acb3c224298cae1b92f2f0e769c5e37abef7233f04327fead03a63f9bf3be21cf9c736ca9a485d0c2c75ca3ad76bd4610791f1c3c536805
+SHA512 (nss-3.108-with-nspr-4.36.tar.gz) = 08800eb218f0b2a340d490061bfffd5b9e1d650b2df2f2289492d55931b547cb60e2b75c7209cfcaea3199afa076da422b1225775b440e338f905a90896d213e

From 86119b98521106d9a7a814ff6355729c15dc12a2 Mon Sep 17 00:00:00 2001
From: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>
Date: Mon, 3 Mar 2025 14:59:46 +0100
Subject: [PATCH 09/11] Update NSS to 3.109.0

---
 .gitignore | 1 +
 nss.spec   | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index aea47cc..6bc35c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,4 @@ TestUser51.cert
 /nss-3.106-with-nspr-4.36.tar.gz
 /nss-3.107-with-nspr-4.36.tar.gz
 /nss-3.108-with-nspr-4.36.tar.gz
+/nss-3.109-with-nspr-4.36.tar.gz
diff --git a/nss.spec b/nss.spec
index 766f4f7..e695412 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
 %global nspr_version 4.36.0
-%global nss_version 3.108.0
+%global nss_version 3.109.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
@@ -7,7 +7,7 @@
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
-%global nspr_release %[%baserelease+2]
+%global nspr_release %[%baserelease+3]
 # only need to update this as we added new
 # algorithms under nss policy control
 %global crypto_policies_version 20210118
@@ -1089,6 +1089,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Mon Mar 3 2025 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.109.0-1
+- Update NSS to 3.109.0
+
 * Thu Feb 6 2025 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.108.0-1
 - Update NSS to 3.108.0
 
diff --git a/sources b/sources
index f7cbdd3..31b466d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
-SHA512 (nss-3.108-with-nspr-4.36.tar.gz) = 08800eb218f0b2a340d490061bfffd5b9e1d650b2df2f2289492d55931b547cb60e2b75c7209cfcaea3199afa076da422b1225775b440e338f905a90896d213e
+SHA512 (nss-3.109-with-nspr-4.36.tar.gz) = 8d0dbddadf4d2184214fe4cc3be815b65e340f93fbe1e2b6d73aed23b87e65cfd5e7a0c7544d5381e933c236f561b21c432b3fb5139fabe15262f623f8853895

From ef152a5a3b5490d82025d3f98bd8118e941fde3d Mon Sep 17 00:00:00 2001
From: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>
Date: Mon, 31 Mar 2025 16:08:23 +0200
Subject: [PATCH 10/11] Update NSS to 3.110.0

---
 .gitignore | 1 +
 nss.spec   | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6bc35c1..e120cf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,4 @@ TestUser51.cert
 /nss-3.107-with-nspr-4.36.tar.gz
 /nss-3.108-with-nspr-4.36.tar.gz
 /nss-3.109-with-nspr-4.36.tar.gz
+/nss-3.110-with-nspr-4.36.tar.gz
diff --git a/nss.spec b/nss.spec
index e695412..e7d77b7 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,5 +1,5 @@
 %global nspr_version 4.36.0
-%global nss_version 3.109.0
+%global nss_version 3.110.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
@@ -7,7 +7,7 @@
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
-%global nspr_release %[%baserelease+3]
+%global nspr_release %[%baserelease+4]
 # only need to update this as we added new
 # algorithms under nss policy control
 %global crypto_policies_version 20210118
@@ -1089,6 +1089,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Mon Mar 31 2025 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.110.0-1
+- Update NSS to 3.110.0
+
 * Mon Mar 3 2025 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.109.0-1
 - Update NSS to 3.109.0
 
diff --git a/sources b/sources
index 31b466d..ceb0189 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06
 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
-SHA512 (nss-3.109-with-nspr-4.36.tar.gz) = 8d0dbddadf4d2184214fe4cc3be815b65e340f93fbe1e2b6d73aed23b87e65cfd5e7a0c7544d5381e933c236f561b21c432b3fb5139fabe15262f623f8853895
+SHA512 (nss-3.110-with-nspr-4.36.tar.gz) = 2d0d0d844be0ea072e120a6badf40fb06c0bc6cba3c54d20441f1b6e23f79bbc3dd56de027ca157991d96379e76d2e43363138fc2c8da6b58b753159a55ebea5

From 3952f88d76f11c7500b809f28e2e88da74ba1810 Mon Sep 17 00:00:00 2001
From: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>
Date: Tue, 22 Apr 2025 15:48:30 +0200
Subject: [PATCH 11/11] Dissable test ssl_policy_pkix_oscp due to dns issues

Related: https://issues.redhat.com/browse/FC-1613
---
 nss-3.110-dissable_test-ssl_policy_pkix_oscp.patch | 12 ++++++++++++
 nss.spec                                           |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 nss-3.110-dissable_test-ssl_policy_pkix_oscp.patch

diff --git a/nss-3.110-dissable_test-ssl_policy_pkix_oscp.patch b/nss-3.110-dissable_test-ssl_policy_pkix_oscp.patch
new file mode 100644
index 0000000..a14d0d3
--- /dev/null
+++ b/nss-3.110-dissable_test-ssl_policy_pkix_oscp.patch
@@ -0,0 +1,12 @@
+diff -up nss/tests/ssl/ssl.sh.ignore_test nss/tests/ssl/ssl.sh
+--- nss/tests/ssl/ssl.sh.ignore_test	2025-04-22 10:30:10.569990667 +0200
++++ nss/tests/ssl/ssl.sh	2025-04-22 10:30:34.773327320 +0200
+@@ -1600,7 +1600,7 @@ ssl_run_tests()
+             if using_sql ; then
+                 ssl_policy_listsuites
+                 ssl_policy_selfserv
+-                ssl_policy_pkix_ocsp
++#               ssl_policy_pkix_ocsp
+                 ssl_policy
+             fi
+             ;;
diff --git a/nss.spec b/nss.spec
index e7d77b7..6895082 100644
--- a/nss.spec
+++ b/nss.spec
@@ -3,7 +3,7 @@
 # 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 1
+%global baserelease 2
 %global nss_release %baserelease
 # use "%%global nspr_release %%[%%baserelease+n]" to handle offsets when
 # release number between nss and nspr are different.
@@ -135,6 +135,9 @@ Patch40:          nss-no-dbm-man-page.patch
 # fix unused variable warnings
 Patch42:          nss-3.103-unused-cipherwrap2.patch
 
+# https://issues.redhat.com/browse/FC-1613
+Patch50:          nss-3.110-dissable_test-ssl_policy_pkix_oscp.patch
+
 Patch100:         nspr-config-pc.patch
 Patch101:         nspr-gcc-atomics.patch
 
@@ -1089,6 +1092,10 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Tue Apr 22 2025 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.110.0-2
+- Dissable test ssl_policy_pkix_oscp due to dns resolution issues on the host
+- Related: FC-1613
+
 * Mon Mar 31 2025 Frantisek Krenzelok <krenzelok.frantisek@gmail.com> - 3.110.0-1
 - Update NSS to 3.110.0