http/firefox: version 68.0, SECURITY_PATCH++

4 files changed, 205 insertions, 40 deletions

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index ed5368a884..4e7aee5407 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
-         VERSION=67.0.4
-  SECURITY_PATCH=131
+         VERSION=68.0
+  SECURITY_PATCH=132
           SOURCE="${SPELL}-${VERSION}.source.tar.xz"
    SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}"
          SOURCE2="${SOURCE}.asc"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 68d1f98e6d..2020edc03a 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2019-07-08 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 68.0, SECURITY_PATCH++
+	* patches/200*: updated
+
 2019-07-07 Pavel Vinogradov <public@sourcemage.org>
 	* PRE_BUILD: removed obsolete libevent fix
 
diff --git a/http/firefox/patches/2000_system_harfbuzz.patch b/http/firefox/patches/2000_system_harfbuzz.patch
index f5d6fdd454..8a4b11b492 100644
--- a/http/firefox/patches/2000_system_harfbuzz.patch
+++ b/http/firefox/patches/2000_system_harfbuzz.patch
@@ -4,9 +4,15 @@ Add ability to use system-harfbuzz instead of bundled.
 
 https://bugzilla.mozilla.org/show_bug.cgi?id=847568
 
+diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1234,6 +1234,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+@@ -1228,16 +1228,23 @@ if CONFIG['OS_TARGET'] == 'Android':
+         'utils/TypeHelpers.h',
+         'utils/Unicode.h',
+         'utils/Vector.h',
+         'utils/VectorImpl.h',
+         'vr/gvr/capi/include/gvr_controller.h',
          'vr/gvr/capi/include/gvr.h',
      ]
  
