testing/firefox; upgrade to 57.0

3 files changed, 31 insertions, 57 deletions

diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index e81198762a..f5d9fadee9 100644
--- a/testing/firefox/APKBUILD
+++ b/testing/firefox/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=firefox
-pkgver=55.0.2
+pkgver=57.0
 _pkgver=$pkgver
 _xulver=$pkgver
 pkgrel=0
@@ -53,7 +53,6 @@ install=""
 source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
 	stab.h
 
-	0002-Use-C99-math-isfinite.patch
 	fix-fortify-inline.patch
 	disable-hunspell_hooks.patch
 	fix-seccomp-bpf.patch
@@ -109,17 +108,18 @@ build() {
 		\
 		--disable-crashreporter \
 		--disable-elf-hack \
+		--disable-gold \
 		--disable-install-strip \
 		--disable-jemalloc \
 		--disable-profiling \
 		--disable-pulseaudio \
 		--disable-strip \
+		--disable-stylo \
 		--disable-tests \
 		--disable-updater \
 		\
 		--enable-alsa \
 		--enable-default-toolkit=cairo-gtk3 \
-		--enable-gold=no \
 		--enable-official-branding \
 		--enable-optimize="$CFLAGS" \
 		--enable-pie \
@@ -216,14 +216,13 @@ __EOF__
 	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so
 }
 
-sha512sums="a27722cb5840aac89752fea0880a7e093e84b50dc78a36dc8c4bd493ffda10fa61446007f680bfe65db7a0debe4c21e6f0bf9f0de9876bba067abdda6fed7be4  firefox-55.0.2.source.tar.xz
+sha512sums="bd99ff97a2a6f824e6fbd36fd00193903159e309506b1e6945dcbc43a17a95aaa54a05f32131c56872e8860878ba6063008667955550f03aa8c7084f834d14fc  firefox-57.0.source.tar.xz
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
-7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8  0002-Use-C99-math-isfinite.patch
 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5  fix-fortify-inline.patch
 0fcc647af53a3ce21c2bc36e5631eb0935e7243ebb3ab59b5719542cc54a6ac023a4a857b43b75756efb9ed80c0aecaa94dc5679a3b3792f82e87bf2c1af82e1  disable-hunspell_hooks.patch
-5e7722b8899bf25f5a941980de9a4e9e9a1efcfa9ce12edb70e525e6022bc0e8ef284804be622e8d17eb3bbc1d99c1554b54cfd4d066ea639de810d30005267f  fix-seccomp-bpf.patch
+70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
 a2925045154f4fd34e5fc056656f4f9da100341529e5d4104d249154db0c7863384083f421ce6e47e0f20566a8b20787fa35444c7933c03cd03f96f06dcd4532  fix-toolkit.patch
-d220b3a9e8b6389cf59745aaa3c424f6f98ed220cf9c00ba0cbd082bd5e77fa046ccb2865d80eefd5b3a1d826a6b1fb46f879258a80b3f7eab269349fd9a75e2  fix-tools.patch
+b46cb90d4fdd1a925a61e2c6c545489cd542f5d82980c529361c02042eed31d5c26972b5e237c1a020f87ffcfd12736d1f4f6e33eaa83ae156d523c808c718cb  fix-tools.patch
 bdcd1b402d2ec94957ba5d08cbad7b1a7f59c251c311be9095208491a05abb05a956c79f27908e1f26b54a3679387b2f33a51e945b650671ad85c0a2d59a5a29  mallinfo.patch
 2a967e4619fd89a046bd40be7fdcef646fcb1eba5e47afc96aa1d59c25bcc8747cb07baee6c11f3b803db0981aced181534b806778e4d21e74958f5f4d74c784  fix-fortify-system-wrappers.patch
 ed0d344c66fc8e1cc83a11e9858b32c42e841cbeedd9eb9438811e9fcc3593dc824a8336d00058d55836cedc970aeadd6a82c6dcd7bc0fb746e564d8b478cc6c  fix-arm-atomics-grsec.patch
