From c95b84939f26920f90e3cfe58e25ebd172fc5f3e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 14 2020 12:02:22 +0000
Subject: import thunderbird-78.5.1-1.el8_3


---

diff --git a/.gitignore b/.gitignore
index aef4ac1..3a58fd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,6 @@ SOURCES/nodejs-10.21.0-5.fc32.src.rpm
 SOURCES/nspr-4.25.0-1.el8_0.src.rpm
 SOURCES/nss-3.53.1-3.fc32.src.rpm
 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-SOURCES/thunderbird-78.5.0.source.tar.xz
-SOURCES/thunderbird-langpacks-78.5.0-20201118.tar.xz
+SOURCES/thunderbird-78.5.1.source.tar.xz
+SOURCES/thunderbird-langpacks-78.5.1-20201204.tar.xz
 SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index def6eb2..89e89ae 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -6,6 +6,6 @@ e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
 07d67c90367c3ec0d6cebc1a5793c21076d34b78 SOURCES/nspr-4.25.0-1.el8_0.src.rpm
 223c02166b1cb9863b9f453ef687d7805a93e7af SOURCES/nss-3.53.1-3.fc32.src.rpm
 a379070abf5000cde61411c97af7e733b267a4d3 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-68c33fb48109996bf725b1033a34ded972a5c535 SOURCES/thunderbird-78.5.0.source.tar.xz
-0a13b984edb26a197a8e3b2166a615bcebc523ba SOURCES/thunderbird-langpacks-78.5.0-20201118.tar.xz
+e8d69a4f656ef0607cc4c578d5d614b451081a1d SOURCES/thunderbird-78.5.1.source.tar.xz
+3ce0da68308dc4113817de270c3756195a1fe9df SOURCES/thunderbird-langpacks-78.5.1-20201204.tar.xz
 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/disable-openpgp-in-thunderbird.patch b/SOURCES/disable-openpgp-in-thunderbird.patch
new file mode 100644
index 0000000..820f2e4
--- /dev/null
+++ b/SOURCES/disable-openpgp-in-thunderbird.patch
@@ -0,0 +1,28 @@
+diff --git a/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm b/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
+--- a/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
++++ b/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
+@@ -53,20 +53,23 @@ var BondOpenPGP = {
+ 
+   // if null, we haven't yet read the pref
+   // if true, pref was enabled and we already triggered init
+   _isEnabled: null,
+ 
+   _alreadyTriedInit: false, // if already true, we will not try again
+ 
+   setIsEnabledFromPref() {
+-    this._isEnabled = Services.prefs.getBoolPref("mail.openpgp.enable");
++    return false;
++    //this._isEnabled = Services.prefs.getBoolPref("mail.openpgp.enable");
+   },
+ 
+   async init() {
++    return;
++
+     if (!MailConstants.MOZ_OPENPGP) {
+       return;
+     }
+ 
+     // We never shut off after pref change, disabling requires restart.
+     // If null, it means we're here for the first time, read the pref.
+     // If false, it could mean the pref was now turned on at runtime.
+     // In both scenarios, null and false, we reread the pref to check
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index dce491b..57acf9b 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -191,7 +191,7 @@
 %global build_langpacks         1
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        78.5.0
+Version:        78.5.1
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -207,7 +207,7 @@ ExclusiveArch:  i686 x86_64 ppc64 s390x
 # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source
 Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20201118.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20201204.tar.xz
 # Locales for lightning
 %endif
 Source2:        cbindgen-vendor-0.14.3.tar.xz
@@ -269,6 +269,7 @@ Patch233:        firefox-rhel6-nss-tls1.3.patch
 Patch234:        rhbz-1821418.patch
 Patch235:        firefox-pipewire-0-3.patch
 Patch236:        fedora-shebang-build.patch
+Patch237:        disable-openpgp-in-thunderbird.patch
 
 # Upstream patches
 Patch402:        mozilla-1196777.patch
@@ -568,6 +569,7 @@ echo "use_bundled_yasm      %{?use_bundled_yasm}"
 %endif
 
 %patch236 -p1 -b .fedora-shebang-build
+%patch237 -p1 -b .disable-openpgp-in-thunderbird
 
 %if 0%{?rhel} == 6
 %patch232 -p1 -b .hugepage
@@ -1438,8 +1440,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Mon Nov 30 2020 CentOS Sources <bugs@centos.org> - 78.5.0-1.el8.centos
-- Apply debranding changes
+* Fri Dec 04 2020 Jan Horak <jhorak@redhat.com> - 78.5.1-1
+- Update to 78.5.1 build1
 
 * Wed Nov 18 2020 Eike Rathke <erack@redhat.com> - 78.5.0-1
 - Update to 78.5.0 build3