From effbf69e1bf7d85830b7c0367b8705d53b9f3963 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <hughesjr@doogie-n3.rdu2.centos.org>
Date: Mar 14 2022 15:47:18 +0000
Subject: Import and Debrand thunderbird-91.7.0-2.el7_9


---

diff --git a/.gitignore b/.gitignore
index 3a65830..46b2346 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 SOURCES/cbindgen-vendor.tar.xz
 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 SOURCES/nss-3.67.0-7.el8_1.src.rpm
-SOURCES/thunderbird-91.6.0.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-91.6.0-20220207.tar.xz
+SOURCES/thunderbird-91.7.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-91.7.0-20220308.tar.xz
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 6f336fa..53e4f08 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,5 +1,5 @@
 c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
 b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm
-5f4f619a433c7abc51733215a128dbc7ddb5be0c SOURCES/thunderbird-91.6.0.processed-source.tar.xz
-fe71530869aeb1b6039e0ae4dfc13498c2035560 SOURCES/thunderbird-langpacks-91.6.0-20220207.tar.xz
+0d9dea815661a0ad101d2fd758be855a542f2797 SOURCES/thunderbird-91.7.0.processed-source.tar.xz
+eab467b27d7ff768518cbb6ee38cc8b1ab793920 SOURCES/thunderbird-langpacks-91.7.0-20220308.tar.xz
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 77ee9ff..8f32560 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -128,8 +128,8 @@ end}
 %global build_langpacks         1
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        91.6.0
-Release:        1%{?dist}
+Version:        91.7.0
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -155,7 +155,7 @@ ExcludeArch:    s390 ppc
 # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz
 Source0:        thunderbird-%{version}%{?pre_version}.processed-source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20220207.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20220308.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        get-calendar-langpacks.sh
@@ -202,9 +202,14 @@ Patch512:        mozilla-bmo849632.patch
 Patch513:        mozilla-bmo998749.patch
 Patch514:        mozilla-s390x-skia-gradient.patch
 Patch515:        mozilla-bmo1626236.patch
+Patch516:        expat-CVE-2022-25235.patch
+Patch517:        expat-CVE-2022-25236.patch
+Patch518:        expat-CVE-2022-25315.patch
 
-Patch10000:       Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
-Patch10001:       Bug-1526653---fix_user_vfp_armv7.patch
+%ifarch %{arm}
+%patch10000 -p1 -b .mozilla-1238661
+%patch10001 -p1 -b .mozilla-15266
+%endif
 
 %if %{?system_nss}
 %if !0%{?bundle_nss}
@@ -431,7 +436,10 @@ echo "use_rustts            %{?use_rustts}"
 %patch513 -p1 -b .mozilla-bmo998749
 %patch514 -p1 -b .mozilla-s390x-skia-gradient
 %patch515 -p1 -b .mozilla-bmo1626236
-#patch237 -p1 -b .disable-openpgp-in-thunderbird
+%patch516 -p1 -b .expat-CVE-2022-25235
+%patch517 -p1 -b .expat-CVE-2022-25236
+%patch518 -p1 -b .expat-CVE-2022-25315
+%patch237 -p1 -b .disable-openpgp-in-thunderbird
 
 
 %patch1001 -p1 -b .ppc64le-inline
@@ -876,9 +884,9 @@ ls %{_buildrootdir}
 export MACH_USE_SYSTEM_PYTHON=1
 %if 0%{?use_llvmts}
   #scl enable llvm-toolset-%{llvm_version} './mach build -v'
-  ./mach build -v
+  ./mach build -v || exit 1
 %else
-  ./mach build -v
+  ./mach build -v || exit 1
 %endif
 # Look for the reason we get: /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character
 readelf -wl objdir/dist/bin/libxul.so | grep "/"
@@ -1021,7 +1029,7 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-*
 
 
 # Removing librnp.so - we cannot deliver that in RHELs
-#{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
+%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
 
 # Register as an application to be visible in the software center
 #
@@ -1125,6 +1133,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Mar 08 2022 Eike Rathke <erack@redhat.com> - 91.7.0-2
+- Update to 91.7.0 build2
+
+* Thu Mar 03 2022 Eike Rathke <erack@redhat.com> - 91.7.0-1
+- Update to 91.7.0 build1
+
 * Mon Feb 07 2022 Eike Rathke <erack@redhat.com> - 91.6.0-1
 - Update to 91.6.0 build1