diff --git a/testing/firefox/fix-seccomp-bpf.patch b/testing/firefox/fix-seccomp-bpf.patch
index aaf6b563aa..47cde56c74 100644
--- a/testing/firefox/fix-seccomp-bpf.patch
+++ b/testing/firefox/fix-seccomp-bpf.patch
@@ -12,34 +12,3 @@
  namespace {
  
  struct arch_sigsys {
---- firefox-54.0.1/security/sandbox/linux/SandboxFilter.cpp.orig	2017-07-11 07:51:56.342122784 +0000
-+++ firefox-54.0.1/security/sandbox/linux/SandboxFilter.cpp	2017-07-11 08:05:27.553930300 +0000
-@@ -134,6 +134,7 @@
-       .Case(flags_common | CLONE_DETACHED, Allow()) // <= JB 4.2
-       .Case(flags_common, Allow()) // JB 4.3 or KK 4.4
- #endif
-+      .Case(flags_modern | CLONE_DETACHED, Allow()) // musl
-       .Case(flags_modern, Allow()) // Android L or glibc
-       .Default(failPolicy);
-   }
-@@ -241,6 +242,9 @@
-       // Polyfill with tgkill; see above.
-     case __NR_tkill:
-       return Trap(TKillCompatTrap, nullptr);
-+#elseif !defined(__GLIBC__)
-+    case __NR_tkill:
-+      return Allow();
- #endif
- 
-       // Yield
---- firefox-54.0.1/security/sandbox/linux/SandboxFilterUtil.h.orig	2017-07-11 08:05:38.380798447 +0000
-+++ firefox-54.0.1/security/sandbox/linux/SandboxFilterUtil.h	2017-07-11 08:06:20.274911403 +0000
-@@ -118,7 +118,7 @@
- #define CASES_FOR_fstatfs   case __NR_fstatfs
- #define CASES_FOR_statfs   case __NR_statfs
- #define CASES_FOR_fcntl   case __NR_fcntl
--#define CASES_FOR_getdents   case __NR_getdents
-+#define CASES_FOR_getdents   case __NR_getdents64: case __NR_getdents
- #define CASES_FOR_lseek   case __NR_lseek
- #define CASES_FOR_ftruncate   case __NR_ftruncate
- #endif
diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch
index ff6622582f..84f7fa9cb8 100644
--- a/testing/firefox/fix-tools.patch
+++ b/testing/firefox/fix-tools.patch
@@ -1,25 +1,17 @@
-for basename() see https://bugzilla.mozilla.org/show_bug.cgi?id=1041962
+--- a/tools/profiler/core/platform.h
++++ b/tools/profiler/core/platform.h
+@@ -29,6 +29,8 @@
+ #ifndef TOOLS_PLATFORM_H_
+ #define TOOLS_PLATFORM_H_
 
-diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp
-index 70b43d5..686748e 100644
---- a/tools/profiler/core/platform-linux-android.cpp
-+++ b/tools/profiler/core/platform-linux-android.cpp
-@@ -505,8 +505,10 @@ TickSample::PopulateContext(ucontext_t* aContext)
-   MOZ_ASSERT(mIsSynchronous);
-   MOZ_ASSERT(aContext);
- 
-+#if defined(__GLIBC__) || defined(GP_OS_android)
-   if (!getcontext(aContext)) {
-     FillInSample(*this, aContext);
-   }
-+#endif
- }
- 
-diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp
-index cb5bee3..2be2aa9 100644
++#include <sys/types.h>
++
+ #include <stdint.h>
+ #include <math.h>
+ #include "MainThreadUtils.h"
 --- a/tools/profiler/lul/LulElf.cpp
 +++ b/tools/profiler/lul/LulElf.cpp
-@@ -484,10 +484,10 @@ string FormatIdentifier(unsigned char identifier[16]) {
+@@ -579,10 +579,10 @@
  // Return the non-directory portion of FILENAME: the portion after the
  // last slash, or the whole filename if there are no slashes.
  string BaseFileName(const string &filename) {
@@ -33,4 +25,18 @@ index cb5bee3..2be2aa9 100644
 +  string base = p ? p+1 : c_filename;
    return base;
  }
+
+--- a/tools/profiler/core/platform-linux-android.cpp.orig
++++ b/tools/profiler/core/platform-linux-android.cpp
+@@ -534,9 +534,11 @@
+ void
+ Registers::SyncPopulate()
+ {
++#if defined(__GLIBC__)
+   if (!getcontext(&sSyncUContext)) {
+     PopulateRegsFromContext(*this, &sSyncUContext);
+   }
++#endif
+ }
+ #endif