Mon Apr 15 08:31:10 2019 UTC ()
Add a patch to fix upstream bug #1543602; bump revision


(pho)
diff -r1.369 -r1.370 pkgsrc/www/firefox/Makefile
diff -r1.346 -r1.347 pkgsrc/www/firefox/distinfo
diff -r0 -r1.1 pkgsrc/www/firefox/patches/patch-toolkit_modules_subprocess_subprocess__shared__unix.js
cvs diff -r1.369 -r1.370 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2019/04/11 13:42:32 1.369
+++ pkgsrc/www/firefox/Makefile 2019/04/15 08:31:10 1.370
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.369 2019/04/11 13:42:32 ryoon Exp $ 1# $NetBSD: Makefile,v 1.370 2019/04/15 08:31:10 pho Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 66.0 4MOZ_BRANCH= 66.0
5MOZ_BRANCH_MINOR= .3 5MOZ_BRANCH_MINOR= .3
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
 9PKGREVISION= 1
9CATEGORIES= www 10CATEGORIES= www
10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
12 13
13MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
14HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 15HOMEPAGE= http://www.mozilla.com/en-US/firefox/
15COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//}) 16COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//})
16LICENSE= mpl-1.1 17LICENSE= mpl-1.1
17 18
18WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER} 19WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER}
19 20
20MOZILLA_DIR= # empty 21MOZILLA_DIR= # empty
21 22
cvs diff -r1.346 -r1.347 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2019/04/11 13:42:32 1.346
+++ pkgsrc/www/firefox/distinfo 2019/04/15 08:31:10 1.347
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.346 2019/04/11 13:42:32 ryoon Exp $ 1$NetBSD: distinfo,v 1.347 2019/04/15 08:31:10 pho Exp $
2 2
3SHA1 (firefox-66.0.3.source.tar.xz) = 531b26c12a3c838bd5539e6f3497ae57206c7534 3SHA1 (firefox-66.0.3.source.tar.xz) = 531b26c12a3c838bd5539e6f3497ae57206c7534
4RMD160 (firefox-66.0.3.source.tar.xz) = 868227674cdc2e92c4c0c183878a77907ed5e938 4RMD160 (firefox-66.0.3.source.tar.xz) = 868227674cdc2e92c4c0c183878a77907ed5e938
5SHA512 (firefox-66.0.3.source.tar.xz) = e857408ffa4acb8676fe3f40cbbdf6c8f0913c6392568cdea8783a94140a4fdff95d117d1a1bfe890097833230b72729f58cdb1df2b552533bb21bd1fe7d77c3 5SHA512 (firefox-66.0.3.source.tar.xz) = e857408ffa4acb8676fe3f40cbbdf6c8f0913c6392568cdea8783a94140a4fdff95d117d1a1bfe890097833230b72729f58cdb1df2b552533bb21bd1fe7d77c3
6Size (firefox-66.0.3.source.tar.xz) = 281164936 bytes 6Size (firefox-66.0.3.source.tar.xz) = 281164936 bytes
7SHA1 (patch-aa) = 66c2e96c199ed4b0007c9b8b3dd431305502d427 7SHA1 (patch-aa) = 66c2e96c199ed4b0007c9b8b3dd431305502d427
8SHA1 (patch-browser_app_profile_firefox.js) = 2ea08bf7030853fe9aff3c43c69266c07f0b0b14 8SHA1 (patch-browser_app_profile_firefox.js) = 2ea08bf7030853fe9aff3c43c69266c07f0b0b14
9SHA1 (patch-build_moz.configure_old.configure) = 91bab1cbbe02332ec076b49b6e598730202fbc99 9SHA1 (patch-build_moz.configure_old.configure) = 91bab1cbbe02332ec076b49b6e598730202fbc99
10SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 10SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
11SHA1 (patch-dom_media_CubebUtils.cpp) = cafbfb2781967ebe96b4f77b8a0630fff537fd02 11SHA1 (patch-dom_media_CubebUtils.cpp) = cafbfb2781967ebe96b4f77b8a0630fff537fd02
12SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 383f25417ad74f3ef8034437b52fc23f3bcbfc24 12SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 383f25417ad74f3ef8034437b52fc23f3bcbfc24
13SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef 13SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
14SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad 14SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
@@ -24,21 +24,22 @@ SHA1 (patch-js_xpconnect_src_XPCMaps.cpp @@ -24,21 +24,22 @@ SHA1 (patch-js_xpconnect_src_XPCMaps.cpp
24SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4 24SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4
25SHA1 (patch-media_libcubeb_src_cubeb.c) = 4fe5512c89fa9e0dd64573d2784e5e0f7fd4d866 25SHA1 (patch-media_libcubeb_src_cubeb.c) = 4fe5512c89fa9e0dd64573d2784e5e0f7fd4d866
26SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a 26SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a
27SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 9b29bbd1c923e574aa5a9ecc17170ad5ef4778c0 27SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 9b29bbd1c923e574aa5a9ecc17170ad5ef4778c0
28SHA1 (patch-media_libcubeb_src_moz.build) = 10f8355e3b3c6d35cca99f3717246e8658860737 28SHA1 (patch-media_libcubeb_src_moz.build) = 10f8355e3b3c6d35cca99f3717246e8658860737
29SHA1 (patch-media_libcubeb_update.sh) = cddb5849fa2972e961e4891bc8a79a650df06d8d 29SHA1 (patch-media_libcubeb_update.sh) = cddb5849fa2972e961e4891bc8a79a650df06d8d
30SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc 30SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
31SHA1 (patch-python_mozbuild_mozbuild_action_check__binary.py) = 8103ca9f95fe98a4461c97abcd4cafd5ae5294f0 31SHA1 (patch-python_mozbuild_mozbuild_action_check__binary.py) = 8103ca9f95fe98a4461c97abcd4cafd5ae5294f0
32SHA1 (patch-servo_components_style_build__gecko.rs) = dacdcb69de1c8409bda20b11afbfa49624005c72 32SHA1 (patch-servo_components_style_build__gecko.rs) = dacdcb69de1c8409bda20b11afbfa49624005c72
33SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = bacab47c65bd9d3f5686426f1026edccda66942f 33SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = bacab47c65bd9d3f5686426f1026edccda66942f
34SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_other_mod.rs) = 7af37abb3bf0674591192146476ea46ca180b5ab 34SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_other_mod.rs) = 7af37abb3bf0674591192146476ea46ca180b5ab
35SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf 35SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf
36SHA1 (patch-toolkit_library_moz.build) = 102e3713552c26f76e8b4e473846bb8fbc44b278 36SHA1 (patch-toolkit_library_moz.build) = 102e3713552c26f76e8b4e473846bb8fbc44b278
 37SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 89b2b9d0cf2fe4882e9dd74dd692245e554ff03a
37SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57 38SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
38SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc 39SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc
39SHA1 (patch-toolkit_xre_glxtest.cpp) = 437b2edf6b3dc6514f454d7c7bc272a31285f751 40SHA1 (patch-toolkit_xre_glxtest.cpp) = 437b2edf6b3dc6514f454d7c7bc272a31285f751
40SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec 41SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
41SHA1 (patch-xpcom_build_BinaryPath.h) = 92461769d2fee8f015b91a5326247f271afeedea 42SHA1 (patch-xpcom_build_BinaryPath.h) = 92461769d2fee8f015b91a5326247f271afeedea
42SHA1 (patch-xpcom_components_nsComponentManager.cpp) = aca632932f18b44fd2810f0f0c5b772f0423a4f9 43SHA1 (patch-xpcom_components_nsComponentManager.cpp) = aca632932f18b44fd2810f0f0c5b772f0423a4f9
43SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 412da80be2aa43852e08ad35e6523ae0842167ab 44SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 412da80be2aa43852e08ad35e6523ae0842167ab
44SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp) = 569f10c29da6e8d30ee6b8568c85a629557a3943 45SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__openbsd.cpp) = 569f10c29da6e8d30ee6b8568c85a629557a3943
File Added: pkgsrc/www/firefox/patches/patch-toolkit_modules_subprocess_subprocess__shared__unix.js
$NetBSD: patch-toolkit_modules_subprocess_subprocess__shared__unix.js,v 1.1 2019/04/15 08:31:10 pho Exp $

Fix broken native messaging on NetBSD and possibly other BSDs too:
https://bugzilla.mozilla.org/show_bug.cgi?id=1543602

Please remove this patch when the upstream issue is resolved.

--- toolkit/modules/subprocess/subprocess_shared_unix.js.orig	2019-04-11 04:52:37.712288660 +0000
+++ toolkit/modules/subprocess/subprocess_shared_unix.js
@@ -12,7 +12,15 @@

 const LIBC = OS.Constants.libc;

-const LIBC_CHOICES = ["libc.so", "libSystem.B.dylib", "a.out"];
+/* libc.so isn't meant to be dlopen'ed. On Linux it's usually an ld
+ * script so one cannot dlopen it. On NetBSD (and possibly other
+ * BSDs too) dlopen'ing libc.so will succeed, but some global symbols,
+ * especially environ(7), are pointing to unused memory regions
+ * because they are meant to be overridden by the main executable.
+ * So the most portable way to access libc symbols is to do it through
+ * the NULL handle, i.e. the one which NSPR calls "a.out".
+ */
+const LIBC_CHOICES = ["a.out"];

 const unix = {
   pid_t: ctypes.int32_t,