pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/tor-browser tor-browser: update for recent ch...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/82716c9dfabd
branches:  trunk
changeset: 321026:82716c9dfabd
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Mar 15 11:51:26 2019 +0000

description:
tor-browser: update for recent changes to firefox60 and rust.

Reduce diffs to firefox60 even more while here.

diffstat:

 security/tor-browser/Makefile                                                   |    5 +-
 security/tor-browser/distinfo                                                   |   17 +-
 security/tor-browser/hacks.mk                                                   |   13 -
 security/tor-browser/options.mk                                                 |    4 +-
 security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp                  |   13 -
 security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp             |  367 ----------
 security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp    |    4 +-
 security/tor-browser/patches/patch-js_src_gc_Memory.cpp                         |    9 +-
 security/tor-browser/patches/patch-js_src_util_NativeStack.cpp                  |   18 +-
 security/tor-browser/patches/patch-js_src_wasm_WasmSignalHandlers.cpp           |   12 +-
 security/tor-browser/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc |   13 -
 security/tor-browser/patches/patch-servo_components_style__traits_lib.rs        |   13 +
 security/tor-browser/patches/patch-servo_components_style_lib.rs                |   13 +
 security/tor-browser/patches/patch-xpcom_build_BinaryPath.h                     |   11 +-
 14 files changed, 64 insertions(+), 448 deletions(-)

diffs (truncated from 690 to 300 lines):

diff -r eb51523c9fd2 -r 82716c9dfabd security/tor-browser/Makefile
--- a/security/tor-browser/Makefile     Fri Mar 15 10:05:33 2019 +0000
+++ b/security/tor-browser/Makefile     Fri Mar 15 11:51:26 2019 +0000
@@ -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_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 -r eb51523c9fd2 -r 82716c9dfabd security/tor-browser/distinfo
--- a/security/tor-browser/distinfo     Fri Mar 15 10:05:33 2019 +0000
+++ b/security/tor-browser/distinfo     Fri Mar 15 11:51:26 2019 +0000
@@ -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-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_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 -r eb51523c9fd2 -r 82716c9dfabd security/tor-browser/hacks.mk
--- a/security/tor-browser/hacks.mk     Fri Mar 15 10:05:33 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r eb51523c9fd2 -r 82716c9dfabd security/tor-browser/options.mk
--- a/security/tor-browser/options.mk   Fri Mar 15 10:05:33 2019 +0000
+++ b/security/tor-browser/options.mk   Fri Mar 15 11:51:26 2019 +0000
@@ -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 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
-PLIST.jemalloc=                yes
 CONFIGURE_ARGS+=       --enable-jemalloc
 .else
 CONFIGURE_ARGS+=       --disable-jemalloc
@@ -54,4 +53,3 @@
 .else
 CONFIGURE_ARGS+=       --disable-pulseaudio
 .endif
-# XXX end
diff -r eb51523c9fd2 -r 82716c9dfabd security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp
--- a/security/tor-browser/patches/patch-dom_fetch_FetchConsumer.cpp    Fri Mar 15 10:05:33 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r eb51523c9fd2 -r 82716c9dfabd security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp
--- a/security/tor-browser/patches/patch-image_decoders_nsJPEGDecoder.cpp       Fri Mar 15 10:05:33 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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,



Home | Main Index | Thread Index | Old Index