diff --git a/.gitignore b/.gitignore index 23bbd8b..73bae65 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,15 @@ 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 +/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 +/nss-3.111-with-nspr-4.36.tar.gz +/nss-3.112-with-nspr-4.36.tar.gz +/nss-3.113-with-nspr-4.36.tar.gz +/nss-3.114-with-nspr-4.37.tar.gz +/nss-3.115.1-with-nspr-4.37.tar.gz +/nss-3.116-with-nspr-4.37.tar.gz +/nss-3.117-with-nspr-4.37.tar.gz diff --git a/nss-3.103-unused-cipherwrap2.patch b/nss-3.103-unused-cipherwrap2.patch deleted file mode 100644 index 2c77239..0000000 --- a/nss-3.103-unused-cipherwrap2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./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-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 9c40d1c..b94c247 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.37.0 +%global nss_version 3.117.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+3] # only need to update this as we added new # algorithms under nss policy control %global crypto_policies_version 20240521 @@ -133,8 +133,8 @@ Patch40: nss-no-dbm-man-page.patch # allow crypto policies to enable kyber Patch41: nss-3.101-enable-kyber-policy.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 @@ -1068,6 +1068,7 @@ fi %{_includedir}/nss3/ecl-exp.h %{_includedir}/nss3/nsslowhash.h %{_includedir}/nss3/shsign.h +%{_includedir}/nss3/ml_dsat.h %files -n nspr %{!?_licensedir:%global license %%doc} @@ -1084,6 +1085,49 @@ fi %changelog +* Wed Oct 15 2025 Frantisek Krenzelok - 3.117.0-1 +- Update NSS to 3.117.0 + +* Fri Sep 12 2025 Frantisek Krenzelok - 3.116.0-1 +- Update NSS to 3.116.0 + +* Mon Aug 25 2025 Frantisek Krenzelok - 3.115.1-1 +- Update NSS to 3.115.1 + +* Thu Aug 14 2025 Bojan Smojver - 3.114.0-1 +- Patch for merge test failure (Bob Relyea ) + +* Wed Jul 30 2025 Frantisek Krenzelok - 3.114.0-1 +- Update NSS to 3.114.0 + +* Mon Jun 30 2025 Frantisek Krenzelok - 3.113.0-1 +- Update NSS to 3.113.0 + +* Tue May 27 2025 Frantisek Krenzelok - 3.112.0-1 +- Update NSS to 3.112.0 + +* Mon May 05 2025 Frantisek Krenzelok - 3.111.0-1 +- Update NSS to 3.111.0 + +* Tue Apr 22 2025 Frantisek Krenzelok - 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 - 3.110.0-1 +- Update NSS to 3.110.0 + +* Mon Mar 3 2025 Frantisek Krenzelok - 3.109.0-1 +- Update NSS to 3.109.0 + +* Thu Feb 6 2025 Frantisek Krenzelok - 3.108.0-1 +- Update NSS to 3.108.0 + +* Mon Dec 9 2024 Frantisek Krenzelok - 3.107.0-1 +- Update NSS to 3.107.0 + +* Tue Nov 19 2024 Bojan Smojver - 3.106.0-1 +- Update NSS to 3.106.0 + * Thu Oct 3 2024 Frantisek Krenzelok - 3.105.0-1 - Update NSS to 3.105.0 diff --git a/sources b/sources index 4431210..20a298e 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7 -SHA512 (nss-3.105-with-nspr-4.35.tar.gz) = 8fad30acf07bddb501811fac63330816a1b0aaee301d94a4798f08e81be243afe894bd2202996339a7716a60639c0d6c4d20cc2dd407c757a6d3074c5c975673 +SHA512 (nss-3.116-with-nspr-4.37.tar.gz) = e65708e403ab622291b53244b77b045cbee1c8766b30f8824f577cc2502bb48c8d577a0ca7ad023e291e71fc4d6d2ddda9d9d25d7b2b3a0a4d708762ad5f3f33 +SHA512 (nss-3.117-with-nspr-4.37.tar.gz) = 00c2d0ea33083d82a597ad6a18e355479f368cb9e50632cd0507f913fef08bde433027a9f356a41ba57f8b6f0cbda864d00e50a8dd1639e998d14c933c966950