CVS commit: pkgsrc/www/firefox60

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/firefox60
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Tue, 26 Feb 2019 11:23:54 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Feb 26 11:23:53 UTC 2019

Modified Files:
        pkgsrc/www/firefox60: Makefile distinfo mozilla-common.mk
        pkgsrc/www/firefox60/patches: patch-dom_media_CubebUtils.cpp
            patch-ipc_chromium_src_base_message__pump__libevent.cc
            patch-ipc_chromium_src_base_platform__thread__posix.cc
            patch-ipc_glue_CrossProcessSemaphore__posix.cpp
            patch-js_src_gc_Memory.cpp patch-js_src_util_NativeStack.cpp
            patch-js_src_wasm_WasmSignalHandlers.cpp
            patch-toolkit_xre_glxtest.cpp patch-xpcom_base_nscore.h
            patch-xpcom_build_BinaryPath.h
Removed Files:
        pkgsrc/www/firefox60/patches: patch-image_decoders_nsJPEGDecoder.cpp
            patch-media_libyuv_libyuv_source_mjpeg__decoder.cc

Log Message:
Update to 60.5.2

Changelog:
60.5.2
Fixed a frequent crash when reading various Reuters news articles (bug 1505844)

60.5.1
#CVE-2018-18356: Use-after-free in Skia
#CVE-2019-5785: Integer overflow in Skia
#CVE-2018-18335: Buffer overflow in Skia with accelerated Canvas 2D

60.5.0
#CVE-2018-18500: Use-after-free parsing HTML5 stream
#CVE-2018-18505: Privilege escalation through IPC channel messages
#CVE-2018-18501: Memory safety bugs fixed in Firefox 65 and Firefox ESR 60.5


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/firefox60/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/firefox60/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/firefox60/mozilla-common.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox60/patches/patch-dom_media_CubebUtils.cpp \
    pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc \
    pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc \
    pkgsrc/www/firefox60/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp \
    pkgsrc/www/firefox60/patches/patch-js_src_gc_Memory.cpp \
    pkgsrc/www/firefox60/patches/patch-js_src_util_NativeStack.cpp \
    pkgsrc/www/firefox60/patches/patch-js_src_wasm_WasmSignalHandlers.cpp \
    pkgsrc/www/firefox60/patches/patch-toolkit_xre_glxtest.cpp \
    pkgsrc/www/firefox60/patches/patch-xpcom_base_nscore.h \
    pkgsrc/www/firefox60/patches/patch-xpcom_build_BinaryPath.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/firefox60/patches/patch-image_decoders_nsJPEGDecoder.cpp \
    pkgsrc/www/firefox60/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox60/Makefile
diff -u pkgsrc/www/firefox60/Makefile:1.13 pkgsrc/www/firefox60/Makefile:1.14
--- pkgsrc/www/firefox60/Makefile:1.13  Tue Jan 29 22:33:58 2019
+++ pkgsrc/www/firefox60/Makefile       Tue Feb 26 11:23:53 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2019/01/29 22:33:58 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2019/02/26 11:23:53 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            60.4
-MOZ_BRANCH_MINOR=      .0esr
+MOZ_BRANCH=            60.5
+MOZ_BRANCH_MINOR=      .2esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}

Index: pkgsrc/www/firefox60/distinfo
diff -u pkgsrc/www/firefox60/distinfo:1.4 pkgsrc/www/firefox60/distinfo:1.5
--- pkgsrc/www/firefox60/distinfo:1.4   Sun Dec 16 07:38:47 2018
+++ pkgsrc/www/firefox60/distinfo       Tue Feb 26 11:23:53 2019
@@ -1,28 +1,27 @@
-$NetBSD: distinfo,v 1.4 2018/12/16 07:38:47 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2019/02/26 11:23:53 ryoon Exp $
 
