Update to 128.1 and sync with internal snapshot
This commit is contained in:
Tomas Popela
parent
55da53e3e2
commit
09485d2e54
4
.gitignore
vendored
4
.gitignore
vendored
@ -628,3 +628,7 @@ firefox-3.6.4.source.tar.bz2
|
||||
/firefox-128.0esr.processed-source.tar.xz
|
||||
/nss-3.101.0-6.el8_8.src.rpm
|
||||
/nss-3.101.0-6.el9_2.src.rpm
|
||||
/nss-3.101.0-6.fc40.src.rpm
|
||||
/nss-3.101.0-6.el9_0.src.rpm
|
||||
/firefox-langpacks-128.1.0esr-20240820.tar.xz
|
||||
/firefox-128.1.0esr.processed-source.tar.xz
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
[Global]
|
||||
id=fedora
|
||||
id=redhat
|
||||
version=1.0
|
||||
about=Mozilla Firefox for Fedora
|
||||
about=Mozilla Firefox for Red Hat Enterprise Linux
|
||||
|
||||
[Preferences]
|
||||
app.distributor=fedora
|
||||
app.distributor.channel=fedora
|
||||
app.partner.fedora=fedora
|
||||
app.distributor=redhat
|
||||
app.distributor.channel=redhat
|
||||
app.partner.fedora=redhat
|
||||
|
||||
80
firefox.spec
80
firefox.spec
@ -38,6 +38,14 @@ function dist_to_rhel_minor(str, start)
|
||||
if match then
|
||||
return 5
|
||||
end
|
||||
match = string.match(str, ".el10_%d+")
|
||||
if match then
|
||||
return string.sub(match, 7)
|
||||
end
|
||||
match = string.match(str, ".el10")
|
||||
if match then
|
||||
return 0
|
||||
end
|
||||
return -1
|
||||
end}
|
||||
|
||||
@ -47,14 +55,18 @@ end}
|
||||
%global system_nss 1
|
||||
%global bundle_nss 0
|
||||
|
||||
%if 0%{?rhel} == 7
|
||||
%global bundle_nss 0
|
||||
%global system_nss 0
|
||||
%endif
|
||||
%if 0%{?rhel} == 8
|
||||
%if %{rhel_minor_version} && %{rhel_minor_version} < 8
|
||||
%if %{rhel_minor_version} < 8
|
||||
%global bundle_nss 1
|
||||
%global system_nss 1
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?rhel} == 9
|
||||
%if %{rhel_minor_version} && %{rhel_minor_version} < 2
|
||||
%if %{rhel_minor_version} < 2
|
||||
%global bundle_nss 1
|
||||
%global system_nss 1
|
||||
%endif
|
||||
@ -125,8 +137,8 @@ end}
|
||||
|
||||
Summary: Mozilla Firefox Web browser
|
||||
Name: firefox
|
||||
Version: 128.0
|
||||
Release: 4%{?dist}
|
||||
Version: 128.1.0
|
||||
Release: 1%{?dist}
|
||||
URL: https://www.mozilla.org/firefox/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
|
||||
@ -156,7 +168,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}-20240709.tar.xz
|
||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20240820.tar.xz
|
||||
%endif
|
||||
Source2: cbindgen-vendor.tar.xz
|
||||
Source3: process-official-tarball
|
||||
@ -181,7 +193,8 @@ Source37: mochitest-python.tar.gz
|
||||
# Bundled libraries
|
||||
Source401: nss-setup-flags-env.inc
|
||||
Source402: nspr-4.35.0-1.el8_1.src.rpm
|
||||
Source403: nss-3.101.0-6.el9_2.src.rpm
|
||||
Source403: nss-3.101.0-6.fc40.src.rpm
|
||||
Source404: nss-3.101.0-6.el9_0.src.rpm
|
||||
|
||||
# ---- RHEL specific patches ---
|
||||
# -- Downstream only --
|
||||
@ -394,7 +407,9 @@ BuildRequires: xorg-x11-server-Xvfb
|
||||
%endif
|
||||
|
||||
%if 0%{?use_gcc_ts}
|
||||
BuildRequires: gcc-toolset-13
|
||||
BuildRequires: gcc-toolset-13-runtime
|
||||
BuildRequires: gcc-toolset-13-binutils
|
||||
BuildRequires: gcc-toolset-13-gcc
|
||||
BuildRequires: gcc-toolset-13-gcc-plugin-annobin
|
||||
%endif
|
||||
|
||||
@ -419,12 +434,18 @@ Provides: bundled(audioipc-2)
|
||||
Provides: bundled(bergamot-translator)
|
||||
Provides: bundled(brotli)
|
||||
Provides: bundled(bsdiff)
|
||||
Provides: bundled(bspatch)
|
||||
Provides: bundled(cairo)
|
||||
Provides: bundled(cfworker)
|
||||
Provides: bundled(cld2)
|
||||
Provides: bundled(content)
|
||||
Provides: bundled(content_analysis_sdk)
|
||||
Provides: bundled(cubeb)
|
||||
Provides: bundled(cups)
|
||||
Provides: bundled(d3)
|
||||
Provides: bundled(d3.js)
|
||||
Provides: bundled(double-conversion)
|
||||
Provides: bundled(drm)
|
||||
Provides: bundled(expat)
|
||||
Provides: bundled(fastText)
|
||||
Provides: bundled(fathom)
|
||||
@ -432,7 +453,9 @@ Provides: bundled(fdlibm)
|
||||
Provides: bundled(ffvpx)
|
||||
Provides: bundled(freetype2)
|
||||
Provides: bundled(function2)
|
||||
Provides: bundled(gbm)
|
||||
Provides: bundled(gemmology)
|
||||
Provides: bundled(googletest)
|
||||
Provides: bundled(graphite2)
|
||||
Provides: bundled(harfbuzz)
|
||||
Provides: bundled(highway)
|
||||
@ -446,8 +469,10 @@ Provides: bundled(libcubeb)
|
||||
Provides: bundled(libdav1d)
|
||||
Provides: bundled(libdrm)
|
||||
Provides: bundled(libepoxy)
|
||||
Provides: bundled(libfuzzer)
|
||||
Provides: bundled(libgbm)
|
||||
Provides: bundled(libjpeg)
|
||||
Provides: bundled(libjxl)
|
||||
Provides: bundled(libmar)
|
||||
Provides: bundled(libmkv)
|
||||
Provides: bundled(libnestegg)
|
||||
@ -466,7 +491,9 @@ Provides: bundled(libwebp)
|
||||
Provides: bundled(libwebrtc)
|
||||
Provides: bundled(libyuv)
|
||||
Provides: bundled(lit)
|
||||
Provides: bundled(MotionMark)
|
||||
Provides: bundled(mp4parse-rust)
|
||||
Provides: bundled(msgpack)
|
||||
Provides: bundled(msgpack-c)
|
||||
Provides: bundled(mtransport)
|
||||
Provides: bundled(nestegg)
|
||||
@ -474,31 +501,52 @@ Provides: bundled(nICEr)
|
||||
Provides: bundled(nimbus)
|
||||
Provides: bundled(openmax_dl)
|
||||
Provides: bundled(openmax_il)
|
||||
Provides: bundled(openvr)
|
||||
Provides: bundled(ots)
|
||||
Provides: bundled(pdf.js)
|
||||
Provides: bundled(pdfjs)
|
||||
Provides: bundled(perfetto)
|
||||
Provides: bundled(picosha2)
|
||||
Provides: bundled(PKI)
|
||||
Provides: bundled(PKI.js)
|
||||
Provides: bundled(puppeteer)
|
||||
Provides: bundled(pywebsocket3)
|
||||
Provides: bundled(qcms)
|
||||
Provides: bundled(reader)
|
||||
Provides: bundled(rlbox)
|
||||
Provides: bundled(rlbox_sandboxing_api)
|
||||
Provides: bundled(rlbox_wasm2c_sandbox)
|
||||
Provides: bundled(schemas)
|
||||
Provides: bundled(sfntly)
|
||||
Provides: bundled(simde)
|
||||
Provides: bundled(sipcc)
|
||||
Provides: bundled(skia)
|
||||
Provides: bundled(soundtouch)
|
||||
Provides: bundled(source-map)
|
||||
Provides: bundled(Speedometer3)
|
||||
Provides: bundled(sqlite3)
|
||||
Provides: bundled(src)
|
||||
Provides: bundled(thebes)
|
||||
Provides: bundled(theora)
|
||||
Provides: bundled(usrsctp)
|
||||
Provides: bundled(vendor)
|
||||
Provides: bundled(vsdownload)
|
||||
Provides: bundled(wabt)
|
||||
Provides: bundled(wasm2c)
|
||||
Provides: bundled(wasm2c_sandbox_compiler)
|
||||
Provides: bundled(webaudio)
|
||||
Provides: bundled(webgl-conf)
|
||||
Provides: bundled(WebRender)
|
||||
Provides: bundled(wgpu)
|
||||
Provides: bundled(wgpu_bindings)
|
||||
Provides: bundled(woff2)
|
||||
Provides: bundled(xsimd)
|
||||
Provides: bundled(xz-embedded)
|
||||
Provides: bundled(ycbcr)
|
||||
Provides: bundled(zlib)
|
||||
Provides: bundled(zstd)
|
||||
Provides: bundled(Zycore)
|
||||
Provides: bundled(Zydis)
|
||||
|
||||
%if 0%{?bundle_nss}
|
||||
Provides: bundled(nss) = %{nss_version}
|
||||
@ -1244,6 +1292,7 @@ function install_rpms_to_current_dir() {
|
||||
%if 0%{?bundle_nss}
|
||||
%if 0%{?rhel} == 8
|
||||
# nspr
|
||||
rpm -ivh %{SOURCE402}
|
||||
rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=tests -ba %{_specdir}/nspr.spec
|
||||
pushd %{_buildrootdir}
|
||||
install_rpms_to_current_dir nspr-4*.rpm
|
||||
@ -1260,10 +1309,10 @@ function install_rpms_to_current_dir() {
|
||||
export PATH="%{_buildrootdir}%{bundled_install_path}/bin:$PATH"
|
||||
|
||||
export PATH=%{_buildrootdir}/%{bundled_install_path}/bin:$PATH
|
||||
|
||||
rpm -ivh %{SOURCE402}
|
||||
%else
|
||||
rpm -ivh %{SOURCE403}
|
||||
|
||||
%else
|
||||
rpm -ivh %{SOURCE404}
|
||||
%endif
|
||||
# nss
|
||||
rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=tests -ba %{_specdir}/nss.spec
|
||||
@ -1360,16 +1409,8 @@ MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//' | %{__sed} -e 's/-f
|
||||
# for some sources
|
||||
# Explicitly force the hardening flags for Firefox so it passes the checksec test;
|
||||
# See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages
|
||||
%if 0%{?fedora} < 30
|
||||
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
|
||||
%else
|
||||
# Workaround for mozbz#1531309
|
||||
MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} > 30
|
||||
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
|
||||
%endif
|
||||
|
||||
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
|
||||
%if %{?debug_build}
|
||||
@ -1812,6 +1853,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Tue Aug 20 2024 Jan Horak <jhorak@redhat.com> - 128.1-1
|
||||
- Update to 128.1
|
||||
|
||||
* Wed Jul 10 2024 Tomas Popela <tpopela@redhat.com> - 128.0-1
|
||||
- Update to 128.0
|
||||
|
||||
|
||||
@ -12,6 +12,10 @@ rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cur
|
||||
rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0230-novalid.html
|
||||
rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0231-isvalid.html
|
||||
rm -vf ./process-tarball-dir/*/layout/inspector/tests/chrome/test_fontVariationsAPI.css
|
||||
# A forbidden code point was found in:
|
||||
rm -vf ./process-tarball-dir/*/mobile/android/android-components/components/browser/errorpages/src/main/res/values-ar/strings.xml
|
||||
rm -vf ./process-tarball-dir/*/third_party/webkit/PerformanceTests/Speedometer3/resources/editors/dist/assets/codemirror-521de7ab.js
|
||||
rm -vf ./process-tarball-dir/*/third_party/python/pip/pip-24.0.dist-info/AUTHORS.txt
|
||||
|
||||
processed_tarball=${1/source/processed-source}
|
||||
|
||||
|
||||
8
sources
8
sources
@ -1,7 +1,7 @@
|
||||
SHA512 (mochitest-python.tar.gz) = 089b1593068b76f4572af0086eaccf52a6a1299bfffb58593206d19bf021ae381f2380bbfeb4371586cd53706ff6dde3d240238b2caf19b96c57dfc2f4524e36
|
||||
SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68
|
||||
SHA512 (firefox-128.0esr.processed-source.tar.xz) = 20558767e5d70ea9bf5d9977cc9996427884538052d2f71af6f75c651c9a6213fa080029c7e3d41e592c0057228026ab039291c4dcff5d70f49c74ee00e7a25d
|
||||
SHA512 (firefox-langpacks-128.0esr-20240709.tar.xz) = 064c09b6dafcae3e5336b04e81b0ca062f59f83cd001da650215e6587947c2127ca1b320c464f32652f1ee3b40879444c78979b9b8744ef517cee70e3dc7ab9c
|
||||
SHA512 (nss-3.101.0-6.el8_8.src.rpm) = d119567b411ca88fd11f6c82e6b6a133bf76566635ec3e6712a0e4c8f57dd3d2eda8f98ca300a41fabf89c07c47c04de7bfbf2efcce1754f3f09e7855aaba622
|
||||
SHA512 (nss-3.101.0-6.el9_2.src.rpm) = ee073a08f3fa3c0cd7c23e9984ac24d047aeb8e35660705f2c91d6ad2efd8bd53e024f8d15933c67ddc4b547513ded80838f312928a92df88b1cdf00f15f47fa
|
||||
SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c
|
||||
SHA512 (nss-3.101.0-6.fc40.src.rpm) = fa5e1df96155ccf0872e84e8c0f5932e726a4b18e9289f1481aa87ce9c12ad1d1e14dd86e4c8333df6096373e6d97e0da508d9f7b6e50b99b5b320788d499cf6
|
||||
SHA512 (nss-3.101.0-6.el9_0.src.rpm) = fc938d719f5677bee44147cd029256c7bbb476c4d8ce89c11f7b24f42b9423b31577a968c552cd491e9b997408fa8789572ff0ce54af54a33e6ec3d703a4cbc5
|
||||
SHA512 (firefox-langpacks-128.1.0esr-20240820.tar.xz) = 6f0848c152225a9cbd2e351fdb99b42f8f1dc159277a4d3abd4627515791282fa258a7f703ccfaa2665539d64c1a2647c6e88299be0361b888182ff837db8aa1
|
||||
SHA512 (firefox-128.1.0esr.processed-source.tar.xz) = 38569e14e751231f94b2a882d251da303fab5037e82cf8bcae4def03112b4056e1bc8e4bd879e91ba0318912ddfa7c64034e8a5d7616eeba57409e7d87bdb213
|
||||
|
||||
Loading…
Reference in New Issue
Block a user