CVS commit: pkgsrc/www/firefox

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed May 22 06:24:17 UTC 2019

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo
Added Files:
        pkgsrc/www/firefox/patches:
            patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc

Log Message:
Add a patch to fix upstream bug 1553389; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.373 -r1.374 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.349 -r1.350 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.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/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.373 pkgsrc/www/firefox/Makefile:1.374
--- pkgsrc/www/firefox/Makefile:1.373   Fri May 10 19:44:11 2019
+++ pkgsrc/www/firefox/Makefile Wed May 22 06:24:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.373 2019/05/10 19:44:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.374 2019/05/22 06:24:17 pho Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            66.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=       .5
 
 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

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.349 pkgsrc/www/firefox/distinfo:1.350
--- pkgsrc/www/firefox/distinfo:1.349   Fri May 10 19:44:11 2019
+++ pkgsrc/www/firefox/distinfo Wed May 22 06:24:17 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.349 2019/05/10 19:44:11 ryoon Exp $
+$NetBSD: distinfo,v 1.350 2019/05/22 06:24:17 pho Exp $
 
 SHA1 (firefox-66.0.5.source.tar.xz) = f2704b63626a6305ce93ee201997d641a9f71ad4
 RMD160 (firefox-66.0.5.source.tar.xz) = 3a595a011b14bc19237717531836507204e3d71c
@@ -15,6 +15,7 @@ SHA1 (patch-gfx_skia_skia_src_core_SkCpu
 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
+SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29
 SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 25e24743060acf10c776c6b3b3660f52a2e9fbe8
 SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = f8d155ee66008b7cc4052b6a889327543b89e0bb
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836

Added files:

Index: pkgsrc/www/firefox/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc
diff -u /dev/null pkgsrc/www/firefox/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc:1.1
--- /dev/null   Wed May 22 06:24:17 2019
+++ pkgsrc/www/firefox/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc      Wed May 22 06:24:17 2019
@@ -0,0 +1,31 @@
+$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc,v 1.1 2019/05/22 06:24:17 pho Exp $
+
+In the original code there is a special case for Darwin whose
+sendmsg(2) fails with EMSGSIZE when a fd is to be transferred but
+there isn't enough space in the send buffer. It turned out the same
+applies to NetBSD too. It may affect other BSD kernels as well, but we
+haven't tested them.
+
+Please remove this patch when the upstream issue is resolved:
+https://bugzilla.mozilla.org/show_bug.cgi?id=1553389
+
+--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig   2019-05-10 06:37:41.200812057 +0000
++++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+@@ -9,7 +9,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <limits.h>
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_NETBSD)
+ #  include <sched.h>
+ #endif
+ #include <stddef.h>
+@@ -699,7 +699,7 @@ bool Channel::ChannelImpl::ProcessOutgoi
+           // Not an error; the sendmsg would have blocked, so return to the
+           // event loop and try again later.
+           break;
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_NETBSD)
+           // (Note: this comment is copied from https://crrev.com/86c3d9ef4fdf6;
+           // see also bug 1142693 comment #73.)
+           //