Merge branch 'c10s' into a10s
This commit is contained in:
eabdullin
commit
81fffc5f23
8
.gitignore
vendored
8
.gitignore
vendored
@ -130,3 +130,11 @@
|
||||
/nss-3.101.0-7.el8_2.src.rpm
|
||||
/thunderbird-128.3.1esr.processed-source.tar.xz
|
||||
/thunderbird-langpacks-128.3.1esr-20241009.tar.xz
|
||||
/thunderbird-128.4.0esr.processed-source.tar.xz
|
||||
/thunderbird-langpacks-128.4.0esr-20241028.tar.xz
|
||||
/thunderbird-128.5.0esr.processed-source.tar.xz
|
||||
/thunderbird-langpacks-128.5.0esr-20241126.tar.xz
|
||||
/thunderbird-128.6.0esr.processed-source.tar.xz
|
||||
/thunderbird-langpacks-128.6.0esr-20241218.tar.xz
|
||||
/thunderbird-128.6.0esr.b3.processed-source.tar.xz
|
||||
/thunderbird-langpacks-128.6.0esr-20250108.tar.xz
|
||||
|
||||
507
firefox-system-nss-replace-xyber-with-mlkem.patch
Normal file
507
firefox-system-nss-replace-xyber-with-mlkem.patch
Normal file
File diff suppressed because one or more lines are too long
4
sources
4
sources
@ -2,5 +2,5 @@ SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f
|
||||
SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68
|
||||
SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec
|
||||
SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d
|
||||
SHA512 (thunderbird-128.3.1esr.processed-source.tar.xz) = 5d2b72e2d5d9713d1dd3789c73ac1c0a5fb3d7c540599475469216bf1c34fdae12bbea13f68e05562139c262df46ef482b0fce6ccf08bf2757e36982b95a53dd
|
||||
SHA512 (thunderbird-langpacks-128.3.1esr-20241009.tar.xz) = 978ad8d3e847a78915a67ca381c4f821d3150aa385eca811a5abd999805da22b85633ffe1885301cce8cd7dc6d09d1c0d26e666e9f3db90cb7c4a14e63b5a8bb
|
||||
SHA512 (thunderbird-128.6.0esr.b3.processed-source.tar.xz) = 0fd21416925ba760c55796735f6c83fa51ad1576556b1c4a81b85b31196e55d2cadb0a97be91552283ebe7c2d9d96a902f63ed65a76393f382282e2d0414920d
|
||||
SHA512 (thunderbird-langpacks-128.6.0esr-20250108.tar.xz) = 4540ca4524548b3ae7513c8fff86fdf12bffd9a89d06cbe89513c2360877b38eb74de5bf4e78170b1b341a4a317748f2c1b77f35a6c7a470f44d2244f5912ac4
|
||||
|
||||
105
thunderbird-system-nss-replace-xyber-with-mlkem.patch
Normal file
105
thunderbird-system-nss-replace-xyber-with-mlkem.patch
Normal file
File diff suppressed because one or more lines are too long
@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
|
||||
end
|
||||
match = string.match(str, ".el9")
|
||||
if match then
|
||||
return 5
|
||||
return 6
|
||||
end
|
||||
match = string.match(str, ".el10_%d+")
|
||||
if match then
|
||||
@ -87,7 +87,13 @@ end}
|
||||
%global nodejs_build_req nodejs
|
||||
|
||||
%if 0%{?rhel} > 7 && 0%{?rhel} < 10
|
||||
%global use_gcc_ts 1
|
||||
%global use_gcc_ts 1
|
||||
%if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6
|
||||
# clang depends on gcc-toolset-14-gcc-c++
|
||||
%global gts_version 14
|
||||
%else
|
||||
%global gts_version 13
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} == 7
|
||||
@ -121,7 +127,7 @@ end}
|
||||
# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
|
||||
# thunderbird-102.8.0.b2.processed-source.tar.xz
|
||||
# When unset use processed source file name as is.
|
||||
##global buildnum .b2
|
||||
%global buildnum .b3
|
||||
|
||||
%bcond_without langpacks
|
||||
|
||||
@ -131,8 +137,8 @@ end}
|
||||
|
||||
Summary: Mozilla Thunderbird mail/newsgroup client
|
||||
Name: thunderbird
|
||||
Version: 128.3.1
|
||||
Release: 1%{?dist}.alma.1
|
||||
Version: 128.6.0
|
||||
Release: 3%{?dist}.alma.1
|
||||
URL: http://www.mozilla.org/projects/thunderbird/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
|
||||
@ -159,7 +165,7 @@ ExcludeArch: %{ix86}
|
||||
#Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz
|
||||
Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
|
||||
%if %{with langpacks}
|
||||
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20241009.tar.xz
|
||||
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250108.tar.xz
|
||||
%endif
|
||||
Source2: cbindgen-vendor.tar.xz
|
||||
Source3: process-official-tarball
|
||||
@ -190,6 +196,10 @@ Patch10: build-ffvpx.patch
|
||||
# Due to some failed rpminspect unicode test we had to remove some test files from the tarball
|
||||
# To remove the files checksum from .cargo-checksums we need to add this patch
|
||||
Patch11: rust-file-removal.patch
|
||||
# Patch a few and third_party/rust/neqo-crypto/ like in Firefox.
|
||||
Patch12: firefox-system-nss-replace-xyber-with-mlkem.patch
|
||||
# Thunderbird has a copy of third_party/rust/neqo-crypto/ in comm/third_party/rust/neqo-crypto/
|
||||
Patch13: thunderbird-system-nss-replace-xyber-with-mlkem.patch
|
||||
|
||||
# -- Upstreamed patches --
|
||||
Patch51: mozilla-bmo1170092.patch
|
||||
@ -318,10 +328,12 @@ BuildRequires: zlib-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?use_gcc_ts}
|
||||
BuildRequires: gcc-toolset-13-runtime
|
||||
BuildRequires: gcc-toolset-13-binutils
|
||||
BuildRequires: gcc-toolset-13-gcc
|
||||
BuildRequires: gcc-toolset-13-gcc-plugin-annobin
|
||||
BuildRequires: gcc-toolset-%{gts_version}-runtime
|
||||
BuildRequires: gcc-toolset-%{gts_version}-binutils
|
||||
BuildRequires: gcc-toolset-%{gts_version}-gcc
|
||||
BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
|
||||
# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-g++ instead fail
|
||||
# when clang is upgraded to depend on a later toolset and adjust version.
|
||||
%endif
|
||||
|
||||
%if %{?use_openssl_for_librnp}
|
||||
@ -1055,6 +1067,10 @@ echo "--------------------------------------------"
|
||||
%endif
|
||||
%patch -P10 -p1 -b .build-ffvpx
|
||||
%patch -P11 -p1 -b .rust-file-removal
|
||||
%if 0%{?rhel} == 10
|
||||
%patch -P12 -p1 -b .firefox-system-nss-replace-xyber-with-mlkem
|
||||
%patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem
|
||||
%endif
|
||||
|
||||
# -- Upstreamed patches --
|
||||
%patch -P51 -p1 -b .mozilla-bmo1170092
|
||||
@ -1251,7 +1267,7 @@ function install_rpms_to_current_dir() {
|
||||
# Enable toolsets
|
||||
set +e
|
||||
%if 0%{?use_gcc_ts}
|
||||
source scl_source enable gcc-toolset-13
|
||||
source scl_source enable gcc-toolset-%{gts_version}
|
||||
%endif
|
||||
%if 0%{?use_dts}
|
||||
source scl_source enable devtoolset-%{dts_version}
|
||||
@ -1634,9 +1650,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#===============================================================================
|
||||
|
||||
%changelog
|
||||
* Thu Oct 17 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 128.3.1-1.alma.1
|
||||
* Tue Feb 04 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 128.6.0-3.alma.1
|
||||
- Debrand User-Agent
|
||||
|
||||
* Wed Jan 08 2025 Eike Rathke <erack@redhat.com> - 128.6.0-3
|
||||
- Update to 128.6.0 build3
|
||||
|
||||
* Wed Dec 18 2024 Eike Rathke <erack@redhat.com> - 128.6.0-1
|
||||
- Update to 128.6.0 build1
|
||||
|
||||
* Tue Nov 26 2024 Eike Rathke <erack@redhat.com> - 128.5.0-1
|
||||
- Update to 128.5.0 build1
|
||||
|
||||
* Mon Oct 28 2024 Eike Rathke <erack@redhat.com> - 128.4.0-1
|
||||
- Update to 128.4.0 build1
|
||||
|
||||
* Wed Oct 09 2024 Eike Rathke <erack@redhat.com> - 128.3.1-1
|
||||
- Update to 128.3.1
|
||||
|
||||
@ -1946,4 +1974,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
* Wed Jul 3 2019 Martin Stransky <stransky@redhat.com> - 60.7.2-3
|
||||
- Rebuild to fix rhbz#1725919 - Thunderbird fails to authenticate
|
||||
with gmail with ssl/tls and OAuth2.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user