community/firefox-esr: upgrade to 68.0

See https://www.mozilla.org/en-US/security/advisories/mfsa2019-22/

1 files changed, 39 insertions, 33 deletions

diff --git a/community/firefox-esr/fix-toolkit.patch b/community/firefox-esr/fix-toolkit.patch
index 6cd48dde8b..414734dfec 100644
--- a/community/firefox-esr/fix-toolkit.patch
+++ b/community/firefox-esr/fix-toolkit.patch
@@ -1,6 +1,7 @@
-diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
---- /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2019-02-11 18:55:48.607258656 +0100
-+++ firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2019-02-11 20:57:51.386533134 +0100
+diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+index 4222ce3..4d40c6a 100644
+--- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
 @@ -46,6 +46,7 @@
  #include <sys/mman.h>
  #include <sys/stat.h>
@@ -9,9 +10,10 @@ diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/com
  
  #include <iostream>
  #include <set>
-diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
---- /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc	2019-02-11 18:55:48.610591990 +0100
-+++ firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc	2019-02-11 20:57:51.386533134 +0100
+diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
+index 6019fc7..5953e32 100644
+--- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
++++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
 @@ -41,6 +41,10 @@
  
  #include "common/using_std_string.h"
@@ -23,9 +25,10 @@ diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/com
  using std::vector;
  
  namespace google_breakpad {
-diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
---- /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2019-02-11 18:55:48.610591990 +0100
-+++ firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2019-02-11 20:57:51.389866466 +0100
+diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
+index 98ee2dd..d57aa68 100644
+--- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
++++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
 @@ -55,7 +55,7 @@
  
  #ifdef HAVE_MACH_O_NLIST_H
@@ -35,10 +38,11 @@ diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/com
  #include <a.out.h>
  #endif
  
-diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
---- /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h	2019-02-11 18:55:48.647258669 +0100
-+++ firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h	2019-02-11 19:01:23.614038547 +0100
-@@ -1210,6 +1210,12 @@ struct kernel_statfs {
+diff --git a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+index 93fdad7..f34e5e0 100644
+--- a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
++++ b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+@@ -1239,6 +1239,12 @@ struct kernel_statfs {
  #ifndef __NR_fallocate
  #define __NR_fallocate          285
  #endif
@@ -51,30 +55,32 @@ diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/thi
  /* End of x86-64 definitions                                                 */
  #elif defined(__mips__)
  #if _MIPS_SIM == _MIPS_SIM_ABI32
-diff -upr /tmp/firefox-60.5.0.orig/toolkit/mozapps/update/common/updatedefines.h firefox-60.5.0/toolkit/mozapps/update/common/updatedefines.h
---- /tmp/firefox-60.5.0.orig/toolkit/mozapps/update/common/updatedefines.h	2019-02-11 18:55:49.287258893 +0100
-+++ firefox-60.5.0/toolkit/mozapps/update/common/updatedefines.h	2019-02-11 20:58:30.753178073 +0100
-@@ -100,7 +100,7 @@ static inline int mywcsprintf(WCHAR* des
+diff --git a/toolkit/mozapps/update/common/updatedefines.h b/toolkit/mozapps/update/common/updatedefines.h
+index 79276f7..4c67976 100644
+--- a/toolkit/mozapps/update/common/updatedefines.h
++++ b/toolkit/mozapps/update/common/updatedefines.h
+@@ -87,7 +87,7 @@ static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt,
+
+ #  ifdef SOLARIS
+ #    include <sys/stat.h>
+-#  else
++#  elif !defined(__linux__) || defined(__GLIBC__)
+ #    include <fts.h>
+ #  endif
+ #  include <dirent.h>
+diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp
+index 257ccb4..01314e4 100644
+--- a/toolkit/mozapps/update/updater/updater.cpp
++++ b/toolkit/mozapps/update/updater/updater.cpp
+@@ -3978,6 +3978,7 @@
  
- #ifdef SOLARIS
- #include <sys/stat.h>
--#else
-+#elif !defined(__linux__) || defined(__GLIBC__)
- #include <fts.h>
- #endif
- #include <dirent.h>
-diff -upr /tmp/firefox-60.5.0.orig/toolkit/mozapps/update/updater/updater.cpp firefox-60.5.0/toolkit/mozapps/update/updater/updater.cpp
---- /tmp/firefox-60.5.0.orig/toolkit/mozapps/update/updater/updater.cpp	2019-02-11 18:55:49.283925558 +0100
-+++ firefox-60.5.0/toolkit/mozapps/update/updater/updater.cpp	2019-02-11 20:57:57.303196520 +0100
-@@ -3733,6 +3733,7 @@ int add_dir_entries(const NS_tchar *dirp
- 
- int add_dir_entries(const NS_tchar *dirpath, ActionList *list) {
+ int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
    int rv = OK;
 +#if !defined(__linux__) || defined(__GLIBC__)
-   FTS *ftsdir;
-   FTSENT *ftsdirEntry;
+   FTS* ftsdir;
+   FTSENT* ftsdirEntry;
    mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
-@@ -3833,6 +3834,7 @@ int add_dir_entries(const NS_tchar *dirp
+@@ -4085,6 +4086,7 @@
    }
  
    fts_close(ftsdir);