-SHA1 (firefox-60.4.0esr.source.tar.xz) = 0fa5a71ce2cb90ea4be719a92645aa09dff3721f
-RMD160 (firefox-60.4.0esr.source.tar.xz) = f0b67654864aadb454923cd1ac9abffe0ac20c7c
-SHA512 (firefox-60.4.0esr.source.tar.xz) = 8119f52b2fc06f76868bf0781fec9d46c8551f0a3ca832ac9bdef6aa6d77c1d785e50d35059f0df5e3586f3396b912af06e448d65e7f5d1f468338eebe8b2cd4
-Size (firefox-60.4.0esr.source.tar.xz) = 268425148 bytes
+SHA1 (firefox-60.5.2esr.source.tar.xz) = a6fd649d5a9e3943fb3e67a5e45f856a154b0483
+RMD160 (firefox-60.5.2esr.source.tar.xz) = ba8bb525e8a307c97f4ec4b1e20ab14781a83097
+SHA512 (firefox-60.5.2esr.source.tar.xz) = 5be7e5aefcd038b83a6859004042e796fee5adb48d1a010547ba5fb6eb9c69b11267d56ae9f55ea8f9e7859ea8d600fb93e03e3712f6f9c023370b53c0f5efcd
+Size (firefox-60.5.2esr.source.tar.xz) = 268056844 bytes
 SHA1 (patch-aa) = fdabcc9b055f6439fdbda9b38ab7cec08ff3e231
 SHA1 (patch-browser_app_profile_firefox.js) = 9a43095d94f83f315b9a3ce4a7b0a4301e9c40e6
 SHA1 (patch-build_moz.configure_old.configure) = 1df6867eaf73a350fbe8fcd5bd34e1fcab09d707
 SHA1 (patch-build_moz.configure_rust.configure) = 2818454ba4df3cbd85174edc4828206b3bf0a82b
 SHA1 (patch-dom_fetch_FetchConsumer.cpp) = a164b68b968633e2f2e29c1c3917a77ac55a886b
-SHA1 (patch-dom_media_CubebUtils.cpp) = 3632cd0dd4b95f53f01050b8898b33fe198916b6
+SHA1 (patch-dom_media_CubebUtils.cpp) = 76fc35167e603f96450f4bc17cd0d76157a22dd3
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = f1d0adae2873545818072adb4e8599267bc4e6c5
 SHA1 (patch-gfx_webrender_src_query.rs) = 6434b0fc1d6441ddb555a2a3b199564b488ec336
-SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ed86c3fbb3aef753eec6f6a97940594aac5f3f2f
 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = 16e37fe54ba1d8d233f6b04dbd06e248305d7f6e
-SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 99b9f3f9dd88f1c8008d2fb6058450695394f5cf
-SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 5b0bfe78e105cc3f395d5afda25a50afc6289f03
+SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = cdb159f0ede970b150eca4cc5e0d1b2cf4e414b2
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 0809f1b12d3627e36cd32dce46a332abd7a74e6b
 SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 778a569887d8ad082abc2fa2fe89a0a943e84d64
-SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 3052338871447cedaeafe8369afe82233183c884
+SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 8775f39cdf91f61754474dde79f3895658348b02
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
-SHA1 (patch-js_src_gc_Memory.cpp) = 40d8285d3f5a060e68a2884dd81b39950f45ff95
+SHA1 (patch-js_src_gc_Memory.cpp) = b27f68d31f584052dfb8a2d3132efc844c52c8e4
 SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa
-SHA1 (patch-js_src_util_NativeStack.cpp) = c02781c07942d2aa037d5123cc09cb73d5e73316
-SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = 1c665a9383638774c00f6c5fead5d786b6c7944a
+SHA1 (patch-js_src_util_NativeStack.cpp) = 3af7d3c90ce9299f0a95b938ca903488e7809d0a
+SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = 5442266a05721a9f4a3c9d12429bd1d59ecd936a
 SHA1 (patch-media_libcubeb_gtest_moz.build) = 921a001726cda9e9782df5e59ae02b19d76ef47e
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 1b1b8d57eb710cad13518ded79a0ddee2681881b
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 3ee36f58bb525767c7d2b9e814ba4ccaa4868717
@@ -30,7 +29,6 @@ SHA1 (patch-media_libcubeb_src_cubeb__os
 SHA1 (patch-media_libcubeb_src_moz.build) = f243068c8908dcb16434221edef8c65db3bb0c83
 SHA1 (patch-media_libcubeb_update.sh) = 3a322de06bbe9aafba9da349954ef022bd094992
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
-SHA1 (patch-media_libyuv_libyuv_source_mjpeg__decoder.cc) = 8a264c439fa4749cd7c5acf96e1ae3f9bae0a886
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc) = 91e8ce496c1f4dbbd0a463d83cb033afd1de3f49
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 0141dd1372c13ea1fce6e2f5ffb65e0cb0f3a13e
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = a69bc7b7096b410582e725f9dbec57fee90d6686
@@ -40,7 +38,7 @@ SHA1 (patch-toolkit_components_terminato
 SHA1 (patch-toolkit_library_moz.build) = ecb6125e996d5496335c58ecd3433ad3214f29f0
 SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 6f557fb732f0b9dabf059ffac0400d3db4e79e47
-SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
-SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
-SHA1 (patch-xpcom_build_BinaryPath.h) = 65af561d663d605134ff2b6c51a268b525f6ac15
+SHA1 (patch-toolkit_xre_glxtest.cpp) = e02b1073fe1a6f36872b10883455c8be59ff81e9
+SHA1 (patch-xpcom_base_nscore.h) = 3f131370b9665a0af55cab7f8f54723ebbc389fa
+SHA1 (patch-xpcom_build_BinaryPath.h) = fcaca939aca30a4ae07414cd5e6b1497ac3a1178
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239

Index: pkgsrc/www/firefox60/mozilla-common.mk
diff -u pkgsrc/www/firefox60/mozilla-common.mk:1.2 pkgsrc/www/firefox60/mozilla-common.mk:1.3
--- pkgsrc/www/firefox60/mozilla-common.mk:1.2  Tue Oct 23 12:33:04 2018
+++ pkgsrc/www/firefox60/mozilla-common.mk      Tue Feb 26 11:23:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.2 2018/10/23 12:33:04 jperkin Exp $
+# $NetBSD: mozilla-common.mk,v 1.3 2019/02/26 11:23:53 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -66,14 +66,14 @@ CONFIGURE_ARGS+=    --enable-system-ffi
 CONFIGURE_ARGS+=       --with-system-icu
 CONFIGURE_ARGS+=       --with-system-nss
 CONFIGURE_ARGS+=       --with-system-nspr
-CONFIGURE_ARGS+=       --with-system-jpeg
+#CONFIGURE_ARGS+=      --with-system-jpeg
 CONFIGURE_ARGS+=       --with-system-zlib
 CONFIGURE_ARGS+=       --with-system-bz2
 CONFIGURE_ARGS+=       --with-system-libevent=${BUILDLINK_PREFIX.libevent}
 CONFIGURE_ARGS+=       --disable-crashreporter
 CONFIGURE_ARGS+=       --disable-necko-wifi
 CONFIGURE_ARGS+=       --enable-chrome-format=flat
-CONFIGURE_ARGS+=       --disable-libjpeg-turbo
+#CONFIGURE_ARGS+=      --disable-libjpeg-turbo
 
 CONFIGURE_ARGS+=       --disable-gconf
 #CONFIGURE_ARGS+=      --enable-readline
@@ -196,7 +196,7 @@ BUILDLINK_API_DEPENDS.nspr+=        nspr>=4.18
 BUILDLINK_API_DEPENDS.nss+=    nss>=3.35
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+#.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 #BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
 #.include "../../graphics/cairo/buildlink3.mk"

Index: pkgsrc/www/firefox60/patches/patch-dom_media_CubebUtils.cpp
diff -u pkgsrc/www/firefox60/patches/patch-dom_media_CubebUtils.cpp:1.1 pkgsrc/www/firefox60/patches/patch-dom_media_CubebUtils.cpp:1.2
--- pkgsrc/www/firefox60/patches/patch-dom_media_CubebUtils.cpp:1.1     Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-dom_media_CubebUtils.cpp Tue Feb 26 11:23:53 2019
@@ -1,14 +1,13 @@
-$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
---- dom/media/CubebUtils.cpp.orig      2017-04-11 04:15:21.000000000 +0000
+--- dom/media/CubebUtils.cpp.orig      2019-02-13 14:19:37.000000000 +0000
 +++ dom/media/CubebUtils.cpp
-@@ -71,7 +71,8 @@ const char* AUDIOSTREAM_BACKEND_ID_STR[]
-   "sndio",
-   "opensl",
-   "audiotrack",
--  "kai"
-+  "kai",
-+  "oss",
- };
+@@ -143,7 +143,7 @@ const char kBrandBundleURL[] = "chrome:/
+ 
+ const char* AUDIOSTREAM_BACKEND_ID_STR[] = {
+     "jack",  "pulse",       "alsa",  "audiounit", "audioqueue", "wasapi",
+-    "winmm", "directsound", "sndio", "opensl",    "audiotrack", "kai"};
++    "winmm", "directsound", "sndio", "opensl",    "audiotrack", "kai", "oss"};
  /* Index for failures to create an audio stream the first time. */
  const int CUBEB_BACKEND_INIT_FAILURE_FIRST =