@@ -20,9 +26,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  if CONFIG['MOZ_JACK']:
      system_headers += [
          'jack/jack.h',
+         'jack/statistics.h',
+     ]
+ 
+ if CONFIG['MOZ_SYSTEM_JPEG']:
+     system_headers += [
+diff --git a/dom/base/moz.build b/dom/base/moz.build
 --- a/dom/base/moz.build
 +++ b/dom/base/moz.build
-@@ -506,6 +506,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
+@@ -523,16 +523,19 @@ include('/ipc/chromium/chromium-config.m
+ FINAL_LIBRARY = 'xul'
+ 
+ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
+     DEFINES['HAVE_SIDEBAR'] = True
+ 
  if CONFIG['MOZ_X11']:
      CXXFLAGS += CONFIG['TK_CFLAGS']
  
@@ -32,9 +49,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  GENERATED_FILES += [
      'PropertyUseCounterMap.inc',
      'UseCounterList.h',
+ ]
+ 
+ countermap = GENERATED_FILES['PropertyUseCounterMap.inc']
+ countermap.script = 'gen-usecounters.py:property_map'
+ countermap.inputs = ['UseCounters.conf']
+diff --git a/gfx/moz.build b/gfx/moz.build
 --- a/gfx/moz.build
 +++ b/gfx/moz.build
-@@ -10,6 +10,9 @@ with Files('**'):
+@@ -7,16 +7,19 @@
+ with Files('**'):
+     BUG_COMPONENT = ('Core', 'Graphics')
+ with Files('wr/**'):
+     BUG_COMPONENT = ('Core', 'Graphics: WebRender')
+ 
  if CONFIG['MOZ_TREE_CAIRO']:
      DIRS += ['cairo']
  
@@ -44,17 +72,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  DIRS += [
      '2d',
      'ycbcr',
-@@ -19,7 +22,6 @@ DIRS += [
+     'angle',
+     'src',
+     'qcms',
      'gl',
      'layers',
-     'graphite2/src',
--    'harfbuzz/src',
-     'ots/src',
-     'thebes',
-     'ipc',
+diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
 --- a/gfx/skia/generate_mozbuild.py
 +++ b/gfx/skia/generate_mozbuild.py
-@@ -138,6 +138,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
+@@ -111,16 +111,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
+ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
+     CXXFLAGS += [
+         '-Wno-implicit-fallthrough',
+         '-Wno-inconsistent-missing-override',
+         '-Wno-macro-redefined',
          '-Wno-unused-private-field',
      ]
  
@@ -64,9 +95,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
      CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
      CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
+ 
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+ 
+ if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
+diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
 --- a/gfx/skia/moz.build
 +++ b/gfx/skia/moz.build
-@@ -818,6 +818,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
+@@ -488,16 +488,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
+ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
+     CXXFLAGS += [
+         '-Wno-implicit-fallthrough',
+         '-Wno-inconsistent-missing-override',
+         '-Wno-macro-redefined',
          '-Wno-unused-private-field',
      ]
  
@@ -76,9 +118,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
      CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
      CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
+ 
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+ 
+ if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
+diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
 --- a/gfx/thebes/moz.build
 +++ b/gfx/thebes/moz.build
-@@ -278,6 +278,9 @@ LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
+@@ -274,11 +274,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
+ 
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+ 
+ LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
  
  DEFINES['GRAPHITE2_STATIC'] = True
  
@@ -88,9 +141,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  if CONFIG['CC_TYPE'] == 'clang':
      # Suppress warnings from Skia header files.
      SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
+diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
 --- a/intl/unicharutil/util/moz.build
 +++ b/intl/unicharutil/util/moz.build
-@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
+@@ -20,9 +20,12 @@ UNIFIED_SOURCES += [
+     'ICUUtils.cpp',
+     'IrishCasing.cpp',
+     'nsBidiUtils.cpp',
+     'nsSpecialCasingData.cpp',
+     'nsUnicharUtils.cpp',
      'nsUnicodeProperties.cpp',
  ]
  
@@ -98,9 +157,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
  FINAL_LIBRARY = 'xul'
+diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
 --- a/netwerk/dns/moz.build
 +++ b/netwerk/dns/moz.build
-@@ -75,6 +75,9 @@ LOCAL_INCLUDES += [
+@@ -74,12 +74,15 @@ etld_data = GENERATED_FILES['etld_data.i
+ etld_data.script = 'prepare_tlds.py'
+ etld_data.inputs = ['effective_tld_names.dat']
+ 
+ # need to include etld_data.inc
+ LOCAL_INCLUDES += [
      '/netwerk/base',
  ]
  
@@ -110,11 +175,18 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  USE_LIBS += ['icu']
  
  if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+     CXXFLAGS += ['-Wno-error=shadow']
+diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -217,6 +217,9 @@ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- if CONFIG['MOZ_LIB_SECRET']:
-     OS_LIBS += CONFIG['MOZ_LIB_SECRET_LIBS']
+@@ -207,16 +207,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
+     OS_LIBS += [
+         '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'],
+         '-lgvr',
+     ]
+ 
+ OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
+ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
  
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
@@ -122,9 +194,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  if CONFIG['MOZ_SYSTEM_JPEG']:
      OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
  
+ if CONFIG['MOZ_SYSTEM_PNG']:
+     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
+ 
+ if CONFIG['MOZ_SYSTEM_WEBP']:
+     OS_LIBS += CONFIG['MOZ_WEBP_LIBS']
+diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -340,6 +340,16 @@ def freetype2_combined_info(fontconfig_info, freetype2_info):
+@@ -377,16 +377,26 @@ def freetype2_combined_info(fontconfig_i
+     return namespace(
+         cflags=freetype2_info.cflags + fontconfig_info.cflags,
+         libs=freetype2_info.libs + fontconfig_info.libs,
+     )
+ 
  add_old_configure_assignment('_HAVE_FREETYPE2',
                               depends_if(freetype2_info)(lambda _: True))
  
@@ -141,3 +224,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  # Apple platform decoder support
  # ==============================================================
  @depends(toolkit)
+ def applemedia(toolkit):
+     if toolkit in ('cocoa', 'uikit'):
+         return True
+ 
+ set_config('MOZ_APPLEMEDIA', applemedia)
diff --git a/http/firefox/patches/2001_system_graphite2.patch b/http/firefox/patches/2001_system_graphite2.patch
index 555566fa3d..bb3753441a 100644
--- a/http/firefox/patches/2001_system_graphite2.patch
+++ b/http/firefox/patches/2001_system_graphite2.patch
@@ -4,9 +4,15 @@ Allow building against system-wide graphite2.
 
 https://bugzilla.mozilla.org/show_bug.cgi?id=847568
 
+diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1241,6 +1241,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+@@ -1235,16 +1235,22 @@ if CONFIG['OS_TARGET'] == 'Android':
+ 
+ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+     system_headers += [
+ 	'harfbuzz/hb-glib.h',
+ 	'harfbuzz/hb-ot.h',
  	'harfbuzz/hb.h',
      ]
  
@@ -19,9 +25,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  if CONFIG['MOZ_JACK']:
      system_headers += [
          'jack/jack.h',
+         'jack/statistics.h',
+     ]
+ 
+ if CONFIG['MOZ_SYSTEM_JPEG']:
+     system_headers += [
+diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
 --- a/gfx/graphite2/moz-gr-update.sh
 +++ b/gfx/graphite2/moz-gr-update.sh
-@@ -1,6 +1,7 @@
+@@ -1,11 +1,12 @@
  #!/bin/bash
  
  # Script used to update the Graphite2 library in the mozilla source tree
@@ -29,7 +41,17 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  
  # This script lives in gfx/graphite2, along with the library source,
  # but must be run from the top level of the mozilla-central tree.
-@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
+ 
+ # Run as
+ #
+ #    ./gfx/graphite2/moz-gr-update.sh RELEASE
+ #
+@@ -32,22 +33,26 @@ echo "This directory contains the Graphi
+ echo "$TARBALL" >> gfx/graphite2/README.mozilla
+ echo ""
+ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
+ 
+ # fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h)
  #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  
@@ -47,9 +69,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  
  echo
  echo If gfx/graphite2/src/files.mk has changed, please make corresponding
+ echo changes to gfx/graphite2/src/moz.build
+ echo
+ 
+ echo
+ echo Now use hg commands to create a patch for the mozilla tree.
+diff --git a/gfx/moz.build b/gfx/moz.build
 --- a/gfx/moz.build
 +++ b/gfx/moz.build
-@@ -10,6 +10,9 @@ with Files('**'):
+@@ -7,16 +7,19 @@
+ with Files('**'):
+     BUG_COMPONENT = ('Core', 'Graphics')
+ with Files('wr/**'):
+     BUG_COMPONENT = ('Core', 'Graphics: WebRender')
+ 
  if CONFIG['MOZ_TREE_CAIRO']:
      DIRS += ['cairo']
  
@@ -59,17 +92,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
      DIRS += ['harfbuzz/src']
  
-@@ -21,7 +24,6 @@ DIRS += [
-     'qcms',
-     'gl',
-     'layers',
--    'graphite2/src',
-     'ots/src',
-     'thebes',
-     'ipc',
+ DIRS += [
+     '2d',
+     'ycbcr',
+     'angle',
+     'src',
+diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
 --- a/gfx/thebes/moz.build
 +++ b/gfx/thebes/moz.build
-@@ -276,7 +276,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+@@ -272,16 +272,19 @@ CFLAGS += CONFIG['TK_CFLAGS']
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
+     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
+ 
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
  
  LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
  
@@ -81,13 +117,22 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  
  if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
      CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+ 
+ if CONFIG['CC_TYPE'] == 'clang':
+     # Suppress warnings from Skia header files.
+     SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
+diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -3645,6 +3645,27 @@ if test "$USE_FC_FREETYPE"; then
+@@ -2690,16 +2690,37 @@ if test "$USE_FC_FREETYPE"; then
+         CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS"
+         MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], ,
+             [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)], [#include <fontconfig/fontconfig.h>])
+         CPPFLAGS="$_SAVE_CPPFLAGS"
      fi
  fi
  
-+dnl ========================================================
+ dnl ========================================================
 +dnl Check for graphite2
 +dnl ========================================================
 +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
@@ -108,14 +153,26 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
 +    CFLAGS=$_SAVE_CFLAGS
 +fi
 +
- dnl ========================================================
++dnl ========================================================
  dnl Check if we need the 32-bit Linux SSE2 error dialog
  dnl ========================================================
+ 
+ AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
+ 
+ dnl ========================================================
+ dnl Check for pixman and cairo
+ dnl ========================================================
+diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -217,6 +217,9 @@ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- if CONFIG['MOZ_LIB_SECRET']:
-     OS_LIBS += CONFIG['MOZ_LIB_SECRET_LIBS']
+@@ -207,16 +207,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
+     OS_LIBS += [
+         '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'],
+         '-lgvr',
+     ]
+ 
+ OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
+ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
  
 +if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
 +    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
@@ -123,9 +180,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
      OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
  
+ if CONFIG['MOZ_SYSTEM_JPEG']:
+     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
+ 
+ if CONFIG['MOZ_SYSTEM_PNG']:
+     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
+diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -340,6 +340,20 @@ def freetype2_combined_info(fontconfig_info, freetype2_info):
+@@ -377,16 +377,30 @@ def freetype2_combined_info(fontconfig_i
+     return namespace(
+         cflags=freetype2_info.cflags + fontconfig_info.cflags,
+         libs=freetype2_info.libs + fontconfig_info.libs,
+     )
+ 
  add_old_configure_assignment('_HAVE_FREETYPE2',
                               depends_if(freetype2_info)(lambda _: True))
  
@@ -146,3 +214,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
  # HarfBuzz
  # ==============================================================
  option('--with-system-harfbuzz',
+        help="Use system harfbuzz (located with pkgconfig)")
+ 
+ system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.3.1',
+                                     when='--with-system-harfbuzz')
+