From be42149fb617e9ba3dd5afd77d1e23410be53b1a Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Wed, 2 Oct 2024 14:57:18 +0200
Subject: [PATCH] Update to 128.3.0 esr

Resolves: RHEL-59944
---
 .gitignore             | 70 +++++++++++++++++++++++++++++++++++++-----
 gen_cbindgen-vendor.sh | 32 -------------------
 sources                |  8 ++---
 thunderbird.spec       | 11 ++++---
 4 files changed, 74 insertions(+), 47 deletions(-)
 delete mode 100755 gen_cbindgen-vendor.sh

diff --git a/.gitignore b/.gitignore
index 9c67b5d..4e511b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,64 @@
-SOURCES/cbindgen-vendor.tar.xz
-SOURCES/nspr-4.34.0-3.el8_1.src.rpm
-SOURCES/nss-3.79.0-6.el8_1.src.rpm
-SOURCES/thunderbird-102.8.0.b2.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-102.8.0-20230215.tar.xz
-SOURCES/thunderbird-symbolic.svg
 /cbindgen-vendor.tar.xz
-/nspr-4.34.0-3.el8_1.src.rpm
+/nspr-4.32.0-1.el8_1.src.rpm
+/nss-3.67.0-6.el8_1.src.rpm
+/thunderbird-91.1.2.processed-source.tar.xz
+/thunderbird-langpacks-91.1.2-20210929.tar.xz
+/thunderbird-langpacks-91.2.0-20211004.tar.xz
+/thunderbird-91.2.0.processed-source.tar.xz
+/thunderbird-91.3.0.processed-source.tar.xz
+/thunderbird-langpacks-91.3.0-20211101.tar.xz
+/thunderbird-langpacks-91.3.0-20211102.tar.xz
+/thunderbird-91.4.0.processed-source.tar.xz
+/thunderbird-langpacks-91.4.0-20211201.tar.xz
+/nss-3.67.0-7.el8_1.src.rpm
+/thunderbird-langpacks-91.4.0-20211206.tar.xz
+/thunderbird-91.5.0.processed-source.tar.xz
+/thunderbird-langpacks-91.5.0-20220107.tar.xz
+/thunderbird-langpacks-91.6.0-20220207.tar.xz
+/thunderbird-91.6.0.processed-source.tar.xz
+/thunderbird-langpacks-91.7.0-20220303.tar.xz
+/thunderbird-91.7.0.processed-source.tar.xz
+/thunderbird-langpacks-91.7.0-20220308.tar.xz
+/thunderbird-langpacks-91.8.0-20220405.tar.xz
+/thunderbird-91.8.0.processed-source.tar.xz
+/thunderbird-langpacks-91.9.0-20220428.tar.xz
+/thunderbird-91.9.0.processed-source.tar.xz
+/thunderbird-langpacks-91.9.0-20220502.tar.xz
+/thunderbird-langpacks-91.9.0-20220503.tar.xz
+/thunderbird-91.9.1.processed-source.tar.xz
+/thunderbird-langpacks-91.9.1-20220523.tar.xz
+/thunderbird-91.10.0.processed-source.tar.xz
+/thunderbird-langpacks-91.10.0-20220530.tar.xz
+/thunderbird-91.11.0.processed-source.tar.xz
+/thunderbird-langpacks-91.11.0-20220623.tar.xz
+/thunderbird-91.11.0.b2.processed-source.tar.xz
+/thunderbird-langpacks-91.11.0-20220628.tar.xz
+/thunderbird-91.12.0.processed-source.tar.xz
+/thunderbird-langpacks-91.12.0-20220725.tar.xz
+/thunderbird-91.13.0.processed-source.tar.xz
+/thunderbird-langpacks-91.13.0-20220819.tar.xz
 /nss-3.79.0-6.el8_1.src.rpm
+/nspr-4.34.0-3.el8_1.src.rpm
+/thunderbird-102.2.1.source.tar.xz
+/thunderbird-langpacks-102.2.1-20220901.tar.xz
+/thunderbird-102.2.1.processed-source.tar.xz
+/thunderbird-102.3.0.processed-source.tar.xz
+/thunderbird-langpacks-102.3.0-20220916.tar.xz
+/thunderbird-langpacks-102.4.0-20221017.tar.xz
+/thunderbird-102.4.0.processed-source.tar.xz
+/thunderbird-102.5.0.processed-source.tar.xz
+/thunderbird-langpacks-102.5.0-20221111.tar.xz
+/thunderbird-langpacks-102.5.0-20221115.tar.xz
+/thunderbird-102.6.0.processed-source.tar.xz
+/thunderbird-langpacks-102.6.0-20221209.tar.xz
+/thunderbird-langpacks-102.6.0-20221213.tar.xz
+/thunderbird-102.7.0.processed-source.tar.xz
+/thunderbird-langpacks-102.7.0-20230116.tar.xz
+/thunderbird-102.7.1.processed-source.tar.xz
+/thunderbird-langpacks-102.7.1-20230124.tar.xz
+/thunderbird-langpacks-102.7.1-20230131.tar.xz
+/thunderbird-102.8.0.processed-source.tar.xz
+/thunderbird-langpacks-102.8.0-20230210.tar.xz
 /thunderbird-102.8.0.b2.processed-source.tar.xz
 /thunderbird-langpacks-102.8.0-20230215.tar.xz
 /thunderbird-102.9.0.processed-source.tar.xz
