diff --git a/.gitignore b/.gitignore index b8a6a71..0a966a6 100644 --- a/.gitignore +++ b/.gitignore @@ -105,12 +105,9 @@ TestUser51.cert /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-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 /nss-3.118.1-with-nspr-4.37.tar.gz /nss-3.118-ml-dsa-test-for-sign-verify-pkcs12_files.tar.xz -/nss-3.119-with-nspr-4.38.2.tar.gz -/nss-3.119.1-with-nspr-4.38.2.tar.gz /nss-3_119_1-with-nspr-4.38.2.tar.gz diff --git a/nss-3.118.1-add-const-qual-for-gcc15.patch b/nss-3.118.1-add-const-qual-for-gcc15.patch deleted file mode 100644 index 8f3cae7..0000000 --- a/nss-3.118.1-add-const-qual-for-gcc15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nss/lib/freebl/genload.c.const-qual-fix 2025-11-25 15:52:31.669711787 +0100 -+++ nss/lib/freebl/genload.c 2025-11-25 15:53:03.103908883 +0100 -@@ -85,7 +85,7 @@ loader_LoadLibInReferenceDir(const char* - { - PRLibrary* dlh = NULL; - char* fullName = NULL; -- char* c; -+ const char* c; - PRLibSpec libSpec; - - /* Remove the trailing filename from referencePath and add the new one */ diff --git a/nss.spec b/nss.spec index 2dd874c..574a6bd 100644 --- a/nss.spec +++ b/nss.spec @@ -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+0] # only need to update this as we added new # algorithms under nss policy control %global crypto_policies_version 20240521 @@ -52,6 +52,7 @@ rpm.define(string.format("nss_archive_version %s", string.gsub(rpm.expand("%nss_version"), "(.*)%.0$", "%1"))) } +# Mozilla messed up the versioning for 3.119.1, it seems to be only this version %{lua: if rpm.expand("%{nss_version}") == "3.119.1" then rpm.define(string.format("nss_archive_version %s", @@ -152,7 +153,6 @@ Patch66: nss-3.118-ml-dsa-tls-test.patch Patch67: nss-3.118-ml-dsa-unittests.patch Patch70: nss-3.118.1-fix-test-typo.patch -Patch71: nss-3.118.1-add-const-qual-for-gcc15.patch Patch100: nspr-config-pc.patch Patch101: nspr-gcc-atomics.patch @@ -288,7 +288,6 @@ License: MPL-2.0 URL: http://www.mozilla.org/projects/nspr/ Conflicts: filesystem < 3 BuildRequires: gcc -BuildRequires: binutils >= 2.45.50-9 %description -n nspr NSPR provides platform independence for non-GUI operating system @@ -1109,14 +1108,6 @@ fi %changelog * Mon Jan 5 2026 Frantisek Krenzelok - 3.119.1-1 - Update NSS to 3.119.1 with NSPR 4.38.2 -- Fix previous changelog - -* Fri Dec 5 2025 Frantisek Krenzelok - 3.119.0-1 -- Update NSS to 3.119.0 with NSPR 4.38.2 - -* Tue Nov 25 2025 Frantisek Krenzelok - 3.118.1-3 -- Rebuild for binutils-2.45.50-9.fc44 - https://bugzilla.redhat.com/show_bug.cgi?id=2415065 * Wed Nov 19 2025 Frantisek Krenzelok - 3.118.1-2 - Add the rest of the patches for ML-DSA support (not yet in 3.118.1 upstream). @@ -1133,9 +1124,6 @@ fi * Mon Aug 25 2025 Frantisek Krenzelok - 3.115.1-1 - Update NSS to 3.115.1 -* Fri Aug 15 2025 Frantisek Krenzelok - 3.115.0-1 -- Update NSS to 3.115.0 - * Thu Aug 14 2025 Bojan Smojver - 3.114.0-2 - Patch for merge test failure (Bob Relyea )