diff --git a/.gitignore b/.gitignore index 5cfabf8..23bbd8b 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,15 @@ TestUser51.cert /nss-3.91-with-nspr-4.35.tar.gz /nss-3.92-with-nspr-4.35.tar.gz /nss-3.93-with-nspr-4.35.tar.gz +/nss-3.94-with-nspr-4.35.tar.gz +/nss-3.95-with-nspr-4.35.tar.gz +/nss-3.96-with-nspr-4.35.tar.gz +/nss-3.96.1-with-nspr-4.35.tar.gz +/nss-3.97-with-nspr-4.35.tar.gz +/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 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 ad8f24f..33795bb 100644 --- a/nss.spec +++ b/nss.spec @@ -1,5 +1,5 @@ %global nspr_version 4.35.0 -%global nss_version 3.93.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+11] +%global nspr_release %[%baserelease+23] # only need to update this as we added new # algorithms under nss policy control %global crypto_policies_version 20210118 @@ -132,8 +132,8 @@ Patch12: nss-signtool-format.patch # fedora disabled dbm by default Patch40: nss-no-dbm-man-page.patch -# https://bugzilla.mozilla.org/show_bug.cgi?id=1774659 -Patch51: nss-3.79-dbtool.patch +# fix unused variable warnings +Patch42: nss-3.103-unused-cipherwrap2.patch Patch100: nspr-config-pc.patch Patch101: nspr-gcc-atomics.patch @@ -983,6 +983,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 @@ -1013,6 +1014,7 @@ update-crypto-policies &> /dev/null || : %{_includedir}/nss3/utilpars.h %{_includedir}/nss3/utilparst.h %{_includedir}/nss3/utilrename.h +%{_includedir}/nss3/kyber.h %{_includedir}/nss3/templates/templates.c %files softokn @@ -1088,6 +1090,42 @@ update-crypto-policies &> /dev/null || : %changelog +* 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 + +* Mon Mar 18 2024 Frantisek Krenzelok - 3.99.0-1 +- Update NSS to 3.99.0 + +* Sat Feb 17 2024 Frantisek Krenzelok - 3.98.0-1 +- Update NSS to 3.98.0 + +* Thu Feb 15 2024 Frantisek Krenzelok - 3.97.0-1 +- Update NSS to 3.97.0 + +* Thu Dec 21 2023 Frantisek Krenzelok - 3.96.1-1 +- Update NSS to 3.96.1 + +* Mon Nov 27 2023 Frantisek Krenzelok - 3.95.0-1 +- Update NSS to 3.95.0 + +* Thu Oct 26 2023 Bob Relyea - 3.94.0-2 +- binary compatibility issue with HACL ECC 256 patch. + +* Wed Oct 4 2023 Frantisek Krenzelok - 3.94.0-1 +- Update NSS to 3.94.0 + * Thu Aug 31 2023 Frantisek Krenzelok - 3.93.0-1 - Update NSS to 3.93.0 diff --git a/sources b/sources index d342e47..4431210 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403fda3e3d4e7757838061ae56ccf5aac335cb54f254f0a9e6e9c0dd5920b4155a39264525b06 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7 -SHA512 (nss-3.93-with-nspr-4.35.tar.gz) = efe85e09021ca363df35d092b32463b359b2a23fc6e761949e944ba4209b09bdf007fc69015086a278c999411d62b9dba6fbedfb8a7c962ed40e406de45bc28e +SHA512 (nss-3.105-with-nspr-4.35.tar.gz) = 8fad30acf07bddb501811fac63330816a1b0aaee301d94a4798f08e81be243afe894bd2202996339a7716a60639c0d6c4d20cc2dd407c757a6d3074c5c975673