From e3fb97fdbbcb654173b862a7eb50c09f34af1576 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jul 11 2019 17:27:55 +0000 Subject: manual CentOS Debranding --- 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) diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini index 8bf461e..0a0429e 100644 --- a/SOURCES/distribution.ini +++ b/SOURCES/distribution.ini @@ -1,7 +1,7 @@ [Global] id=redhat version=1.0 -about=Mozilla Firefox for Red Hat Enterprise Linux +about=Mozilla Firefox for CentOS Linux [Preferences] app.distributor=redhat diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index bee4860..53df8df 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -157,7 +157,7 @@ Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox- Source1: firefox-langpacks-%{version}%{?pre_version}-20190703.tar.xz %endif Source10: firefox-mozconfig -Source12: firefox-redhat-default-prefs.js +Source12: firefox-centos-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -212,6 +212,7 @@ Patch406: mozilla-256180.patch Patch413: mozilla-1353817.patch Patch415: mozilla-1436242.patch +Patch1000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch # Debian patches %if %{?system_nss} @@ -484,6 +485,9 @@ https://extensions.gnome.org. %patch413 -p1 -b .1353817 %patch415 -p1 -b .1436242 +%ifarch %{arm} +%patch1000 -p1 -b .mozilla-1238661 +%endif # Patch for big endian platforms only %if 0%{?big_endian}