+     ArrayLength(AUDIOSTREAM_BACKEND_ID_STR);
Index: pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc
diff -u pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc:1.1 pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc:1.2
--- pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc:1.1     Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc Tue Feb 26 11:23:53 2019
@@ -1,21 +1,19 @@
-$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
-Allow older libevent
-
---- ipc/chromium/src/base/message_pump_libevent.cc.orig        2017-02-27 08:10:53.000000000 -0800
-+++ ipc/chromium/src/base/message_pump_libevent.cc     2017-03-07 14:06:51.000000000 -0800
+--- ipc/chromium/src/base/message_pump_libevent.cc.orig        2019-02-13 14:19:38.000000000 +0000
++++ ipc/chromium/src/base/message_pump_libevent.cc
 @@ -22,6 +22,7 @@
  
  // This macro checks that the _EVENT_SIZEOF_* constants defined in
  // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct.
 +#if 0
  #if defined(_EVENT_SIZEOF_SHORT)
- #define CHECK_EVENT_SIZEOF(TYPE, type) \
-     static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \
-@@ -40,6 +41,7 @@ CHECK_EVENT_SIZEOF(PTHREAD_T, pthread_t)
- CHECK_EVENT_SIZEOF(SHORT,     short);
- CHECK_EVENT_SIZEOF(SIZE_T,    size_t);
- CHECK_EVENT_SIZEOF(VOID_P,    void*);
+ #define CHECK_EVENT_SIZEOF(TYPE, type)                \
+   static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \
+@@ -41,6 +42,7 @@ CHECK_EVENT_SIZEOF(PTHREAD_T, pthread_t)
+ CHECK_EVENT_SIZEOF(SHORT, short);
+ CHECK_EVENT_SIZEOF(SIZE_T, size_t);
+ CHECK_EVENT_SIZEOF(VOID_P, void*);
 +#endif
  
  // Lifecycle of struct event
