diff --git a/.gitignore b/.gitignore
index ebb6a59..38d4126 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,10 @@ SOURCES/Python-2.7.13.tar.xz
SOURCES/cbindgen-vendor-0.14.3.tar.xz
SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-SOURCES/nodejs-10.21.0-4.fc32.src.rpm
+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.3.0.source.tar.xz
-SOURCES/thunderbird-langpacks-78.3.0-20200919.tar.xz
+SOURCES/thunderbird-78.4.0.source.tar.xz
+SOURCES/thunderbird-langpacks-78.4.0-20201021.tar.xz
SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 929324d..31d5a14 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -2,10 +2,10 @@
a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz
0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-4.fc32.src.rpm
+5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.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
-6f7d458199f44627b38a8b5f841f6f9b39c6303a SOURCES/thunderbird-78.3.0.source.tar.xz
-d9888ce2477f6a9ff10b0411bd4b372d01563a31 SOURCES/thunderbird-langpacks-78.3.0-20200919.tar.xz
+66fa85ad999826bb0c53c94497a6879245f879ea SOURCES/thunderbird-78.4.0.source.tar.xz
+a7974489a76c00ff4d9386daff6b1763fc1b40db SOURCES/thunderbird-langpacks-78.4.0-20201021.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/rhel6-auxv.patch b/SOURCES/rhel6-auxv.patch
new file mode 100644
index 0000000..e7b81cd
--- /dev/null
+++ b/SOURCES/rhel6-auxv.patch
@@ -0,0 +1,21 @@
+diff -up thunderbird-78.3.0/comm/third_party/botan/src/lib/utils/os_utils.cpp.auxv thunderbird-78.3.0/comm/third_party/botan/src/lib/utils/os_utils.cpp
+--- thunderbird-78.3.0/comm/third_party/botan/src/lib/utils/os_utils.cpp.auxv 2020-09-25 17:23:50.810638756 +0200
++++ thunderbird-78.3.0/comm/third_party/botan/src/lib/utils/os_utils.cpp 2020-09-25 17:26:00.156999592 +0200
+@@ -42,7 +42,7 @@
+
+ #if defined(BOTAN_TARGET_OS_HAS_GETAUXVAL) || defined(BOTAN_TARGET_OS_IS_ANDROID) || \
+ defined(BOTAN_TARGET_OS_HAS_ELF_AUX_INFO)
+- #include <sys/auxv.h>
++ //#include <sys/auxv.h>
+ #endif
+
+ #if defined(BOTAN_TARGET_OS_HAS_WIN32)
+@@ -109,7 +109,7 @@ uint32_t OS::get_process_id()
+ unsigned long OS::get_auxval(unsigned long id)
+ {
+ #if defined(BOTAN_TARGET_OS_HAS_GETAUXVAL)
+- return ::getauxval(id);
++ //return ::getauxval(id);
+ #elif defined(BOTAN_TARGET_OS_IS_ANDROID) && defined(BOTAN_TARGET_ARCH_IS_ARM32)
+
+ if(id == 0)
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
index c412cb5..26e8d17 100644
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
+++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
@@ -28,3 +28,6 @@ pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
pref("security.use_mozillapkix_verification", false);
/* Use OS settings for UI language */
pref("intl.locale.requested", "");
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("toolkit.telemetry.archive.enabled", false);
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
index c412cb5..26e8d17 100644
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
+++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
@@ -28,3 +28,6 @@ pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
pref("security.use_mozillapkix_verification", false);
/* Use OS settings for UI language */
pref("intl.locale.requested", "");
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("toolkit.telemetry.archive.enabled", false);
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 79d7f29..0a7e81b 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -191,8 +191,8 @@
%global build_langpacks 1
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 78.3.0
-Release: 3%{?dist}
+Version: 78.4.0
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -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}-20200919.tar.xz
+Source1: thunderbird-langpacks-%{version}%{?ext_version}-20201021.tar.xz
# Locales for lightning
%endif
Source2: cbindgen-vendor-0.14.3.tar.xz
@@ -229,7 +229,7 @@ Source205: gtk3-private-%{gtk3_nvr}-setup-flags-env.inc
Source206: gtk3-private-%{gtk3_nvr}-requires-provides-filter.inc
Source301: yasm-1.2.0-3.el5.src.rpm
Source303: libffi-3.0.13-18.el7_3.src.rpm
-Source304: nodejs-10.21.0-4.fc32.src.rpm
+Source304: nodejs-10.21.0-5.fc32.src.rpm
Source305: openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
Source601: thunderbird-redhat-default-prefs.js.rhel6
Source701: thunderbird-redhat-default-prefs.js.rhel7
@@ -302,6 +302,7 @@ Patch602: rhel6-mach-fail.patch
Patch603: rhel6-zconst.patch
Patch604: rhel6-auxvh.patch
Patch605: rhel6-abiv2-mozbz1642174.patch
+Patch606: rhel6-auxv.patch
%if %{?system_nss}
%if !0%{?bundle_nss}
@@ -605,6 +606,7 @@ echo "use_bundled_yasm %{?use_bundled_yasm}"
%patch603 -p1 -b .rhel6-zconst
%patch604 -p1 -b .rhel6-auxvh
%patch605 -p1 -b .rhel6-abiv2-mozbz1642174
+%patch606 -p1 -b .rhel6-auxv
%endif
# CentOS patches
@@ -1082,7 +1084,6 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j2
%endif
%endif
-#FIXME workaround for oom
cat /proc/meminfo
# Free memory in kB
@@ -1101,6 +1102,14 @@ CPU_AVAILABLE=$(/usr/bin/getconf _NPROCESSORS_ONLN)
%include_file %{SOURCE205}
%endif
+
+#FIXME workaround for oom
+
+cat /proc/meminfo
+# Free memory in kB
+
+MEM_AVAILABLE=$(grep MemAvailable /proc/meminfo | awk '{ print $2 }')
+
%if 0%{?bundle_nss}
echo "Setting nss flags"
# nss-setup-flags-env.inc
@@ -1413,8 +1422,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
-* Tue Nov 03 2020 CentOS Sources <bugs@centos.org> - 78.3.0-3.el8.centos
-- Apply debranding changes
+* Wed Oct 21 2020 Eike Rathke <erack@redhat.com> - 78.4.0-1
+- Update to 78.4.0 build1
+- Disabled telemetry
+
+* Tue Sep 29 2020 Jan Horak <jhorak@redhat.com> - 78.3.1-1
+- Update to 78.3.1 build1
* Sat Sep 19 2020 Jan Horak <jhorak@redhat.com> - 78.3.0-3
- Update to 78.3.0 build1