diff options
Diffstat (limited to 'security/tor-browser')
14 files changed, 64 insertions, 448 deletions
diff --git a/security/tor-browser/Makefile b/security/tor-browser/Makefile index 68328a90128..02cdd5d36b0 100644 --- a/security/tor-browser/Makefile +++ b/security/tor-browser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2019/02/25 15:32:23 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2019/03/15 11:51:26 wiz Exp $ DISTNAME= tor-browser-60.5.1esr-8.5-1-build2 PKGNAME= tor-browser-8.5 @@ -47,9 +47,6 @@ CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1 CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1 CFLAGS+= -fPIC -# Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601 -CFLAGS+= -fpermissive - # workaround for link of libxul.so etc. LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib diff --git a/security/tor-browser/distinfo b/security/tor-browser/distinfo index 8b95cad210d..2db031a57e8 100644 --- a/security/tor-browser/distinfo +++ b/security/tor-browser/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2019/02/25 15:32:23 wiz Exp $ +$NetBSD: distinfo,v 1.7 2019/03/15 11:51:26 wiz Exp $ SHA1 (tor-browser-60.5.1esr-8.5-1-build2.tar.gz) = fa8bea5f006a4a024240c7332ac8cc622320c002 RMD160 (tor-browser-60.5.1esr-8.5-1-build2.tar.gz) = 17d4dda39fcee5e305b1c3a40938369c677bfa07 @@ -9,21 +9,19 @@ 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) = 784a1e236cd7927726f13a50b72218ded142cc53 SHA1 (patch-dom_media_CubebUtils.cpp) = b9ef14e863f7eb5fb8e3caf3813dc28dea66ff7a 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) = 4a1b34bd0036ebd7bfd22a4cc71034c0d40bbeb8 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = 16e37fe54ba1d8d233f6b04dbd06e248305d7f6e SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 2f7fce38e1c68bb39e30f0fe4fa5c5e58809dcd0 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ee1e2d1c83d3c6e5d845031c4b20e9d79de5532e SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 778a569887d8ad082abc2fa2fe89a0a943e84d64 -SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 5b3bde8ff281f444b82a2094bd3ba82974d40cc7 +SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = cb5b6b54f186f7365bafa810afa47c898bb7625c SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836 -SHA1 (patch-js_src_gc_Memory.cpp) = b69e841d3e4edfd50c387e374e63186721c24cc7 +SHA1 (patch-js_src_gc_Memory.cpp) = cc8ab70646ea4d8d930999594c8ca03c1600f074 SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa -SHA1 (patch-js_src_util_NativeStack.cpp) = 3da5b544b28434a4b1e13e9a5ec47fb6ac7149c7 -SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = c2a4f0bf52bbd95ca66319f65662840f2411d080 +SHA1 (patch-js_src_util_NativeStack.cpp) = ac5c7cb9ca553773ebff18a926e2a4d1b473faa5 +SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = 19a396b57b42f4b7b0861f08e4ae2b2d6effc729 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 @@ -31,18 +29,19 @@ SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = ccd7ad6f09977dab358632107cfd9078b 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 SHA1 (patch-modules_pdfium_update.sh) = b0bf091325c9322c54880de067871354cd689038 +SHA1 (patch-servo_components_style__traits_lib.rs) = b07dfc91bae3f94b7da0c5dab523a6901b9b1bf7 SHA1 (patch-servo_components_style_build__gecko.rs) = fca2260a70b496fc010f165ff4d68788b7e28632 +SHA1 (patch-servo_components_style_lib.rs) = 1df2f6580da3c4a2fadd7ddcead000fa3c8a6a14 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce 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) = 6e7e7717e2ecf28860e87261e046ef180eac0807 SHA1 (patch-xpcom_base_nscore.h) = fef62ceffed0896db1c41972fd96d5dd36b7de37 -SHA1 (patch-xpcom_build_BinaryPath.h) = df4735f7e9ead61b1f98e057c0b679caf174f4c8 +SHA1 (patch-xpcom_build_BinaryPath.h) = 1d4805c97e8a7a235ced327b5b1d03c4f8b336ef SHA1 (patch-xpcom_io_TorFileUtils.cpp) = c23d867b5a97a4c169198831b816b1bcef8dc630 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239 diff --git a/security/tor-browser/hacks.mk b/security/tor-browser/hacks.mk deleted file mode 100644 index 59ea344674a..00000000000 --- a/security/tor-browser/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2016/02/14 07:30:54 ryoon Exp $ - -.if !defined(XULRUNNER_HACKS_MK) -XULRUNNER_HACKS_MK= defined - -.include "../../mk/bsd.fast.prefs.mk" -.include "../../mk/compiler.mk" - -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -Wno-return-type-c-linkage -.endif - -.endif # XULRUNNER_HACKS_MK diff --git a/security/tor-browser/options.mk b/security/tor-browser/options.mk index be9235a58fd..100a827580f 100644 --- a/security/tor-browser/options.mk +++ b/security/tor-browser/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2016/02/26 09:41:07 jperkin Exp $ +# $NetBSD: options.mk,v 1.3 2019/03/15 11:51:26 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tor-browser PKG_SUPPORTED_OPTIONS+= alsa debug debug-info mozilla-jemalloc pulseaudio @@ -17,7 +17,6 @@ CONFIGURE_ARGS+= --disable-alsa .endif .if !empty(PKG_OPTIONS:Mmozilla-jemalloc) -PLIST.jemalloc= yes CONFIGURE_ARGS+= --enable-jemalloc .else CONFIGURE_ARGS+= --disable-jemalloc @@ -54,4 +53,3 @@ CONFIGURE_ARGS+= --enable-pulseaudio .else CONFIGURE_ARGS+= --disable-pulseaudio .endif -# XXX end diff --git a/security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp b/security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp deleted file mode 100644 index ad4d0f0e202..00000000000 --- a/security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dom_fetch_FetchConsumer.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $ - ---- dom/fetch/FetchConsumer.cpp.orig 2019-02-23 20:00:40.000000000 +0000 -+++ dom/fetch/FetchConsumer.cpp -@@ -560,7 +560,7 @@ void FetchBodyConsumer<Derived>::Continu - - RefPtr<FetchBodyConsumer<Derived>> self = this; - auto autoReleaseObject = -- mozilla::MakeScopeExit([&] { self->ReleaseObject(); }); -+ mozilla::MakeScopeExit([self] { self->ReleaseObject(); }); - - if (aShuttingDown) { - // If shutting down, we don't want to resolve any promise. diff --git a/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp b/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp deleted file mode 100644 index 37bc501765b..00000000000 --- a/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp +++ /dev/null @@ -1,367 +0,0 @@ -$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.3 2019/02/25 15:32:24 wiz Exp $ - -Partially revert https://bugzilla.mozilla.org/show_bug.cgi?id=791305 -to allow building against jpeg (not jpeg-turbo). - ---- image/decoders/nsJPEGDecoder.cpp.orig 2019-02-23 20:00:48.000000000 +0000 -+++ image/decoders/nsJPEGDecoder.cpp -@@ -29,13 +29,28 @@ - - extern "C" { - #include "iccjpeg.h" --} - -+#ifdef JCS_EXTENSIONS - #if MOZ_BIG_ENDIAN - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB - #else - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX - #endif -+#else -+/* Colorspace conversion (copied from jpegint.h) */ -+struct jpeg_color_deconverter { -+ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -+ JMETHOD(void, color_convert, (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows)); -+}; -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows); -+#endif -+} - - static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); - -@@ -339,6 +354,7 @@ LexerTransition<nsJPEGDecoder::State> ns - case JCS_GRAYSCALE: - case JCS_RGB: - case JCS_YCbCr: -+#ifdef JCS_EXTENSIONS - // if we're not color managing we can decode directly to - // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB - if (mCMSMode != eCMSMode_All) { -@@ -347,6 +363,9 @@ LexerTransition<nsJPEGDecoder::State> ns - } else { - mInfo.out_color_space = JCS_RGB; - } -+#else -+ mInfo.out_color_space = JCS_RGB; -+#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -442,6 +461,16 @@ LexerTransition<nsJPEGDecoder::State> ns - ("} (I/O suspension after OutputScanlines() - SEQUENTIAL)")); - return Transition::ContinueUnbuffered( - State::JPEG_DATA); // I/O suspension -+#ifndef JCS_EXTENSIONS -+ /* Force to use our YCbCr to Packed RGB converter when possible */ -+ if (!mTransform && (mCMSMode != eCMSMode_All) && -+ mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { -+ /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ -+ mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ -+ mInfo.cconvert->color_convert = ycc_rgb_convert_argb; -+ } -+#endif -+ - } - - // If we've completed image output ... -@@ -620,7 +649,11 @@ void nsJPEGDecoder::OutputScanlines(bool - - MOZ_ASSERT(imageRow, "Should have a row buffer here"); - -+#ifdef JCS_EXTENSIONS - if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) { -+#else -+ if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { -+#endif - // Special case: scanline will be directly converted into packed ARGB - if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { - *suspend = true; // suspend -@@ -943,6 +976,282 @@ term_source(j_decompress_ptr jd) { - } // namespace image - } // namespace mozilla - -+#ifndef JCS_EXTENSIONS -+/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ -+ -+/* -+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are -+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5. -+ * The conversion equations to be implemented are therefore -+ * R = Y + 1.40200 * Cr -+ * G = Y - 0.34414 * Cb - 0.71414 * Cr -+ * B = Y + 1.77200 * Cb -+ * where Cb and Cr represent the incoming values less CENTERJSAMPLE. -+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.) -+ * -+ * To avoid floating-point arithmetic, we represent the fractional constants -+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide -+ * the products by 2^16, with appropriate rounding, to get the correct answer. -+ * Notice that Y, being an integral input, does not contribute any fraction -+ * so it need not participate in the rounding. -+ * -+ * For even more speed, we avoid doing any multiplications in the inner loop -+ * by precalculating the constants times Cb and Cr for all possible values. -+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table); -+ * for 12-bit samples it is still acceptable. It's not very reasonable for -+ * 16-bit samples, but if you want lossless storage you shouldn't be changing -+ * colorspace anyway. -+ * The Cr=>R and Cb=>B values can be rounded to integers in advance; the -+ * values for the G calculation are left scaled up, since we must add them -+ * together before rounding. -+ */ -+ -+#define SCALEBITS 16 /* speediest right-shift on some machines */ -+ -+/* Use static tables for color processing. */ -+/* Four tables, each 256 entries of 4 bytes totals 4K which is not bad... */ -+ -+const int Cr_r_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xb3, -0xb2, -0xb1, -0xaf, -0xae, -0xac, -+ -0xab, -0xaa, -0xa8, -0xa7, -0xa5, -0xa4, -+ -0xa3, -0xa1, -0xa0, -0x9e, -0x9d, -0x9c, -+ -0x9a, -0x99, -0x97, -0x96, -0x95, -0x93, -+ -0x92, -0x90, -0x8f, -0x8e, -0x8c, -0x8b, -+ -0x89, -0x88, -0x87, -0x85, -0x84, -0x82, -+ -0x81, -0x80, -0x7e, -0x7d, -0x7b, -0x7a, -+ -0x79, -0x77, -0x76, -0x74, -0x73, -0x72, -+ -0x70, -0x6f, -0x6d, -0x6c, -0x6b, -0x69, -+ -0x68, -0x66, -0x65, -0x64, -0x62, -0x61, -+ -0x5f, -0x5e, -0x5d, -0x5b, -0x5a, -0x58, -+ -0x57, -0x56, -0x54, -0x53, -0x51, -0x50, -+ -0x4f, -0x4d, -0x4c, -0x4a, -0x49, -0x48, -+ -0x46, -0x45, -0x43, -0x42, -0x40, -0x3f, -+ -0x3e, -0x3c, -0x3b, -0x39, -0x38, -0x37, -+ -0x35, -0x34, -0x32, -0x31, -0x30, -0x2e, -+ -0x2d, -0x2b, -0x2a, -0x29, -0x27, -0x26, -+ -0x24, -0x23, -0x22, -0x20, -0x1f, -0x1d, -+ -0x1c, -0x1b, -0x19, -0x18, -0x16, -0x15, -+ -0x14, -0x12, -0x11, -0x0f, -0x0e, -0x0d, -+ -0x0b, -0x0a, -0x08, -0x07, -0x06, -0x04, -+ -0x03, -0x01, 0x00, 0x01, 0x03, 0x04, -+ 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0d, -+ 0x0e, 0x0f, 0x11, 0x12, 0x14, 0x15, -+ 0x16, 0x18, 0x19, 0x1b, 0x1c, 0x1d, -+ 0x1f, 0x20, 0x22, 0x23, 0x24, 0x26, -+ 0x27, 0x29, 0x2a, 0x2b, 0x2d, 0x2e, -+ 0x30, 0x31, 0x32, 0x34, 0x35, 0x37, -+ 0x38, 0x39, 0x3b, 0x3c, 0x3e, 0x3f, -+ 0x40, 0x42, 0x43, 0x45, 0x46, 0x48, -+ 0x49, 0x4a, 0x4c, 0x4d, 0x4f, 0x50, -+ 0x51, 0x53, 0x54, 0x56, 0x57, 0x58, -+ 0x5a, 0x5b, 0x5d, 0x5e, 0x5f, 0x61, -+ 0x62, 0x64, 0x65, 0x66, 0x68, 0x69, -+ 0x6b, 0x6c, 0x6d, 0x6f, 0x70, 0x72, -+ 0x73, 0x74, 0x76, 0x77, 0x79, 0x7a, -+ 0x7b, 0x7d, 0x7e, 0x80, 0x81, 0x82, -+ 0x84, 0x85, 0x87, 0x88, 0x89, 0x8b, -+ 0x8c, 0x8e, 0x8f, 0x90, 0x92, 0x93, -+ 0x95, 0x96, 0x97, 0x99, 0x9a, 0x9c, -+ 0x9d, 0x9e, 0xa0, 0xa1, 0xa3, 0xa4, -+ 0xa5, 0xa7, 0xa8, 0xaa, 0xab, 0xac, -+ 0xae, 0xaf, 0xb1, 0xb2, -+ }; -+ -+const int Cb_b_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xe3, -0xe1, -0xdf, -0xde, -0xdc, -0xda, -+ -0xd8, -0xd6, -0xd5, -0xd3, -0xd1, -0xcf, -+ -0xce, -0xcc, -0xca, -0xc8, -0xc6, -0xc5, -+ -0xc3, -0xc1, -0xbf, -0xbe, -0xbc, -0xba, -+ -0xb8, -0xb7, -0xb5, -0xb3, -0xb1, -0xaf, -+ -0xae, -0xac, -0xaa, -0xa8, -0xa7, -0xa5, -+ -0xa3, -0xa1, -0x9f, -0x9e, -0x9c, -0x9a, -+ -0x98, -0x97, -0x95, -0x93, -0x91, -0x90, -+ -0x8e, -0x8c, -0x8a, -0x88, -0x87, -0x85, -+ -0x83, -0x81, -0x80, -0x7e, -0x7c, -0x7a, -+ -0x78, -0x77, -0x75, -0x73, -0x71, -0x70, -+ -0x6e, -0x6c, -0x6a, -0x69, -0x67, -0x65, -+ -0x63, -0x61, -0x60, -0x5e, -0x5c, -0x5a, -+ -0x59, -0x57, -0x55, -0x53, -0x52, -0x50, -+ -0x4e, -0x4c, -0x4a, -0x49, -0x47, -0x45, -+ -0x43, -0x42, -0x40, -0x3e, -0x3c, -0x3a, -+ -0x39, -0x37, -0x35, -0x33, -0x32, -0x30, -+ -0x2e, -0x2c, -0x2b, -0x29, -0x27, -0x25, -+ -0x23, -0x22, -0x20, -0x1e, -0x1c, -0x1b, -+ -0x19, -0x17, -0x15, -0x13, -0x12, -0x10, -+ -0x0e, -0x0c, -0x0b, -0x09, -0x07, -0x05, -+ -0x04, -0x02, 0x00, 0x02, 0x04, 0x05, -+ 0x07, 0x09, 0x0b, 0x0c, 0x0e, 0x10, -+ 0x12, 0x13, 0x15, 0x17, 0x19, 0x1b, -+ 0x1c, 0x1e, 0x20, 0x22, 0x23, 0x25, -+ 0x27, 0x29, 0x2b, 0x2c, 0x2e, 0x30, -+ 0x32, 0x33, 0x35, 0x37, 0x39, 0x3a, -+ 0x3c, 0x3e, 0x40, 0x42, 0x43, 0x45, -+ 0x47, 0x49, 0x4a, 0x4c, 0x4e, 0x50, -+ 0x52, 0x53, 0x55, 0x57, 0x59, 0x5a, -+ 0x5c, 0x5e, 0x60, 0x61, 0x63, 0x65, -+ 0x67, 0x69, 0x6a, 0x6c, 0x6e, 0x70, -+ 0x71, 0x73, 0x75, 0x77, 0x78, 0x7a, -+ 0x7c, 0x7e, 0x80, 0x81, 0x83, 0x85, -+ 0x87, 0x88, 0x8a, 0x8c, 0x8e, 0x90, -+ 0x91, 0x93, 0x95, 0x97, 0x98, 0x9a, -+ 0x9c, 0x9e, 0x9f, 0xa1, 0xa3, 0xa5, -+ 0xa7, 0xa8, 0xaa, 0xac, 0xae, 0xaf, -+ 0xb1, 0xb3, 0xb5, 0xb7, 0xb8, 0xba, -+ 0xbc, 0xbe, 0xbf, 0xc1, 0xc3, 0xc5, -+ 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xcf, -+ 0xd1, 0xd3, 0xd5, 0xd6, 0xd8, 0xda, -+ 0xdc, 0xde, 0xdf, 0xe1, -+ }; -+ -+const int Cr_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x5b6900, 0x5ab22e, 0x59fb5c, 0x59448a, 0x588db8, 0x57d6e6, -+ 0x572014, 0x566942, 0x55b270, 0x54fb9e, 0x5444cc, 0x538dfa, -+ 0x52d728, 0x522056, 0x516984, 0x50b2b2, 0x4ffbe0, 0x4f450e, -+ 0x4e8e3c, 0x4dd76a, 0x4d2098, 0x4c69c6, 0x4bb2f4, 0x4afc22, -+ 0x4a4550, 0x498e7e, 0x48d7ac, 0x4820da, 0x476a08, 0x46b336, -+ 0x45fc64, 0x454592, 0x448ec0, 0x43d7ee, 0x43211c, 0x426a4a, -+ 0x41b378, 0x40fca6, 0x4045d4, 0x3f8f02, 0x3ed830, 0x3e215e, -+ 0x3d6a8c, 0x3cb3ba, 0x3bfce8, 0x3b4616, 0x3a8f44, 0x39d872, -+ 0x3921a0, 0x386ace, 0x37b3fc, 0x36fd2a, 0x364658, 0x358f86, -+ 0x34d8b4, 0x3421e2, 0x336b10, 0x32b43e, 0x31fd6c, 0x31469a, -+ 0x308fc8, 0x2fd8f6, 0x2f2224, 0x2e6b52, 0x2db480, 0x2cfdae, -+ 0x2c46dc, 0x2b900a, 0x2ad938, 0x2a2266, 0x296b94, 0x28b4c2, -+ 0x27fdf0, 0x27471e, 0x26904c, 0x25d97a, 0x2522a8, 0x246bd6, -+ 0x23b504, 0x22fe32, 0x224760, 0x21908e, 0x20d9bc, 0x2022ea, -+ 0x1f6c18, 0x1eb546, 0x1dfe74, 0x1d47a2, 0x1c90d0, 0x1bd9fe, -+ 0x1b232c, 0x1a6c5a, 0x19b588, 0x18feb6, 0x1847e4, 0x179112, -+ 0x16da40, 0x16236e, 0x156c9c, 0x14b5ca, 0x13fef8, 0x134826, -+ 0x129154, 0x11da82, 0x1123b0, 0x106cde, 0x0fb60c, 0x0eff3a, -+ 0x0e4868, 0x0d9196, 0x0cdac4, 0x0c23f2, 0x0b6d20, 0x0ab64e, -+ 0x09ff7c, 0x0948aa, 0x0891d8, 0x07db06, 0x072434, 0x066d62, -+ 0x05b690, 0x04ffbe, 0x0448ec, 0x03921a, 0x02db48, 0x022476, -+ 0x016da4, 0x00b6d2, 0x000000, -0x00b6d2, -0x016da4, -0x022476, -+ -0x02db48, -0x03921a, -0x0448ec, -0x04ffbe, -0x05b690, -0x066d62, -+ -0x072434, -0x07db06, -0x0891d8, -0x0948aa, -0x09ff7c, -0x0ab64e, -+ -0x0b6d20, -0x0c23f2, -0x0cdac4, -0x0d9196, -0x0e4868, -0x0eff3a, -+ -0x0fb60c, -0x106cde, -0x1123b0, -0x11da82, -0x129154, -0x134826, -+ -0x13fef8, -0x14b5ca, -0x156c9c, -0x16236e, -0x16da40, -0x179112, -+ -0x1847e4, -0x18feb6, -0x19b588, -0x1a6c5a, -0x1b232c, -0x1bd9fe, -+ -0x1c90d0, -0x1d47a2, -0x1dfe74, -0x1eb546, -0x1f6c18, -0x2022ea, -+ -0x20d9bc, -0x21908e, -0x224760, -0x22fe32, -0x23b504, -0x246bd6, -+ -0x2522a8, -0x25d97a, -0x26904c, -0x27471e, -0x27fdf0, -0x28b4c2, -+ -0x296b94, -0x2a2266, -0x2ad938, -0x2b900a, -0x2c46dc, -0x2cfdae, -+ -0x2db480, -0x2e6b52, -0x2f2224, -0x2fd8f6, -0x308fc8, -0x31469a, -+ -0x31fd6c, -0x32b43e, -0x336b10, -0x3421e2, -0x34d8b4, -0x358f86, -+ -0x364658, -0x36fd2a, -0x37b3fc, -0x386ace, -0x3921a0, -0x39d872, -+ -0x3a8f44, -0x3b4616, -0x3bfce8, -0x3cb3ba, -0x3d6a8c, -0x3e215e, -+ -0x3ed830, -0x3f8f02, -0x4045d4, -0x40fca6, -0x41b378, -0x426a4a, -+ -0x43211c, -0x43d7ee, -0x448ec0, -0x454592, -0x45fc64, -0x46b336, -+ -0x476a08, -0x4820da, -0x48d7ac, -0x498e7e, -0x4a4550, -0x4afc22, -+ -0x4bb2f4, -0x4c69c6, -0x4d2098, -0x4dd76a, -0x4e8e3c, -0x4f450e, -+ -0x4ffbe0, -0x50b2b2, -0x516984, -0x522056, -0x52d728, -0x538dfa, -+ -0x5444cc, -0x54fb9e, -0x55b270, -0x566942, -0x572014, -0x57d6e6, -+ -0x588db8, -0x59448a, -0x59fb5c, -0x5ab22e, -+ }; -+ -+const int Cb_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x2c8d00, 0x2c34e6, 0x2bdccc, 0x2b84b2, 0x2b2c98, 0x2ad47e, -+ 0x2a7c64, 0x2a244a, 0x29cc30, 0x297416, 0x291bfc, 0x28c3e2, -+ 0x286bc8, 0x2813ae, 0x27bb94, 0x27637a, 0x270b60, 0x26b346, -+ 0x265b2c, 0x260312, 0x25aaf8, 0x2552de, 0x24fac4, 0x24a2aa, -+ 0x244a90, 0x23f276, 0x239a5c, 0x234242, 0x22ea28, 0x22920e, -+ 0x2239f4, 0x21e1da, 0x2189c0, 0x2131a6, 0x20d98c, 0x208172, -+ 0x202958, 0x1fd13e, 0x1f7924, 0x1f210a, 0x1ec8f0, 0x1e70d6, -+ 0x1e18bc, 0x1dc0a2, 0x1d6888, 0x1d106e, 0x1cb854, 0x1c603a, -+ 0x1c0820, 0x1bb006, 0x1b57ec, 0x1affd2, 0x1aa7b8, 0x1a4f9e, -+ 0x19f784, 0x199f6a, 0x194750, 0x18ef36, 0x18971c, 0x183f02, -+ 0x17e6e8, 0x178ece, 0x1736b4, 0x16de9a, 0x168680, 0x162e66, -+ 0x15d64c, 0x157e32, 0x152618, 0x14cdfe, 0x1475e4, 0x141dca, -+ 0x13c5b0, 0x136d96, 0x13157c, 0x12bd62, 0x126548, 0x120d2e, -+ 0x11b514, 0x115cfa, 0x1104e0, 0x10acc6, 0x1054ac, 0x0ffc92, -+ 0x0fa478, 0x0f4c5e, 0x0ef444, 0x0e9c2a, 0x0e4410, 0x0debf6, -+ 0x0d93dc, 0x0d3bc2, 0x0ce3a8, 0x0c8b8e, 0x0c3374, 0x0bdb5a, -+ 0x0b8340, 0x0b2b26, 0x0ad30c, 0x0a7af2, 0x0a22d8, 0x09cabe, -+ 0x0972a4, 0x091a8a, 0x08c270, 0x086a56, 0x08123c, 0x07ba22, -+ 0x076208, 0x0709ee, 0x06b1d4, 0x0659ba, 0x0601a0, 0x05a986, -+ 0x05516c, 0x04f952, 0x04a138, 0x04491e, 0x03f104, 0x0398ea, -+ 0x0340d0, 0x02e8b6, 0x02909c, 0x023882, 0x01e068, 0x01884e, -+ 0x013034, 0x00d81a, 0x008000, 0x0027e6, -0x003034, -0x00884e, -+ -0x00e068, -0x013882, -0x01909c, -0x01e8b6, -0x0240d0, -0x0298ea, -+ -0x02f104, -0x03491e, -0x03a138, -0x03f952, -0x04516c, -0x04a986, -+ -0x0501a0, -0x0559ba, -0x05b1d4, -0x0609ee, -0x066208, -0x06ba22, -+ -0x07123c, -0x076a56, -0x07c270, -0x081a8a, -0x0872a4, -0x08cabe, -+ -0x0922d8, -0x097af2, -0x09d30c, -0x0a2b26, -0x0a8340, -0x0adb5a, -+ -0x0b3374, -0x0b8b8e, -0x0be3a8, -0x0c3bc2, -0x0c93dc, -0x0cebf6, -+ -0x0d4410, -0x0d9c2a, -0x0df444, -0x0e4c5e, -0x0ea478, -0x0efc92, -+ -0x0f54ac, -0x0facc6, -0x1004e0, -0x105cfa, -0x10b514, -0x110d2e, -+ -0x116548, -0x11bd62, -0x12157c, -0x126d96, -0x12c5b0, -0x131dca, -+ -0x1375e4, -0x13cdfe, -0x142618, -0x147e32, -0x14d64c, -0x152e66, -+ -0x158680, -0x15de9a, -0x1636b4, -0x168ece, -0x16e6e8, -0x173f02, -+ -0x17971c, -0x17ef36, -0x184750, -0x189f6a, -0x18f784, -0x194f9e, -+ -0x19a7b8, -0x19ffd2, -0x1a57ec, -0x1ab006, -0x1b0820, -0x1b603a, -+ -0x1bb854, -0x1c106e, -0x1c6888, -0x1cc0a2, -0x1d18bc, -0x1d70d6, -+ -0x1dc8f0, -0x1e210a, -0x1e7924, -0x1ed13e, -0x1f2958, -0x1f8172, -+ -0x1fd98c, -0x2031a6, -0x2089c0, -0x20e1da, -0x2139f4, -0x21920e, -+ -0x21ea28, -0x224242, -0x229a5c, -0x22f276, -0x234a90, -0x23a2aa, -+ -0x23fac4, -0x2452de, -0x24aaf8, -0x250312, -0x255b2c, -0x25b346, -+ -0x260b60, -0x26637a, -0x26bb94, -0x2713ae, -0x276bc8, -0x27c3e2, -+ -0x281bfc, -0x287416, -0x28cc30, -0x29244a, -0x297c64, -0x29d47e, -+ -0x2a2c98, -0x2a84b2, -0x2adccc, -0x2b34e6, -+ }; -+ -+ -+/* We assume that right shift corresponds to signed division by 2 with -+ * rounding towards minus infinity. This is correct for typical "arithmetic -+ * shift" instructions that shift in copies of the sign bit. But some -+ * C compilers implement >> with an unsigned shift. For these machines you -+ * must define RIGHT_SHIFT_IS_UNSIGNED. -+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity. -+ * It is only applied with constant shift counts. SHIFT_TEMPS must be -+ * included in the variables of any routine using RIGHT_SHIFT. -+ */ -+ -+#ifdef RIGHT_SHIFT_IS_UNSIGNED -+#define SHIFT_TEMPS INT32 shift_temp; -+#define RIGHT_SHIFT(x,shft) \ -+ ((shift_temp = (x)) < 0 ? \ -+ (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \ -+ (shift_temp >> (shft))) -+#else -+#define SHIFT_TEMPS -+#define RIGHT_SHIFT(x,shft) ((x) >> (shft)) -+#endif -+ -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows) -+{ -+ JDIMENSION num_cols = cinfo->output_width; -+ JSAMPLE * range_limit = cinfo->sample_range_limit; -+ -+ SHIFT_TEMPS -+ -+ /* This is used if we don't have SSE2 */ -+ -+ while (--num_rows >= 0) { -+ JSAMPROW inptr0 = input_buf[0][input_row]; -+ JSAMPROW inptr1 = input_buf[1][input_row]; -+ JSAMPROW inptr2 = input_buf[2][input_row]; -+ input_row++; -+ uint32_t *outptr = (uint32_t *) *output_buf++; -+ for (JDIMENSION col = 0; col < num_cols; col++) { -+ int y = GETJSAMPLE(inptr0[col]); -+ int cb = GETJSAMPLE(inptr1[col]); -+ int cr = GETJSAMPLE(inptr2[col]); -+ JSAMPLE * range_limit_y = range_limit + y; -+ /* Range-limiting is essential due to noise introduced by DCT losses. */ -+ outptr[col] = 0xFF000000 | -+ ( range_limit_y[Cr_r_tab[cr]] << 16 ) | -+ ( range_limit_y[((int) RIGHT_SHIFT(Cb_g_tab[cb] + Cr_g_tab[cr], SCALEBITS))] << 8 ) | -+ ( range_limit_y[Cb_b_tab[cb]] ); -+ } -+ } -+} -+#endif -+ -+ - ///*************** Inverted CMYK -> RGB conversion ************************* - /// Input is (Inverted) CMYK stored as 4 bytes per pixel. - /// Output is RGB stored as 3 bytes per pixel. diff --git a/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp b/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp index 1d28bfb5b44..ad9e4931dd2 100644 --- a/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp +++ b/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $ +$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.2 2019/03/15 11:51:26 wiz Exp $ - avoid use of sem_t on NetBSD http://mail-index.netbsd.org/pkgsrc-bugs/2017/06/23/msg062225.html @@ -101,7 +101,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2019/02/25 15:32: +#else + : mSemaphore(nullptr) +#endif -+ , mRefCount(nullptr) { ++ , mRefCount(nullptr) { MOZ_COUNT_CTOR(CrossProcessSemaphore); } diff --git a/security/tor-browser/patches/patch-js_src_gc_Memory.cpp b/security/tor-browser/patches/patch-js_src_gc_Memory.cpp index a15702df173..38f02f10da2 100644 --- a/security/tor-browser/patches/patch-js_src_gc_Memory.cpp +++ b/security/tor-browser/patches/patch-js_src_gc_Memory.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-js_src_gc_Memory.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $ +$NetBSD: patch-js_src_gc_Memory.cpp,v 1.2 2019/03/15 11:51:26 wiz Exp $ Support SunOS/x86_64. ---- js/src/gc/Memory.cpp.orig 2019-02-23 20:00:48.000000000 +0000 +--- js/src/gc/Memory.cpp.orig 2019-02-13 14:19:38.000000000 +0000 +++ js/src/gc/Memory.cpp @@ -419,6 +419,7 @@ static inline void* MapMemoryAt(void* de off_t offset = 0) { @@ -12,12 +12,13 @@ Support SunOS/x86_64. (defined(__sparc__) && defined(__arch64__) && \ (defined(__NetBSD__) || defined(__linux__))) MOZ_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0); -@@ -468,7 +469,7 @@ static inline void* MapMemory(size_t len +@@ -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__)) ++ (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 diff --git a/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp b/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp index 949ab1d10f3..2966b27c356 100644 --- a/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp +++ b/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-js_src_util_NativeStack.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $ +$NetBSD: patch-js_src_util_NativeStack.cpp,v 1.2 2019/03/15 11:51:26 wiz Exp $ Support SunOS. @@ -13,11 +13,11 @@ Support SunOS. JS_STATIC_ASSERT(JS_STACK_GROWTH_DIRECTION < 0); -@@ -86,6 +86,7 @@ void* js::GetNativeStackBaseImpl() { - return stackBase; - } - -+# elif defined(__sun) - // Non-main threads have the required info stored in memory, so no filesystem - // calls are made. - pthread_t thread = pthread_self(); +@@ -128,6 +128,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 */ + pthread_attr_get_np(thread, &sattr); ++#elif defined(__sun) + #else + /* + * FIXME: this function is non-portable; diff --git a/security/tor-browser/patches/patch-js_src_wasm_WasmSignalHandlers.cpp b/security/tor-browser/patches/patch-js_src_wasm_WasmSignalHandlers.cpp index e9dbe9b30c4..fc3a4129d25 100644 --- a/security/tor-browser/patches/patch-js_src_wasm_WasmSignalHandlers.cpp +++ b/security/tor-browser/patches/patch-js_src_wasm_WasmSignalHandlers.cpp @@ -1,14 +1,14 @@ -$NetBSD: patch-js_src_wasm_WasmSignalHandlers.cpp,v 1.1 2019/02/25 15:32:24 wiz Exp $ +$NetBSD: patch-js_src_wasm_WasmSignalHandlers.cpp,v 1.2 2019/03/15 11:51:26 wiz Exp $ Support SunOS. ---- js/src/wasm/WasmSignalHandlers.cpp.orig 2019-02-23 20:00:48.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 { +@@ -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]) -+# include <sys/regset.h> #define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP]) - #define ESP_sig(p) ((p)->uc_mcontext.gregs[REG_ESP]) - #endif diff --git a/security/tor-browser/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc b/security/tor-browser/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc deleted file mode 100644 index ac5bf7b4ab8..00000000000 --- a/security/tor-browser/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-media_libyuv_libyuv_source_mjpeg__decoder.cc,v 1.1 2019/02/25 15:32:24 wiz Exp $ - ---- media/libyuv/libyuv/source/mjpeg_decoder.cc.orig 2017-06-05 20:45:14.000000000 +0000 -+++ media/libyuv/libyuv/source/mjpeg_decoder.cc -@@ -25,7 +25,7 @@ - #endif - - #endif --struct FILE; // For jpeglib.h. -+//struct FILE; // For jpeglib.h. - - // C++ build requires extern C for jpeg internals. - #ifdef __cplusplus diff --git a/security/tor-browser/patches/patch-servo_components_style__traits_lib.rs b/security/tor-browser/patches/patch-servo_components_style__traits_lib.rs new file mode 100644 index 00000000000..d9f28dad11c --- /dev/null +++ b/security/tor-browser/patches/patch-servo_components_style__traits_lib.rs @@ -0,0 +1,13 @@ +$NetBSD: patch-servo_components_style__traits_lib.rs,v 1.1 2019/03/15 11:51:26 wiz Exp $ + +--- servo/components/style_traits/lib.rs.orig 2019-02-21 19:22:50.000000000 +0000 ++++ servo/components/style_traits/lib.rs +@@ -9,8 +9,6 @@ + #![crate_name = "style_traits"] + #![crate_type = "rlib"] + +-#![deny(unsafe_code, missing_docs)] +- + extern crate app_units; + #[macro_use] extern crate bitflags; + #[macro_use] extern crate cssparser; diff --git a/security/tor-browser/patches/patch-servo_components_style_lib.rs b/security/tor-browser/patches/patch-servo_components_style_lib.rs new file mode 100644 index 00000000000..10d857fb131 --- /dev/null +++ b/security/tor-browser/patches/patch-servo_components_style_lib.rs @@ -0,0 +1,13 @@ +$NetBSD: patch-servo_components_style_lib.rs,v 1.1 2019/03/15 11:51:26 wiz Exp $ + +--- servo/components/style/lib.rs.orig 2019-02-21 19:22:50.000000000 +0000 ++++ servo/components/style/lib.rs +@@ -23,8 +23,6 @@ + //! [cssparser]: ../cssparser/index.html + //! [selectors]: ../selectors/index.html + +-#![deny(missing_docs)] +- + extern crate app_units; + extern crate arrayvec; + extern crate atomic_refcell; diff --git a/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h b/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h index 95c2c9736bf..6f6c97956a8 100644 --- a/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h +++ b/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h @@ -1,8 +1,8 @@ -$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.1 2019/02/25 15:32:24 wiz Exp $ +$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.2 2019/03/15 11:51:26 wiz Exp $ * Fix build under netbsd-7, PR pkg/52956 ---- xpcom/build/BinaryPath.h.orig 2019-02-23 20:01:00.000000000 +0000 +--- xpcom/build/BinaryPath.h.orig 2019-02-13 14:19:45.000000000 +0000 +++ xpcom/build/BinaryPath.h @@ -21,7 +21,8 @@ defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) @@ -14,16 +14,17 @@ $NetBSD: patch-xpcom_build_BinaryPath.h,v 1.1 2019/02/25 15:32:24 wiz Exp $ #include <sys/stat.h> #endif #include "mozilla/UniquePtr.h" -@@ -164,7 +165,7 @@ class BinaryPath { +@@ -164,7 +165,8 @@ class BinaryPath { } #elif defined(__FreeBSD__) || defined(__DragonFly__) || \ - defined(__FreeBSD_kernel__) || defined(__NetBSD__) -+ defined(__FreeBSD_kernel__) || (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) ++ defined(__FreeBSD_kernel__) || \ ++ (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) static nsresult Get(char aResult[MAXPATHLEN]) { int mib[4]; mib[0] = CTL_KERN; -@@ -246,6 +247,13 @@ class BinaryPath { +@@ -246,6 +248,13 @@ class BinaryPath { return NS_ERROR_FAILURE; } |