Index: pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
diff -u pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc:1.1 pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc:1.2
--- pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc:1.1     Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc Tue Feb 26 11:23:53 2019
@@ -1,9 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
-* Support NetBSD
-* Support Solaris (we can't rely on pthread_setname_np so ignore it).
-
---- ipc/chromium/src/base/platform_thread_posix.cc.orig        2018-06-05 19:47:29.000000000 +0000
+--- ipc/chromium/src/base/platform_thread_posix.cc.orig        2019-02-13 14:19:38.000000000 +0000
 +++ ipc/chromium/src/base/platform_thread_posix.cc
 @@ -12,7 +12,9 @@
  #if defined(OS_MACOSX)
@@ -15,8 +12,8 @@ $NetBSD: patch-ipc_chromium_src_base_pla
  #elif defined(OS_LINUX)
  #include <sys/syscall.h>
  #include <sys/prctl.h>
-@@ -103,7 +105,7 @@ void PlatformThread::SetName(const char*
-   pthread_setname_np(pthread_self(), "%s", (void *)name);
+@@ -100,7 +102,7 @@ void PlatformThread::SetName(const char*
+   pthread_setname_np(pthread_self(), "%s", (void*)name);
  #elif defined(OS_BSD) && !defined(__GLIBC__)
    pthread_set_name_np(pthread_self(), name);
 -#elif defined(OS_SOLARIS)
Index: pkgsrc/www/firefox60/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp
diff -u pkgsrc/www/firefox60/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.1 pkgsrc/www/firefox60/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.2
--- pkgsrc/www/firefox60/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.1    Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp        Tue Feb 26 11:23:53 2019
@@ -1,9 +1,6 @@
-$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
-- avoid use of sem_t on NetBSD
-  http://mail-index.netbsd.org/pkgsrc-bugs/2017/06/23/msg062225.html
-
---- ipc/glue/CrossProcessSemaphore_posix.cpp.orig      2017-09-14 20:16:01.000000000 +0000
+--- ipc/glue/CrossProcessSemaphore_posix.cpp.orig      2019-02-13 14:19:38.000000000 +0000
 +++ ipc/glue/CrossProcessSemaphore_posix.cpp
 @@ -9,6 +9,11 @@
  #include "nsDebug.h"
@@ -17,8 +14,8 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
  
  static const uint64_t kNsPerMs = 1000000;
  static const uint64_t kNsPerSec = 1000000000;
-@@ -17,7 +22,13 @@ namespace {
- 
+@@ -16,7 +21,13 @@ static const uint64_t kNsPerSec = 100000
+ namespace {
  
  struct SemaphoreData {
 +#if defined(__NetBSD__)
@@ -31,7 +28,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
    mozilla::Atomic<int32_t> mRefCount;
    uint32_t mInitialValue;
  };
-@@ -44,13 +55,27 @@ CrossProcessSemaphore::Create(const char
+@@ -42,13 +53,27 @@ namespace mozilla {
      return nullptr;
    }
  
@@ -59,7 +56,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
    sem->mRefCount = &data->mRefCount;
    *sem->mRefCount = 1;
  
-@@ -84,24 +109,44 @@ CrossProcessSemaphore::Create(CrossProce
+@@ -83,23 +108,44 @@ namespace mozilla {
  
    int32_t oldCount = data->mRefCount++;
    if (oldCount == 0) {
@@ -92,19 +89,20 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
    return sem;
  }
  
- 
  CrossProcessSemaphore::CrossProcessSemaphore()
+-    : mSemaphore(nullptr), mRefCount(nullptr) {
 +#if defined(__NetBSD__)
-+  : mMutex (nullptr)
-+  , mNotZero (nullptr)
-+  , mValue (nullptr)
++    : mMutex (nullptr)
++    , mNotZero (nullptr)
++    , mValue (nullptr)
 +#else
-   : mSemaphore(nullptr)
++    : mSemaphore(nullptr)
 +#endif
-   , mRefCount(nullptr)
- {
++    , mRefCount(nullptr) {
    MOZ_COUNT_CTOR(CrossProcessSemaphore);
-@@ -113,17 +158,58 @@ CrossProcessSemaphore::~CrossProcessSema
+ }
+ 
+@@ -108,16 +154,57 @@ CrossProcessSemaphore::~CrossProcessSema
  
    if (oldCount == 0) {
      // Nothing can be done if the destroy fails so ignore return code.
@@ -137,10 +135,9 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
 +}
 +#endif
 +
- bool
- CrossProcessSemaphore::Wait(const Maybe<TimeDuration>& aWaitTime)
- {
-   MOZ_ASSERT(*mRefCount > 0, "Attempting to wait on a semaphore with zero ref count");
+ bool CrossProcessSemaphore::Wait(const Maybe<TimeDuration>& aWaitTime) {
+   MOZ_ASSERT(*mRefCount > 0,
+              "Attempting to wait on a semaphore with zero ref count");
    int ret;
 +#if defined(__NetBSD__)
 +  struct timespec ts = makeAbsTime(aWaitTime);
@@ -163,7 +160,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
    if (aWaitTime.isSome()) {
      struct timespec ts;
      if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
-@@ -140,6 +226,7 @@ CrossProcessSemaphore::Wait(const Maybe<
+@@ -134,13 +221,24 @@ bool CrossProcessSemaphore::Wait(const M
      while ((ret = sem_wait(mSemaphore)) == -1 && errno == EINTR) {
      }
    }
@@ -171,10 +168,9 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
    return ret == 0;
  }
  
-@@ -147,7 +234,17 @@ void
- CrossProcessSemaphore::Signal()
- {
-   MOZ_ASSERT(*mRefCount > 0, "Attempting to signal a semaphore with zero ref count");
+ void CrossProcessSemaphore::Signal() {
+   MOZ_ASSERT(*mRefCount > 0,
+              "Attempting to signal a semaphore with zero ref count");
 +#if defined(__NetBSD__)
 +  int ret;
 +  ret = pthread_mutex_lock(mMutex);
@@ -188,4 +184,4 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
 +#endif
  }
  
- CrossProcessSemaphoreHandle
+ CrossProcessSemaphoreHandle CrossProcessSemaphore::ShareToProcess(
Index: pkgsrc/www/firefox60/patches/patch-js_src_gc_Memory.cpp
diff -u pkgsrc/www/firefox60/patches/patch-js_src_gc_Memory.cpp:1.1 pkgsrc/www/firefox60/patches/patch-js_src_gc_Memory.cpp:1.2
--- pkgsrc/www/firefox60/patches/patch-js_src_gc_Memory.cpp:1.1 Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-js_src_gc_Memory.cpp     Tue Feb 26 11:23:53 2019
@@ -1,23 +1,22 @@
-$NetBSD: patch-js_src_gc_Memory.cpp,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-js_src_gc_Memory.cpp,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
-Support SunOS/x86_64.
-
---- js/src/gc/Memory.cpp.orig  2018-06-05 19:47:29.000000000 +0000
+--- js/src/gc/Memory.cpp.orig  2019-02-13 14:19:38.000000000 +0000
 +++ js/src/gc/Memory.cpp
-@@ -504,6 +504,7 @@ MapMemoryAt(void* desired, size_t length
- {
+@@ -419,6 +419,7 @@ static inline void* MapMemoryAt(void* de
+                                 off_t offset = 0) {
  
- #if defined(__ia64__) || defined(__aarch64__) || \
+ #if defined(__ia64__) || defined(__aarch64__) ||  \
 +    (defined(__sun) && defined(__x86_64__)) || \
-     (defined(__sparc__) && defined(__arch64__) && (defined(__NetBSD__) || defined(__linux__)))
-     MOZ_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0);
- #endif
-@@ -554,7 +555,7 @@ MapMemory(size_t length, int prot = PROT
-         return nullptr;
-     }
-     return region;
--#elif defined(__aarch64__) || (defined(__sparc__) && defined(__arch64__) && defined(__linux__))
-+#elif defined(__aarch64__) || (defined(__sparc__) && defined(__arch64__) && defined(__linux__)) || (defined(__sun) && defined(__x86_64__))
-    /*
-     * There might be similar virtual address issue on arm64 which depends on
-     * hardware and kernel configurations. But the work around is slightly
+     (defined(__sparc__) && defined(__arch64__) && \
+      (defined(__NetBSD__) || defined(__linux__)))
+   MOZ_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0);
+@@ -468,7 +469,8 @@ static inline void* MapMemory(size_t len
+   }
+   return region;
+ #elif defined(__aarch64__) || \
+-    (defined(__sparc__) && defined(__arch64__) && defined(__linux__))
++    (defined(__sparc__) && defined(__arch64__) && defined(__linux__)) || \
++    (defined(__sun) && defined(__x86_64__))
+   /*
+    * There might be similar virtual address issue on arm64 which depends on
+    * hardware and kernel configurations. But the work around is slightly
Index: pkgsrc/www/firefox60/patches/patch-js_src_util_NativeStack.cpp
diff -u pkgsrc/www/firefox60/patches/patch-js_src_util_NativeStack.cpp:1.1 pkgsrc/www/firefox60/patches/patch-js_src_util_NativeStack.cpp:1.2
--- pkgsrc/www/firefox60/patches/patch-js_src_util_NativeStack.cpp:1.1  Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-js_src_util_NativeStack.cpp      Tue Feb 26 11:23:53 2019
@@ -1,11 +1,9 @@
-$NetBSD: patch-js_src_util_NativeStack.cpp,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-js_src_util_NativeStack.cpp,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
-Support SunOS.
-
---- js/src/util/NativeStack.cpp.orig   2018-06-05 19:47:32.000000000 +0000
+--- js/src/util/NativeStack.cpp.orig   2019-02-13 14:19:39.000000000 +0000
 +++ js/src/util/NativeStack.cpp
-@@ -32,7 +32,7 @@ js::GetNativeStackBaseImpl()
-     return static_cast<void*>(pTib->StackBase);
+@@ -30,7 +30,7 @@ void* js::GetNativeStackBaseImpl() {
+   return static_cast<void*>(pTib->StackBase);
  }
  
 -#elif defined(SOLARIS)
@@ -13,11 +11,11 @@ Support SunOS.
  
  #include <ucontext.h>
  
-@@ -78,6 +78,7 @@ js::GetNativeStackBaseImpl()
- #  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
-     /* e.g. on FreeBSD 4.8 or newer, neundorf%kde.org@localhost */
-     pthread_attr_get_np(thread, &sattr);
-+#  elif defined(__sun)
- #  else
-     /*
-      * FIXME: this function is non-portable;
+@@ -69,6 +69,7 @@ void* js::GetNativeStackBaseImpl() {
+ #elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
+   /* e.g. on FreeBSD 4.8 or newer, neundorf%kde.org@localhost */
+   pthread_attr_get_np(thread, &sattr);
++#elif defined(__sun)
+ #else
+   /*
+    * FIXME: this function is non-portable;
Index: pkgsrc/www/firefox60/patches/patch-js_src_wasm_WasmSignalHandlers.cpp
diff -u pkgsrc/www/firefox60/patches/patch-js_src_wasm_WasmSignalHandlers.cpp:1.1 pkgsrc/www/firefox60/patches/patch-js_src_wasm_WasmSignalHandlers.cpp:1.2
--- pkgsrc/www/firefox60/patches/patch-js_src_wasm_WasmSignalHandlers.cpp:1.1   Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-js_src_wasm_WasmSignalHandlers.cpp       Tue Feb 26 11:23:53 2019
@@ -1,14 +1,12 @@
-$NetBSD: patch-js_src_wasm_WasmSignalHandlers.cpp,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-js_src_wasm_WasmSignalHandlers.cpp,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
-Support SunOS.
-
---- js/src/wasm/WasmSignalHandlers.cpp.orig    2018-06-05 19:47:32.000000000 +0000
+--- js/src/wasm/WasmSignalHandlers.cpp.orig    2019-02-13 14:19:40.000000000 +0000
 +++ js/src/wasm/WasmSignalHandlers.cpp
-@@ -135,6 +135,7 @@ struct AutoSignalHandler
- #  define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP])
- #  define ESP_sig(p) ((p)->uc_mcontext.gregs[REG_ESP])
- # else
-+#  include <sys/regset.h>
- #  define XMM_sig(p,i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i])
- #  define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC])
- #  define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP])
+@@ -133,6 +133,7 @@ struct AutoSignalHandler {
+ #define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP])
+ #define ESP_sig(p) ((p)->uc_mcontext.gregs[REG_ESP])
+ #else
++#include <sys/regset.h>
+ #define XMM_sig(p, i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i])
+ #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC])
+ #define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP])
Index: pkgsrc/www/firefox60/patches/patch-toolkit_xre_glxtest.cpp
diff -u pkgsrc/www/firefox60/patches/patch-toolkit_xre_glxtest.cpp:1.1 pkgsrc/www/firefox60/patches/patch-toolkit_xre_glxtest.cpp:1.2
--- pkgsrc/www/firefox60/patches/patch-toolkit_xre_glxtest.cpp:1.1      Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-toolkit_xre_glxtest.cpp  Tue Feb 26 11:23:53 2019
@@ -1,16 +1,13 @@
-$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
-Fix libGL filename on NetBSD,
-see https://bugzilla.mozilla.org/show_bug.cgi?id=1180498
-
---- toolkit/xre/glxtest.cpp.orig       2015-07-04 20:26:15.000000000 +0200
-+++ toolkit/xre/glxtest.cpp    2015-07-04 20:26:15.000000000 +0200
-@@ -124,7 +124,7 @@ void glxtest()
-     fatal_error("The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined");
+--- toolkit/xre/glxtest.cpp.orig       2019-02-13 14:19:45.000000000 +0000
++++ toolkit/xre/glxtest.cpp
+@@ -116,7 +116,7 @@ void glxtest() {
+         "The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined");
  
-   ///// Open libGL and load needed symbols /////
+     ///// Open libGL and load needed symbols /////
 -#ifdef __OpenBSD__
 +#if defined(__OpenBSD__) || defined(__NetBSD__)
-   #define LIBGL_FILENAME "libGL.so"
+ #define LIBGL_FILENAME "libGL.so"
  #else
-   #define LIBGL_FILENAME "libGL.so.1"
+ #define LIBGL_FILENAME "libGL.so.1"
Index: pkgsrc/www/firefox60/patches/patch-xpcom_base_nscore.h
diff -u pkgsrc/www/firefox60/patches/patch-xpcom_base_nscore.h:1.1 pkgsrc/www/firefox60/patches/patch-xpcom_base_nscore.h:1.2
--- pkgsrc/www/firefox60/patches/patch-xpcom_base_nscore.h:1.1  Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-xpcom_base_nscore.h      Tue Feb 26 11:23:53 2019
@@ -1,15 +1,13 @@
-$NetBSD: patch-xpcom_base_nscore.h,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-xpcom_base_nscore.h,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
-* Support llvm/clang
-
---- xpcom/base/nscore.h.orig   2014-05-29 23:31:50.000000000 +0000
+--- xpcom/base/nscore.h.orig   2019-02-13 14:19:45.000000000 +0000
 +++ xpcom/base/nscore.h
-@@ -114,7 +114,7 @@
+@@ -76,7 +76,7 @@
   *           NS_HIDDEN_(int) NS_FASTCALL func2(char *foo);
   */
  
 -#if defined(__i386__) && defined(__GNUC__)
 +#if defined(__i386__) && defined(__GNUC__) && !(defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ == 0)
- #define NS_FASTCALL __attribute__ ((regparm (3), stdcall))
- #define NS_CONSTRUCTOR_FASTCALL __attribute__ ((regparm (3), stdcall))
+ #define NS_FASTCALL __attribute__((regparm(3), stdcall))
+ #define NS_CONSTRUCTOR_FASTCALL __attribute__((regparm(3), stdcall))
  #elif defined(XP_WIN) && !defined(_WIN64)
Index: pkgsrc/www/firefox60/patches/patch-xpcom_build_BinaryPath.h
diff -u pkgsrc/www/firefox60/patches/patch-xpcom_build_BinaryPath.h:1.1 pkgsrc/www/firefox60/patches/patch-xpcom_build_BinaryPath.h:1.2
--- pkgsrc/www/firefox60/patches/patch-xpcom_build_BinaryPath.h:1.1     Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-xpcom_build_BinaryPath.h Tue Feb 26 11:23:53 2019
@@ -1,11 +1,9 @@
-$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.2 2019/02/26 11:23:53 ryoon Exp $
 
-* Fix build under netbsd-7, PR pkg/52956
-
---- xpcom/build/BinaryPath.h.orig      2018-01-11 20:17:07.000000000 +0000
+--- xpcom/build/BinaryPath.h.orig      2019-02-13 14:19:45.000000000 +0000
 +++ xpcom/build/BinaryPath.h
-@@ -22,7 +22,8 @@
-     defined(__OpenBSD__)
+@@ -21,7 +21,8 @@
+     defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
  #include <sys/sysctl.h>
  #endif
 -#if defined(__OpenBSD__)
@@ -14,21 +12,21 @@ $NetBSD: patch-xpcom_build_BinaryPath.h,
  #include <sys/stat.h>
  #endif
  #include "mozilla/UniquePtr.h"
-@@ -172,7 +173,8 @@ private:
+@@ -164,7 +165,8 @@ class BinaryPath {
    }
  
  #elif defined(__FreeBSD__) || defined(__DragonFly__) || \
--      defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+-    defined(__FreeBSD_kernel__) || defined(__NetBSD__)
 +      defined(__FreeBSD_kernel__) || \
 +      (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME))
-   static nsresult Get(char aResult[MAXPATHLEN])
-   {
+   static nsresult Get(char aResult[MAXPATHLEN]) {
      int mib[4];
-@@ -257,6 +259,13 @@ private:
+     mib[0] = CTL_KERN;
+@@ -246,6 +248,13 @@ class BinaryPath {
      return NS_ERROR_FAILURE;
    }
  
-+#elif (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
+++#elif (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
 +  static nsresult Get(char aResult[MAXPATHLEN])
 +  {
 +    char path[] = "@PREFIX@/lib/firefox60/firefox60";

Follow-Ups:
- Re: CVS commit: pkgsrc/www/firefox60
  - From: Leonardo Taccari

Prev by Date: CVS commit: pkgsrc/textproc/fmtlib
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/textproc/fmtlib
Next by Thread: Re: CVS commit: pkgsrc/www/firefox60
Indexes:

Home | Main Index | Thread Index | Old Index