Add a patch to fix upstream bug #1543602; bump revision

3 files changed, 30 insertions, 2 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 8b1e6182a5d..8305e1fbf54 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.369 2019/04/11 13:42:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.370 2019/04/15 08:31:10 pho Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		66.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=	.3
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	${DISTNAME:S/.source//:S/b/beta/:S/esr//}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 4607014f57e..c91be01fd46 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.346 2019/04/11 13:42:32 ryoon Exp $
+$NetBSD: distinfo,v 1.347 2019/04/15 08:31:10 pho Exp $
 
 SHA1 (firefox-66.0.3.source.tar.xz) = 531b26c12a3c838bd5539e6f3497ae57206c7534
 RMD160 (firefox-66.0.3.source.tar.xz) = 868227674cdc2e92c4c0c183878a77907ed5e938
@@ -34,6 +34,7 @@ SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = baca
 SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_other_mod.rs) = 7af37abb3bf0674591192146476ea46ca180b5ab
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf
 SHA1 (patch-toolkit_library_moz.build) = 102e3713552c26f76e8b4e473846bb8fbc44b278
+SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 89b2b9d0cf2fe4882e9dd74dd692245e554ff03a
 SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc
 SHA1 (patch-toolkit_xre_glxtest.cpp) = 437b2edf6b3dc6514f454d7c7bc272a31285f751
diff --git a/www/firefox/patches/patch-toolkit_modules_subprocess_subprocess__shared__unix.js b/www/firefox/patches/patch-toolkit_modules_subprocess_subprocess__shared__unix.js
new file mode 100644
index 00000000000..965ac0364db
--- /dev/null
+++ b/www/firefox/patches/patch-toolkit_modules_subprocess_subprocess__shared__unix.js
@@ -0,0 +1,26 @@
+$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,