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

Add gcc-toolset-%{gts_version}-gcc-c++ to BR

Browse Source
This commit is contained in:
Eduard Abdullin 2026-02-25 13:52:38 +00:00 committed by root
commit 2b9d59d2da
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.firefox.metadata
View File

@ -1,6 +1,6 @@
bc4adac8f38f5103d8f88564a1545063dd8d6402 SOURCES/cbindgen-vendor.tar.xz
e2a34317fc08464b091e1f512a966dd70d2c84d6 SOURCES/firefox-140.7.0esr.processed-source.tar.xz
9f5bb86b2c4dd8c34e8cdc8369bb2a0e2c94ecd6 SOURCES/firefox-langpacks-140.7.0esr-20260107.tar.xz
a9954fd295e44461d98abe6729f92985303115d1 SOURCES/firefox-140.8.0esr.processed-source.tar.xz
bb8098ea3fd6326a81953f7597a4d0a1c0e9c4ae SOURCES/firefox-langpacks-140.8.0esr-20260217.tar.xz
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
0d0ddbd2a73340b3cbc977997f57222946b1e775 SOURCES/nspr-4.36.0-2.el8_2.src.rpm
fd3879b176634d66f8ef64d18fdaeec98e140c23 SOURCES/nss-3.112.0-1.el9_4.src.rpm

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-140.7.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-140.7.0esr-20260107.tar.xz
SOURCES/firefox-140.8.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-140.8.0esr-20260217.tar.xz
SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.36.0-2.el8_2.src.rpm
SOURCES/nss-3.112.0-1.el9_4.src.rpm

18
SOURCES/D278532-fips-keydb.diff Normal file
View File

@ -0,0 +1,18 @@
diff --git a/security/manager/ssl/nsNSSIOLayer.cpp b/security/manager/ssl/nsNSSIOLayer.cpp
--- a/security/manager/ssl/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/nsNSSIOLayer.cpp
@@ -1256,13 +1256,10 @@
// success of this function.
PRFileDesc* sslSock = SSL_ImportFD(nullptr, fd);
if (!sslSock) {
return nullptr;
}
- if (SSL_SetPKCS11PinArg(sslSock, infoObject) != SECSuccess) {
- return nullptr;
- }
if (SSL_HandshakeCallback(sslSock, HandshakeCallback, infoObject) !=
SECSuccess) {
return nullptr;
}
if (SSL_SecretCallback(sslSock, SecretCallback, infoObject) != SECSuccess) {

2
SOURCES/process-official-tarball
View File

@ -27,7 +27,7 @@ rm -vrf ./process-tarball-dir/*/modules/zlib
processed_tarball=${1/source/processed-source}
cd ./process-tarball-dir
tar -cf - ./* | xz -9 -T 0 -f > $processed_tarball
tar -cf - ./* | xz -9 -T 8 -f > $processed_tarball
mv $processed_tarball ..
cd ..

18
SPECS/firefox.spec
View File

@ -191,8 +191,8 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 140.7.0
Release: 1%{?dist}.alma.1
Version: 140.8.0
Release: 2%{?dist}.alma.1
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -222,7 +222,7 @@ ExcludeArch: aarch64 s390 ppc
# Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%%{version}%%{?pre_version}/source/firefox-%%{version}%%{?pre_version}.source.tar.xz
Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{with langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20260107.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20260217.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -325,6 +325,8 @@ Patch201: D224587.1728128070.diff
Patch202: D224588.1728128098.diff
Patch203: wasi.patch
Patch210: D278532-fips-keydb.diff
# ---- Test patches ----
# Generate without context by
# GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-xpcshell
@ -541,7 +543,6 @@ Obsoletes: mozilla <= 37:1.7.13
Provides: webclient
# Bundled libraries
#Provides: bundled(libjxl) it's used only on nightly builds
Provides: bundled(abseil-cpp)
Provides: bundled(angle)
Provides: bundled(aom)
@ -587,7 +588,7 @@ Provides: bundled(libepoxy)
Provides: bundled(libfuzzer)
Provides: bundled(libgbm)
Provides: bundled(libjpeg)
Provides: bundled(libjxl)
Provides: bundled(jxl-rs)
Provides: bundled(libmar)
Provides: bundled(libmkv)
Provides: bundled(libnestegg)
@ -1387,6 +1388,8 @@ export LIBCLANG_RT=`pwd`/wasi-sdk-20/build/compiler-rt/lib/wasi/libclang_rt.buil
%patch -P202 -p1 -b .D224588
%endif
%patch -P210 -p1 -b .D278532-fips-keydb
# ---- Security patches ----
%{__rm} -f .mozconfig
@ -2136,9 +2139,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Fri Jan 16 2026 Eduard Abdullin <eabdullin@almalinux.org> - 140.7.0-1.alma.1
* Wed Feb 25 2026 Eduard Abdullin <eabdullin@almalinux.org> - 140.8.0-2.alma.1
- Add gcc-toolset-%{gts_version}-gcc-c++ to BR
* Tue Feb 17 2026 Jan Horak <jhorak@redhat.com> - 140.8.0-2
- Update to 140.8.0 ESR
* Wed Jan 7 2026 Jan Horak <jhorak@redhat.com> - 140.7.0-1
- Update to 140.7.0 ESR