From d1779bc0038517f8cd94190cd60fbd7f1f4edfec Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Tue, 05 Feb 2019 19:43:41 +0000
Subject: [PATCH] Manual CentOS Debranding

---
 /dev/null                                                        |   30 ------------------------------
 SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch |   12 ++++++++++++
 SPECS/thunderbird.spec                                           |   13 +++++++++++--
 SOURCES/thunderbird-centos-default-prefs.js.el6                  |    2 +-
 SOURCES/thunderbird-centos-default-prefs.js.el7                  |    2 +-
 5 files changed, 25 insertions(+), 34 deletions(-)

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/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
new file mode 100644
index 0000000..b551e1b
--- /dev/null
+++ b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
@@ -0,0 +1,12 @@
+diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
+--- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661	2018-04-27 08:55:38.848241768 +0200
++++ firefox-60.0/mfbt/LinuxSignal.h	2018-04-27 09:06:47.946769859 +0200
+@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo
+                                              void* aContext) {
+   asm volatile("nop; nop; nop; nop" : : : "memory");
+ 
+-  asm volatile("b %0" : : "X"(H) : "memory");
++  asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
+ }
+ 
+ #define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-centos-default-prefs.js.el6
similarity index 95%
rename from SOURCES/thunderbird-redhat-default-prefs.js.rhel6
rename to SOURCES/thunderbird-centos-default-prefs.js.el6
index c412cb5..75de82e 100644
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
+++ b/SOURCES/thunderbird-centos-default-prefs.js.el6
@@ -2,7 +2,7 @@
 pref("app.update.autoInstallEnabled", false);
 # Allow users to set custom colors
 # pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendor", "CentOS");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-centos-default-prefs.js.el7
similarity index 95%
copy from SOURCES/thunderbird-redhat-default-prefs.js.rhel6
copy to SOURCES/thunderbird-centos-default-prefs.js.el7
index c412cb5..75de82e 100644
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
+++ b/SOURCES/thunderbird-centos-default-prefs.js.el7
@@ -2,7 +2,7 @@
 pref("app.update.autoInstallEnabled", false);
 # Allow users to set custom colors
 # pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendor", "CentOS");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
deleted file mode 100644
index c412cb5..0000000
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
+++ /dev/null
@@ -1,30 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-# Allow users to set custom colors
-# pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "Red Hat");
-pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
-pref("intl.locale.matchOS", true);
-pref("mail.shell.checkDefaultClient", false);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-
-# Disable global indexing by default
-pref("mailnews.database.global.indexer.enabled", false);
-
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1");
-pref("extensions.shownSelectionUI", true);
-pref("extensions.autoDisableScope", 0);
-
-# For rhbz#1024232
-pref("ui.SpellCheckerUnderlineStyle",       1);
-
-/* Workaround for rhbz#1134876 */
-pref("javascript.options.baselinejit",      false);
-/* Workaround for rhbz#1110291 */
-pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
-/* Workaround for mozbz#1063315 */
-pref("security.use_mozillapkix_verification", false);
-/* Use OS settings for UI language */
-pref("intl.locale.requested", "");
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 303b64b..c7416f6 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -129,8 +129,8 @@
 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
-Source601:      thunderbird-redhat-default-prefs.js.rhel6
-Source701:      thunderbird-redhat-default-prefs.js.rhel7
+Source601:      thunderbird-centos-default-prefs.js.el6
+Source701:      thunderbird-centos-default-prefs.js.el7
 #Python 2.7
 Source100:      https://www.python.org/ftp/python/%{bundled_python_version}/Python-%{bundled_python_version}.tar.xz
 
@@ -167,6 +167,8 @@
 Patch413:        mozilla-1353817.patch
 Patch415:        mozilla-1436242.patch
 Patch416:        mozilla-1460871-ldap-query.patch
+
+Patch1000:       Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 #Removing this patch would lead to losing user saved credentials in profile!
 
 ## Thunderbird patches
@@ -370,6 +372,10 @@
 # Patch for big endian platforms only
 %if 0%{?big_endian}
 %patch26 -p1 -b .icu
+%endif
+
+%ifarch %{arm}
+%patch1000 -p1 -b .mozilla-1238661
 %endif
 
 # Thunderbird patches
@@ -987,6 +993,9 @@
 #===============================================================================
 
 %changelog
+* Tue Feb 05 2019 Johnny Hughes <johnny@centos.org> 60.5.0-1
+-  Manual CentOS Debranding
+
 * Tue Jan 29 2019 Martin Stransky <stransky@redhat.com> - 60.5.0-1
 - Update to 60.5.0
 

--
Gitblit v1.8.0