diff --git a/.gitignore b/.gitignore index da4e16f..e120cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,12 @@ 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 +/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 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-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 676dc0f..6895082 100644 --- a/nss.spec +++ b/nss.spec @@ -1,13 +1,13 @@ -%global nspr_version 4.35.0 -%global nss_version 3.100.0 +%global nspr_version 4.36.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 -%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. -%global nspr_release %[%baserelease+22] +%global nspr_release %[%baserelease+4] # only need to update this as we added new # algorithms under nss policy control %global crypto_policies_version 20210118 @@ -132,6 +132,12 @@ 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 + +# 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 @@ -979,6 +985,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 @@ -1085,6 +1092,37 @@ update-crypto-policies &> /dev/null || : %changelog +* 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 + +* Mon Sep 16 2024 Frantisek Krenzelok - 3.104.0-1 +- Update NSS to 3.104.0 + +* Mon Aug 5 2024 Frantisek Krenzelok - 3.103.0-1 +- Update NSS to 3.103.0 + +* Tue Jun 11 2024 Bob Relyea - 3.101.0-1 +- Update NSS to 3.101.0 + * Tue May 28 2024 Frantisek Krenzelok - 3.100.0-1 - Update NSS to 3.100.0 diff --git a/sources b/sources index d01a8dd..ceb0189 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.110-with-nspr-4.36.tar.gz) = 2d0d0d844be0ea072e120a6badf40fb06c0bc6cba3c54d20441f1b6e23f79bbc3dd56de027ca157991d96379e76d2e43363138fc2c8da6b58b753159a55ebea5