@@ -72,3 +124,7 @@ SOURCES/thunderbird-symbolic.svg
 /thunderbird-128.1.1esr.processed-source.tar.xz
 /thunderbird-128.2.0esr.processed-source.tar.xz
 /thunderbird-langpacks-128.2.0esr-20240905.tar.xz
+/thunderbird-langpacks-128.3.0esr-20240930.tar.xz
+/thunderbird-128.3.0esr.processed-source.tar.xz
+/nss-3.101.0-7.el9_2.src.rpm
+/nss-3.101.0-7.el8_2.src.rpm
diff --git a/gen_cbindgen-vendor.sh b/gen_cbindgen-vendor.sh
deleted file mode 100755
index 4e8aded..0000000
--- a/gen_cbindgen-vendor.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-set -x
-
-# Dummy Cargo.toml file with cbindgen dependency
-cat > Cargo.toml <<EOL
-[package]
-name = "dummy"
-version = "0.0.1"
-description = """
-This is a dummy package which contains dependency on cbindgen
-to be used with 'cargo vendor' commmand.
-"""
-
-[dependencies]
-cbindgen = "0.26.0"
-
-[[bin]]
-name = "dummy"
-path = "dummy.rs"
-doc = false
-EOL
-
-cargo install cargo-vendor
-cargo vendor
-
-cd vendor
-tar -cJf ../cbindgen-vendor.tar.xz *
-cd ..
-
-rm -f Cargo.toml
-rm -rf vendor
-
diff --git a/sources b/sources
index d02f0c6..4de2abc 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
 SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c
 SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68
-SHA512 (nss-3.101.0-6.el8_2.src.rpm) = db1c9e5821b39c60494417a169f14bc2d58006b06f43d2cbf8bfc6fa064d49aacee1543eb17e75c41e428dae9682ee6f7afbef6e4d421656257730656afa0926
-SHA512 (nss-3.101.0-6.el9_0.src.rpm) = fc938d719f5677bee44147cd029256c7bbb476c4d8ce89c11f7b24f42b9423b31577a968c552cd491e9b997408fa8789572ff0ce54af54a33e6ec3d703a4cbc5
-SHA512 (thunderbird-128.2.0esr.processed-source.tar.xz) = 2ead5b914b641760708c8481729299ffaced01318c8f2879254e98e0cdce5e1ec88aaf4dbf52df4b2b689f8feb661ed8417964705f823eda0dbba9c7e8d042e8
-SHA512 (thunderbird-langpacks-128.2.0esr-20240905.tar.xz) = c2c0384e55c1810289c146896dc46f112af996aa076d3c68466b81216fbeabd027c5d64386258ec4c7dedb398f47d7e18001daa013d6b013edeabe9551510b46
+SHA512 (thunderbird-langpacks-128.3.0esr-20240930.tar.xz) = 6c3a9095e9c47b847fe08c875009841e4d713941c5223afa8d3f0e39da1b7582a21233cb0952bd1050ac845bca9cc72234264730a991cf925cc6f6706fed73e8
+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.0esr.processed-source.tar.xz) = 56f56b8cde706f690a4f2c69e30305e87cc5cfc20d1d11cf8fcef094599a80958bf191f7ffa100d03c3cea9cf530c4359dd528065d5c9ab5dc694b653ad36d02
diff --git a/thunderbird.spec b/thunderbird.spec
index d3d6d7e..0e3219d 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -131,7 +131,7 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        128.2.0
+Version:        128.3.0
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -159,7 +159,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}-20240905.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20240930.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -174,8 +174,8 @@ Source32:       node-stdout-nonblocking-wrapper
 Source35:       google-loc-api-key
 Source401:      nss-setup-flags-env.inc
 Source402:      nspr-4.35.0-1.el8_1.src.rpm
-Source403:      nss-3.101.0-6.el8_2.src.rpm
-Source404:      nss-3.101.0-6.el9_0.src.rpm
+Source403:      nss-3.101.0-7.el8_2.src.rpm
+Source404:      nss-3.101.0-7.el9_2.src.rpm
 
 # ---- RHEL specific patches ---
 # -- Downstream only --
@@ -1634,6 +1634,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Mon Sep 30 2024 Jan Horak <jhorak@redhat.com> - 128.3.0-1
+- Update to 127.3.0
+
 * Thu Sep 05 2024 Eike Rathke <erack@redhat.com> - 128.2.0-1
 - Update to 128.2.0