From 4dddd2d018b549a75d2bc7d5716ef4f01778fe96 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 27 Aug 2025 12:03:31 +0000 Subject: [PATCH] import CS thunderbird-128.14.0-3.el9_6 --- .gitignore | 4 ++-- .thunderbird.metadata | 4 ++-- SOURCES/build-system-nss.patch | 18 ++++++++++++++++++ SPECS/thunderbird.spec | 32 +++++++++++++++++++++++++++----- 4 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 SOURCES/build-system-nss.patch diff --git a/.gitignore b/.gitignore index 4a22902..343861a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nss-3.101.0-7.el8_2.src.rpm SOURCES/nss-3.101.0-7.el9_2.src.rpm -SOURCES/thunderbird-128.13.0esr.b3.processed-source.tar.xz -SOURCES/thunderbird-langpacks-128.13.0esr-20250723.tar.xz +SOURCES/thunderbird-128.14.0esr.b2.processed-source.tar.xz +SOURCES/thunderbird-langpacks-128.14.0esr-20250819.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 451b829..d4c6b78 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -2,5 +2,5 @@ d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm 0413d22a58ba1bba99acec9c3c2a4db56a4100c7 SOURCES/nss-3.101.0-7.el9_2.src.rpm -cd2a4da81511fa9cebba2af34a6105b4687faf98 SOURCES/thunderbird-128.13.0esr.b3.processed-source.tar.xz -6871a1d7ad1804e3f340da476040ec05d0e03f89 SOURCES/thunderbird-langpacks-128.13.0esr-20250723.tar.xz +b161fcb0da9de7f802383c8eccd357fee03d6691 SOURCES/thunderbird-128.14.0esr.b2.processed-source.tar.xz +a5a877c84e796528114fb0babddd594b639dc368 SOURCES/thunderbird-langpacks-128.14.0esr-20250819.tar.xz diff --git a/SOURCES/build-system-nss.patch b/SOURCES/build-system-nss.patch new file mode 100644 index 0000000..8db00b7 --- /dev/null +++ b/SOURCES/build-system-nss.patch @@ -0,0 +1,18 @@ +diff -up thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/.cargo-checksum.json.fix-nego-crypto thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/.cargo-checksum.json +--- thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/.cargo-checksum.json.fix-nego-crypto 2025-08-07 12:17:25.833916796 +0200 ++++ thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/.cargo-checksum.json 2025-08-07 12:22:56.704910319 +0200 +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"fa915d4cac0a051c77107dd6f74514915fe2924fe3eecaad10e995062767fbbb","bindings/bindings.toml":"56921b753535f899b8095df3e8af04b1dc2213c4808dfb39734a3c554454d01d","bindings/nspr_err.h":"2d5205d017b536c2d838bcf9bc4ec79f96dd50e7bb9b73892328781f1ee6629d","bindings/nspr_error.h":"e41c03c77b8c22046f8618832c9569fbcc7b26d8b9bbc35eea7168f35e346889","bindings/nspr_io.h":"085b289849ef0e77f88512a27b4d9bdc28252bd4d39c6a17303204e46ef45f72","bindings/nspr_time.h":"2e637fd338a5cf0fd3fb0070a47f474a34c2a7f4447f31b6875f5a9928d0a261","bindings/nss_ciphers.h":"95ec6344a607558b3c5ba8510f463b6295f3a2fb3f538a01410531045a5f62d1","bindings/nss_init.h":"ef49045063782fb612aff459172cc6a89340f15005808608ade5320ca9974310","bindings/nss_p11.h":"0b81e64fe6db49b2ecff94edd850be111ef99ec11220e88ceb1c67be90143a78","bindings/nss_secerr.h":"713e8368bdae5159af7893cfa517dabfe5103cede051dee9c9557c850a2defc6","bindings/nss_ssl.h":"af222fb957b989e392e762fa2125c82608a0053aff4fb97e556691646c88c335","bindings/nss_sslerr.h":"24b97f092183d8486f774cdaef5030d0249221c78343570d83a4ee5b594210ae","bindings/nss_sslopt.h":"b7807eb7abdad14db6ad7bc51048a46b065a0ea65a4508c95a12ce90e59d1eea","build.rs":"6c3e94359395cce5cb29bc0063ff930ffcd7edd50c040cb459acce6c80aa4ef4","min_version.txt":"7e98f86c69cddb4f65cf96a6de1f4297e3ce224a4c4628609e29042b6c4dcfb9","src/aead.rs":"fc42bc20b84d2e5ccfd56271ae2d2db082e55586ea2926470c102da177f22296","src/aead_null.rs":"3a553f21126c9ca0116c2be81e5a777011b33c159fd88c4f384614bbdb06bb2e","src/agent.rs":"0ef7b488480d12c01a122050e82809bc784443ef6277d75fce21d706fbf5eaaf","src/agentio.rs":"415f70b95312d3ee6d74ba6f28094246101ab6d535aa9df880c38d8bb5a9279e","src/auth.rs":"ced1a18f691894984244088020ea25dc1ee678603317f0c7dfc8b8842fa750b4","src/cert.rs":"8942cb3ce25a61f92b6ffc30fb286052ed6f56eeda3be12fd46ea76ceba6c1cf","src/constants.rs":"78df03f9209ff36279b75f88f6d3d15fed4a0fdd1f6edc8ea8100ed9ae34320f","src/ech.rs":"9d322fcc01c0886f1dfe9bb6273cb9f88a746452ac9a802761b1816a05930c1f","src/err.rs":"ae979f334604aba89640c4491262641910033f0bd790d58671f649f5039b291c","src/exp.rs":"cec59d61fc95914f9703d2fb6490a8507af993c9db710dde894f2f8fd38123c7","src/ext.rs":"cbf7d9f5ecabf4b8c9efd6c334637ab1596ec5266d38ab8d2d6ceae305283deb","src/hkdf.rs":"ef32f20e30a9bd7f094199536d19c87c4231b7fbbe4a9c54c70e84ca9c6575be","src/hp.rs":"644f1bed67f1c6189a67c8d02ab3358aaa7f63af4b913dd7395becbc01a84291","src/lib.rs":"f0d0b14c7330fa4040166953c4a428918ce78967fe500bfeaa5f2c10b64567b3","src/min_version.rs":"89b7ef6f9d2301db4f689f4d963b58375d577f705b92003a804048441e00cfd1","src/p11.rs":"704c5f164c4f195c8051c5bf1e69a912c34b613a8cf6bed5f577dc5674eea34e","src/prio.rs":"e5e169296c0ac69919c59fb6c1f8bd6bf079452eaa13d75da0edd41d435d3f6f","src/replay.rs":"96b7af8eff9e14313e79303092018b12e8834f780c96b8e247c497fdc680c696","src/result.rs":"0587cbb6aace71a7f9765ef7c01dcd9f73a49dcc6331e1d8fe4de2aef6ca65b6","src/secrets.rs":"4ffaa66f25df47dadf042063bff5953effa7bf2f4920cafe827757d6a659cb58","src/selfencrypt.rs":"b7cc1c896c7661c37461fc3a8bcbfdf2589433b907fa5f968ae4f6907704b441","src/ssl.rs":"c83baa5518b81dd06f2e4072ea3c2d666ccdeb8b1ff6e3746eea9f1af47023a6","src/time.rs":"c71a01ff8aa2c0e97fb16ad620df4ed6b7cc1819ff93f46634e2f1c9551627ec","tests/aead.rs":"e36ae77802df1ea6d17cfd1bd2178a3706089577d6fd1554ca86e748b8b235b9","tests/agent.rs":"824735f88e487a3748200844e9481e81a72163ad74d82faa9aa16594d9b9bb25","tests/ext.rs":"1b047d23d9b224ad06eb65d8f3a7b351e263774e404c79bbcbe8f43790e29c18","tests/handshake.rs":"e892a2839b31414be16e96cdf3b1a65978716094700c1a4989229f7edbf578a0","tests/hkdf.rs":"1d2098dc8398395864baf13e4886cfd1da6d36118727c3b264f457ee3da6b048","tests/hp.rs":"b24fec53771c169be788772532d2617a5349196cf87d6444dc74214f7c73e92c","tests/init.rs":"616313cb38eac44b8c71a1d23a52a7d7b4c7c07d4c20dc9ea6600c3317f92613","tests/selfencrypt.rs":"8d10840b41629bf449a6b3a551377315e8a05ca26c6b041548748196652c5909"},"package":null} ++{"files":{"Cargo.toml":"fa915d4cac0a051c77107dd6f74514915fe2924fe3eecaad10e995062767fbbb","bindings/bindings.toml":"56921b753535f899b8095df3e8af04b1dc2213c4808dfb39734a3c554454d01d","bindings/nspr_err.h":"2d5205d017b536c2d838bcf9bc4ec79f96dd50e7bb9b73892328781f1ee6629d","bindings/nspr_error.h":"e41c03c77b8c22046f8618832c9569fbcc7b26d8b9bbc35eea7168f35e346889","bindings/nspr_io.h":"085b289849ef0e77f88512a27b4d9bdc28252bd4d39c6a17303204e46ef45f72","bindings/nspr_time.h":"2e637fd338a5cf0fd3fb0070a47f474a34c2a7f4447f31b6875f5a9928d0a261","bindings/nss_ciphers.h":"95ec6344a607558b3c5ba8510f463b6295f3a2fb3f538a01410531045a5f62d1","bindings/nss_init.h":"ef49045063782fb612aff459172cc6a89340f15005808608ade5320ca9974310","bindings/nss_p11.h":"0b81e64fe6db49b2ecff94edd850be111ef99ec11220e88ceb1c67be90143a78","bindings/nss_secerr.h":"713e8368bdae5159af7893cfa517dabfe5103cede051dee9c9557c850a2defc6","bindings/nss_ssl.h":"af222fb957b989e392e762fa2125c82608a0053aff4fb97e556691646c88c335","bindings/nss_sslerr.h":"24b97f092183d8486f774cdaef5030d0249221c78343570d83a4ee5b594210ae","bindings/nss_sslopt.h":"b7807eb7abdad14db6ad7bc51048a46b065a0ea65a4508c95a12ce90e59d1eea","build.rs":"6c3e94359395cce5cb29bc0063ff930ffcd7edd50c040cb459acce6c80aa4ef4","min_version.txt":"7e98f86c69cddb4f65cf96a6de1f4297e3ce224a4c4628609e29042b6c4dcfb9","src/aead.rs":"fc42bc20b84d2e5ccfd56271ae2d2db082e55586ea2926470c102da177f22296","src/aead_null.rs":"3a553f21126c9ca0116c2be81e5a777011b33c159fd88c4f384614bbdb06bb2e","src/agent.rs":"0ef7b488480d12c01a122050e82809bc784443ef6277d75fce21d706fbf5eaaf","src/agentio.rs":"415f70b95312d3ee6d74ba6f28094246101ab6d535aa9df880c38d8bb5a9279e","src/auth.rs":"ced1a18f691894984244088020ea25dc1ee678603317f0c7dfc8b8842fa750b4","src/cert.rs":"8942cb3ce25a61f92b6ffc30fb286052ed6f56eeda3be12fd46ea76ceba6c1cf","src/constants.rs":"1c7821aea4633b6dd47a7e33499e851064d8e565a63ddad2678c7e98aa8cab85","src/ech.rs":"9d322fcc01c0886f1dfe9bb6273cb9f88a746452ac9a802761b1816a05930c1f","src/err.rs":"ae979f334604aba89640c4491262641910033f0bd790d58671f649f5039b291c","src/exp.rs":"cec59d61fc95914f9703d2fb6490a8507af993c9db710dde894f2f8fd38123c7","src/ext.rs":"cbf7d9f5ecabf4b8c9efd6c334637ab1596ec5266d38ab8d2d6ceae305283deb","src/hkdf.rs":"ef32f20e30a9bd7f094199536d19c87c4231b7fbbe4a9c54c70e84ca9c6575be","src/hp.rs":"644f1bed67f1c6189a67c8d02ab3358aaa7f63af4b913dd7395becbc01a84291","src/lib.rs":"f0d0b14c7330fa4040166953c4a428918ce78967fe500bfeaa5f2c10b64567b3","src/min_version.rs":"89b7ef6f9d2301db4f689f4d963b58375d577f705b92003a804048441e00cfd1","src/p11.rs":"704c5f164c4f195c8051c5bf1e69a912c34b613a8cf6bed5f577dc5674eea34e","src/prio.rs":"e5e169296c0ac69919c59fb6c1f8bd6bf079452eaa13d75da0edd41d435d3f6f","src/replay.rs":"96b7af8eff9e14313e79303092018b12e8834f780c96b8e247c497fdc680c696","src/result.rs":"0587cbb6aace71a7f9765ef7c01dcd9f73a49dcc6331e1d8fe4de2aef6ca65b6","src/secrets.rs":"4ffaa66f25df47dadf042063bff5953effa7bf2f4920cafe827757d6a659cb58","src/selfencrypt.rs":"b7cc1c896c7661c37461fc3a8bcbfdf2589433b907fa5f968ae4f6907704b441","src/ssl.rs":"c83baa5518b81dd06f2e4072ea3c2d666ccdeb8b1ff6e3746eea9f1af47023a6","src/time.rs":"c71a01ff8aa2c0e97fb16ad620df4ed6b7cc1819ff93f46634e2f1c9551627ec","tests/aead.rs":"e36ae77802df1ea6d17cfd1bd2178a3706089577d6fd1554ca86e748b8b235b9","tests/agent.rs":"824735f88e487a3748200844e9481e81a72163ad74d82faa9aa16594d9b9bb25","tests/ext.rs":"1b047d23d9b224ad06eb65d8f3a7b351e263774e404c79bbcbe8f43790e29c18","tests/handshake.rs":"e892a2839b31414be16e96cdf3b1a65978716094700c1a4989229f7edbf578a0","tests/hkdf.rs":"1d2098dc8398395864baf13e4886cfd1da6d36118727c3b264f457ee3da6b048","tests/hp.rs":"b24fec53771c169be788772532d2617a5349196cf87d6444dc74214f7c73e92c","tests/init.rs":"616313cb38eac44b8c71a1d23a52a7d7b4c7c07d4c20dc9ea6600c3317f92613","tests/selfencrypt.rs":"8d10840b41629bf449a6b3a551377315e8a05ca26c6b041548748196652c5909"},"package":null} +diff -up thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/src/constants.rs.fix-nego-crypto thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/src/constants.rs +--- thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/src/constants.rs.fix-nego-crypto 2025-08-07 12:17:25.834000584 +0200 ++++ thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/src/constants.rs 2025-08-07 12:22:18.624164181 +0200 +@@ -62,7 +62,7 @@ remap_enum! { + TLS_GRP_EC_SECP384R1 = ssl_grp_ec_secp384r1, + TLS_GRP_EC_SECP521R1 = ssl_grp_ec_secp521r1, + TLS_GRP_EC_X25519 = ssl_grp_ec_curve25519, +- TLS_GRP_KEM_MLKEM768X25519 = ssl_grp_kem_mlkem768x25519, ++ TLS_GRP_KEM_MLKEM768X25519 = ssl_grp_kem_x25519mlkem768, + } + } + diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 874284e..44dd97d 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -71,10 +71,18 @@ end} %global dts_version 11 %global llvm_version 7.0 +# CentOS Stream 10 and 9 already ship rebased NSS +%if 0%{?centos} == 10 || 0%{?centos} == 9 +%global nspr_version 4.36 +%global nspr_version_max 4.37 +%global nss_version 3.112 +%global nss_version_max 3.113 +%else %global nspr_version 4.35 %global nspr_version_max 4.36 %global nss_version 3.101 %global nss_version_max 3.102 +%endif %global rust_version 1.66 %global system_libvpx 0 @@ -127,7 +135,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 .b3 +%global buildnum .b2 %bcond_without langpacks @@ -137,7 +145,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.13.0 +Version: 128.14.0 Release: 3%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -165,7 +173,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}-20250723.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250819.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -201,6 +209,7 @@ 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 Patch14: build-cargo-lock-version.patch +Patch15: build-system-nss.patch # -- Upstreamed patches -- Patch51: mozilla-bmo1170092.patch @@ -1067,12 +1076,13 @@ echo "--------------------------------------------" %endif %patch -P10 -p1 -b .build-ffvpx %patch -P11 -p1 -b .rust-file-removal -%if 0%{?rhel} == 10 +%if 0%{?rhel} == 10 || 0%{?centos} == 9 %patch -P12 -p1 -b .firefox-system-nss-replace-xyber-with-mlkem %patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem %endif -%if 0%{?rhel} == 8 %patch -P14 -p1 -b .cargo-lock-version +%if %{?system_nss} +%patch -P15 -p1 -b .system-nss %endif # -- Upstreamed patches -- @@ -1660,6 +1670,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Aug 19 2025 Jan Grulich - 128.14.0-3 +- Update to 128.14.0 build2 + +* Fri Aug 15 2025 Jan Grulich - 128.14.0-2 +- Add missing translations + +* Fri Aug 15 2025 Jan Grulich - 128.14.0-1 +- Update to 128.14.0 build1 + * Wed Jul 23 2025 Eike Rathke - 128.13.0-3 - Update to 128.13.0 build3 @@ -1678,6 +1697,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon May 19 2025 Eike Rathke - 128.10.1-1 - Update to 128.10.1 +* Tue Aug 05 2025 Tomas Popela - 128.10.0-2 +- Bump the NSS requirements as the rebased NSS is already shipped in c10s + * Mon Apr 28 2025 Eike Rathke - 128.10.0-1 - Update to 128.10.0 build1