rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added fix for rebased nss

Browse Source 
- Added firefox-add-mlkem768-secp256r1-support-nss-3.124.patch for
  compatibility with NSS >= 3.124 (adds ssl_grp_kem_secp256r1mlkem768
  and TLS_GRP_KEM_MLKEM768SECP256R1 support)
- Conditionalized patches for RHEL 10.3+: skip system-nss and
  adapt-ml-dsa-support patches, use new mlkem768-secp256r1 patch
  variant instead of the original
- Raised nss_version_max to 3.125 and nspr_version_max to 4.40
  for RHEL >= 10.3

Resolves: RHEL-183287
This commit is contained in:
Jan Horak 2026-06-18 13:49:58 +02:00
parent 0322f27c57
commit 2818987d7b
2 changed files with 148 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
firefox-add-mlkem768-secp256r1-support-nss-3.124.patch Normal file
View File

File diff suppressed because one or more lines are too long

19
firefox.spec
View File

@ -121,6 +121,10 @@ end}
%global nspr_version_max 4.37
%global nss_version 3.112
%global nss_version_max 3.113
%if 0%{?rhel} >= 10 && 0%{?rhel_minor_version} > 2
%global nss_version_max 3.125
%global nspr_version_max 4.40
%endif
%global rust_version 1.84
%global system_libvpx 0
%if 0%{?rhel} >= 9 && %{rhel_minor_version} > 5
@ -196,7 +200,7 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 140.12.0
Release: 1%{?dist}
Release: 2%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -315,6 +319,7 @@ Patch123: firefox-adapt-ml-dsa-support-to-rhel-nss.patch
Patch124: firefox-enable-ml-dsa-in-manager-ssl.patch
# RHEL downstream only - add mlkem768-secp256r1 support
Patch125: firefox-add-mlkem768-secp256r1-support.patch
Patch126: firefox-add-mlkem768-secp256r1-support-nss-3.124.patch
# ---- Fedora specific patches ----
Patch151: firefox-enable-addons.patch
@ -1330,8 +1335,10 @@ echo "--------------------------------------------"
%endif
%if %{?system_nss}
%if 0%{?rhel} >= 10 && 0%{?rhel_minor_version} <= 2
%patch -P14 -p1 -b .system-nss
%endif
%endif
%ifarch s390x
%patch -P15 -p1 -b .s390x_workaround
@ -1377,9 +1384,17 @@ export LIBCLANG_RT=`pwd`/wasi-sdk-20/build/compiler-rt/lib/wasi/libclang_rt.buil
%patch -P120 -p1 -b .integrate-ml-dsa-signature-verification-for-pkix-certificate-chain-validation
%patch -P121 -p1 -b .add-ml-dsa-certificate-support-to-certviewer
%patch -P122 -p1 -b .enable-ml-dsa-signature-verification-for-certificate-chain-validation
%if 0%{?rhel_minor_version} <= 2
%patch -P123 -p1 -b .adapt-ml-dsa-support-to-rhel-nss
%endif
%patch -P124 -p1 -b .enable-ml-dsa-in-manager-ssl
%if 0%{?rhel_minor_version} <= 2
%patch -P125 -p1 -b .add-mlkem768-secp256r1-support
%else
%patch -P126 -p1 -b .add-mlkem768-secp256r1-support-nss-3.124
%endif
%endif
# ---- Fedora specific patches ----
@ -2149,7 +2164,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Wed Jun 10 2026 Jan Horak <jhorak@redhat.com> - 140.12.0-1
* Wed Jun 10 2026 Jan Horak <jhorak@redhat.com> - 140.12.0-2
- Update to 140.12.0 ESR
* Wed May 20 2026 Jan Horak <jhorak@redhat.com> - 140.11.0-1