From 5c7eeec538eb855ef7680f655a1ee17559a24bd5 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 19 May 2025 17:40:24 +0200 Subject: [PATCH 1/8] Update to 128.10.1 Resolves: RHEL-92616 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ec1b83e..f87a672 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,5 @@ /thunderbird-langpacks-128.9.2esr-20250416.tar.xz /thunderbird-128.10.0esr.processed-source.tar.xz /thunderbird-langpacks-128.10.0esr-20250428.tar.xz +/thunderbird-128.10.1esr.processed-source.tar.xz +/thunderbird-langpacks-128.10.1esr-20250519.tar.xz diff --git a/sources b/sources index 161399f..829a3c7 100644 --- a/sources +++ b/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.10.0esr.processed-source.tar.xz) = e1c886a2992a4f5c807e707383a6d88b3fa36b233c9d6f0db3f051953ab38f4bfd012648f46333fa0a7fe45672e3ac558038c230d1c963b13093d0cc5e5cbe07 -SHA512 (thunderbird-langpacks-128.10.0esr-20250428.tar.xz) = 12e5b4a619d9a08e38fb0de77d2a9ba6ca96cb4fd22529e313d09030e8c5498c00cded08b66dd7bc78789912b9e7d5865bbea0297e6703613c99caaf4de0ae06 +SHA512 (thunderbird-128.10.1esr.processed-source.tar.xz) = e5da88dec5401a55227d32af7076d39004ffca54864994f6ca0b666772bbba6c2a21af4436080a7c7498230e553e477889e3084732e4417550102238755dd31e +SHA512 (thunderbird-langpacks-128.10.1esr-20250519.tar.xz) = a0d25c94460137ccf23e8ee90c590eb749de414e16afa38870e7f73ca9ed704ede04d4cfc3a4ad1c6717826f5d1932d7c8e4c7c25fb8c3750481819f0d0f106d diff --git a/thunderbird.spec b/thunderbird.spec index 0af578d..a1fa1fc 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -145,8 +145,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.10.0 -Release: 2%{?dist} +Version: 128.10.1 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -173,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}-20250428.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250519.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1667,6 +1667,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* 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 From 2eeff1d09fadf6ac69a9b64482ff57400d62bad1 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 20 May 2025 15:07:56 +0200 Subject: [PATCH 2/8] Removes bundled zlib from tarball We're using the system one. Related: RHEL-91353 --- process-official-tarball | 2 ++ thunderbird.spec | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/process-official-tarball b/process-official-tarball index c3f4077..9b6e82c 100755 --- a/process-official-tarball +++ b/process-official-tarball @@ -22,6 +22,8 @@ rm -vr ./process-tarball-dir/*/comm/third_party/rust/wast/tests/parse-fail/confu # We uses system freetype2 rm -vrf ./process-tarball-dir/*/modules/freetype2 +# We use system zlib +rm -vrf ./process-tarball-dir/*/modules/zlib processed_tarball=${1/source/processed-source} diff --git a/thunderbird.spec b/thunderbird.spec index a1fa1fc..ba7fc3e 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -484,7 +484,6 @@ Provides: bundled(xsimd) Provides: bundled(xsimd) Provides: bundled(xz-embedded) Provides: bundled(ycbcr) -Provides: bundled(zlib) Provides: bundled(zstd) Provides: bundled(Zycore) Provides: bundled(Zydis) From 8cee60d7df686d0869b602563c259a66fe2a22f9 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 26 May 2025 15:08:09 +0200 Subject: [PATCH 3/8] Update to 128.11.0 Resolves: RHEL-91353 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f87a672..dba0898 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,5 @@ /thunderbird-langpacks-128.10.0esr-20250428.tar.xz /thunderbird-128.10.1esr.processed-source.tar.xz /thunderbird-langpacks-128.10.1esr-20250519.tar.xz +/thunderbird-128.11.0esr.processed-source.tar.xz +/thunderbird-langpacks-128.11.0esr-20250526.tar.xz diff --git a/sources b/sources index 829a3c7..232149c 100644 --- a/sources +++ b/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.10.1esr.processed-source.tar.xz) = e5da88dec5401a55227d32af7076d39004ffca54864994f6ca0b666772bbba6c2a21af4436080a7c7498230e553e477889e3084732e4417550102238755dd31e -SHA512 (thunderbird-langpacks-128.10.1esr-20250519.tar.xz) = a0d25c94460137ccf23e8ee90c590eb749de414e16afa38870e7f73ca9ed704ede04d4cfc3a4ad1c6717826f5d1932d7c8e4c7c25fb8c3750481819f0d0f106d +SHA512 (thunderbird-128.11.0esr.processed-source.tar.xz) = 8c31e376ccfa9a9c8ce9749aa9116a9cf68bdae542232be15c5ac5bf5845de32295031e037e9f40d8d8c8c8cb0c047dee02538e3f8abe051cdbe88ca6057921f +SHA512 (thunderbird-langpacks-128.11.0esr-20250526.tar.xz) = a0c77dbea3513fb2d62016b0232d83f0a86cf66be96abd5a8ea77bcfdc59e00ae5013adbe2e492b193700ad3e795379a03665981a63f5e93c6e8962c71fc09b6 diff --git a/thunderbird.spec b/thunderbird.spec index ba7fc3e..19b59fb 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -145,7 +145,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.10.1 +Version: 128.11.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -173,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}-20250519.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250526.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1666,6 +1666,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon May 26 2025 Eike Rathke - 128.11.0-1 +- Update to 128.11.0 + * Mon May 19 2025 Eike Rathke - 128.10.1-1 - Update to 128.10.1 From fe5c335f69e7ae68e36012499536a13b97291de3 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 30 Jun 2025 10:02:08 +0200 Subject: [PATCH 4/8] Update to 128.12.0 build1 Resolves: RHEL-96322 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dba0898..f890d67 100644 --- a/.gitignore +++ b/.gitignore @@ -154,3 +154,5 @@ /thunderbird-langpacks-128.10.1esr-20250519.tar.xz /thunderbird-128.11.0esr.processed-source.tar.xz /thunderbird-langpacks-128.11.0esr-20250526.tar.xz +/thunderbird-128.12.0esr.processed-source.tar.xz +/thunderbird-langpacks-128.12.0esr-20250630.tar.xz diff --git a/sources b/sources index 232149c..0eb7882 100644 --- a/sources +++ b/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.11.0esr.processed-source.tar.xz) = 8c31e376ccfa9a9c8ce9749aa9116a9cf68bdae542232be15c5ac5bf5845de32295031e037e9f40d8d8c8c8cb0c047dee02538e3f8abe051cdbe88ca6057921f -SHA512 (thunderbird-langpacks-128.11.0esr-20250526.tar.xz) = a0c77dbea3513fb2d62016b0232d83f0a86cf66be96abd5a8ea77bcfdc59e00ae5013adbe2e492b193700ad3e795379a03665981a63f5e93c6e8962c71fc09b6 +SHA512 (thunderbird-128.12.0esr.processed-source.tar.xz) = 14f140b618195c61b0038742b93925799c7e916387c51a4d0d89740312ec92ad15d69f68d5314472b1094e21e8efbee706daa7894c7034233048e6268d771a37 +SHA512 (thunderbird-langpacks-128.12.0esr-20250630.tar.xz) = d10960bb709ced33a2738953d8d997e87bbe385982b4cba7b060a0e8c4e62f480b76f8e7dea47b8d4f7fb045339ff152c36f155a97aa309da53dc7f6935c23ed diff --git a/thunderbird.spec b/thunderbird.spec index 19b59fb..c22c7e2 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -145,7 +145,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.11.0 +Version: 128.12.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -173,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}-20250526.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250630.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1666,6 +1666,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Jun 30 2025 Eike Rathke - 128.12.0-1 +- Update to 128.12.0 build1 + * Mon May 26 2025 Eike Rathke - 128.11.0-1 - Update to 128.11.0 From a8f26041b4eaf320b2a74e6ff26ca947a7c497e0 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 21 Jul 2025 12:53:29 +0200 Subject: [PATCH 5/8] Update to 128.13.0 build1 Resolves: RHEL-102971 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f890d67..50b2aef 100644 --- a/.gitignore +++ b/.gitignore @@ -156,3 +156,5 @@ /thunderbird-langpacks-128.11.0esr-20250526.tar.xz /thunderbird-128.12.0esr.processed-source.tar.xz /thunderbird-langpacks-128.12.0esr-20250630.tar.xz +/thunderbird-128.13.0esr.processed-source.tar.xz +/thunderbird-langpacks-128.13.0esr-20250721.tar.xz diff --git a/sources b/sources index 0eb7882..2cd1603 100644 --- a/sources +++ b/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.12.0esr.processed-source.tar.xz) = 14f140b618195c61b0038742b93925799c7e916387c51a4d0d89740312ec92ad15d69f68d5314472b1094e21e8efbee706daa7894c7034233048e6268d771a37 -SHA512 (thunderbird-langpacks-128.12.0esr-20250630.tar.xz) = d10960bb709ced33a2738953d8d997e87bbe385982b4cba7b060a0e8c4e62f480b76f8e7dea47b8d4f7fb045339ff152c36f155a97aa309da53dc7f6935c23ed +SHA512 (thunderbird-128.13.0esr.processed-source.tar.xz) = 64e503c97b60417d6b77cc740108839675a3924addeaf3107213202ffe74378ef7b51801e68bc5f40f5d0215128e6ffdb09a729892ae5a8ab87ca26bdb767581 +SHA512 (thunderbird-langpacks-128.13.0esr-20250721.tar.xz) = 27d8f1f0d751a51ddd1531972852630de1691770cd1cccba61cc201586f5814ff88a775708439f1eb1bfab1dbb98da64b8d1ba24e79a772540296c38e2e535fa diff --git a/thunderbird.spec b/thunderbird.spec index c22c7e2..f18373b 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -145,7 +145,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.12.0 +Version: 128.13.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -173,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}-20250630.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250721.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1666,6 +1666,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Jul 21 2025 Eike Rathke - 128.13.0-1 +- Update to 128.13.0 build1 + * Mon Jun 30 2025 Eike Rathke - 128.12.0-1 - Update to 128.12.0 build1 From 20b4eee4889e2c7315730b0da0196b7722610d3d Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Tue, 22 Jul 2025 22:35:32 +0200 Subject: [PATCH 6/8] Update to 128.13.0 build2 Resolves: RHEL-102971 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 50b2aef..4a75b2f 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,5 @@ /thunderbird-langpacks-128.12.0esr-20250630.tar.xz /thunderbird-128.13.0esr.processed-source.tar.xz /thunderbird-langpacks-128.13.0esr-20250721.tar.xz +/thunderbird-128.13.0esr.b2.processed-source.tar.xz +/thunderbird-langpacks-128.13.0esr-20250722.tar.xz diff --git a/sources b/sources index 2cd1603..40c52ba 100644 --- a/sources +++ b/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.13.0esr.processed-source.tar.xz) = 64e503c97b60417d6b77cc740108839675a3924addeaf3107213202ffe74378ef7b51801e68bc5f40f5d0215128e6ffdb09a729892ae5a8ab87ca26bdb767581 -SHA512 (thunderbird-langpacks-128.13.0esr-20250721.tar.xz) = 27d8f1f0d751a51ddd1531972852630de1691770cd1cccba61cc201586f5814ff88a775708439f1eb1bfab1dbb98da64b8d1ba24e79a772540296c38e2e535fa +SHA512 (thunderbird-128.13.0esr.b2.processed-source.tar.xz) = a64ce8531e9d31d3a3f408a35611bae8a0637eea343235722884a50da6efea0306dfffde400b087658c001bf93166c591e8b8926381aeb02ec8e1d12d12208a4 +SHA512 (thunderbird-langpacks-128.13.0esr-20250722.tar.xz) = 61c4a68e20cbd54ca57772e96b38dba3aad579e1090f4b895bcea1dca9d927a0ca06f1a85556925dd413d9c19a8614dcbfdbb7f82bfda4d00d77be71ef75a560 diff --git a/thunderbird.spec b/thunderbird.spec index f18373b..5fa103b 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -135,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 .b2 +%global buildnum .b2 %bcond_without langpacks @@ -146,7 +146,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 128.13.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -173,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}-20250721.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250722.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1666,6 +1666,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Jul 22 2025 Eike Rathke - 128.13.0-2 +- Update to 128.13.0 build2 + * Mon Jul 21 2025 Eike Rathke - 128.13.0-1 - Update to 128.13.0 build1 From ea96a501a6357729fb594c9507746b41c484dceb Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 23 Jul 2025 13:25:32 +0200 Subject: [PATCH 7/8] Update to 128.13.0 build3 Resolves: RHEL-102971 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4a75b2f..ea13da4 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,5 @@ /thunderbird-langpacks-128.13.0esr-20250721.tar.xz /thunderbird-128.13.0esr.b2.processed-source.tar.xz /thunderbird-langpacks-128.13.0esr-20250722.tar.xz +/thunderbird-128.13.0esr.b3.processed-source.tar.xz +/thunderbird-langpacks-128.13.0esr-20250723.tar.xz diff --git a/sources b/sources index 40c52ba..b4ffc8b 100644 --- a/sources +++ b/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.13.0esr.b2.processed-source.tar.xz) = a64ce8531e9d31d3a3f408a35611bae8a0637eea343235722884a50da6efea0306dfffde400b087658c001bf93166c591e8b8926381aeb02ec8e1d12d12208a4 -SHA512 (thunderbird-langpacks-128.13.0esr-20250722.tar.xz) = 61c4a68e20cbd54ca57772e96b38dba3aad579e1090f4b895bcea1dca9d927a0ca06f1a85556925dd413d9c19a8614dcbfdbb7f82bfda4d00d77be71ef75a560 +SHA512 (thunderbird-128.13.0esr.b3.processed-source.tar.xz) = f68b310c8623ebcf3c296569d18300d329fed7164448b1422e9ed203834d32f0b2b549b2dc1f20d0ce7176f8616ef8ec17fe3a74963dc1c78951340b0ed77ffe +SHA512 (thunderbird-langpacks-128.13.0esr-20250723.tar.xz) = cb866a5f93ef3f9bcc0d23de9ac0859fef5884edc353895c5bf1c5ed6d90d1148f137c86c19b9c7d6381eafa7fe8a689f0c7ead652ba4fadb3c55e4ea038a2a8 diff --git a/thunderbird.spec b/thunderbird.spec index 5fa103b..281f4f6 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -135,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 .b2 +%global buildnum .b3 %bcond_without langpacks @@ -146,7 +146,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 128.13.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -173,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}-20250722.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250723.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1666,6 +1666,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Wed Jul 23 2025 Eike Rathke - 128.13.0-3 +- Update to 128.13.0 build3 + * Tue Jul 22 2025 Eike Rathke - 128.13.0-2 - Update to 128.13.0 build2 From 1886a6e545d5dca3f7b322160bdc882ee81b046b Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 12 Aug 2025 13:28:18 +0200 Subject: [PATCH 8/8] Bump the NSS requirements as the rebased NSS is already shipped in c10s, part 2 Related: RHEL-102971 --- build-tb-system-nss.patch | 18 ++++++++++++++++++ thunderbird.spec | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 build-tb-system-nss.patch diff --git a/build-tb-system-nss.patch b/build-tb-system-nss.patch new file mode 100644 index 0000000..a9ff0b6 --- /dev/null +++ b/build-tb-system-nss.patch @@ -0,0 +1,18 @@ +diff -up thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/.cargo-checksum.json.build-tb-system-nss 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.build-tb-system-nss 2025-08-11 11:08:48.268015825 +0200 ++++ thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/.cargo-checksum.json 2025-08-11 11:25:12.471127086 +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.build-tb-system-nss 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.build-tb-system-nss 2025-08-11 11:08:48.268246157 +0200 ++++ thunderbird-128.13.0/comm/third_party/rust/neqo-crypto/src/constants.rs 2025-08-11 11:23:57.165417553 +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/thunderbird.spec b/thunderbird.spec index 281f4f6..5331c41 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -209,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-tb-system-nss.patch # -- Upstreamed patches -- Patch51: mozilla-bmo1170092.patch @@ -1080,6 +1081,9 @@ echo "--------------------------------------------" %patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem %endif %patch -P14 -p1 -b .cargo-lock-version +%if %{?system_nss} +%patch -P15 -p1 -b .system-nss +%endif # -- Upstreamed patches -- %patch -P51 -p1 -b .mozilla-bmo1170092