Date: Thu, 9 Jan 2020 00:57:55 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522464 - in head/www/firefox: . files Message-ID: <202001090057.0090vtae045066@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jan 9 00:57:55 2020 New Revision: 522464 URL: https://svnweb.freebsd.org/changeset/ports/522464 Log: www/firefox: restore IPC optimization after r514482 Submitted by: Greg V Added: head/www/firefox/files/patch-bug1550891 (contents, props changed) Modified: head/www/firefox/Makefile (contents, props changed) Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Wed Jan 8 22:53:37 2020 (r522463) +++ head/www/firefox/Makefile Thu Jan 9 00:57:55 2020 (r522464) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 72.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Added: head/www/firefox/files/patch-bug1550891 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1550891 Thu Jan 9 00:57:55 2020 (r522464) @@ -0,0 +1,77 @@ +commit 965eb33c5e86 +Author: Greg V <greg@unrelenting.technology> +Date: Wed Jan 8 15:06:00 2020 -0800 + + Bug 1550891 - re-add SHM_ANON support in IPC shared memory, freezing via capabilities +--- + config/system-headers.mozbuild | 1 + + ipc/chromium/src/base/shared_memory_posix.cc | 16 +++++++++++++--- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index 88afca1070f86..beff3e2542c9f 100644 +--- config/system-headers.mozbuild ++++ config/system-headers.mozbuild +@@ -816,6 +816,7 @@ system_headers = [ + 'sys/bitypes.h', + 'sys/byteorder.h', + 'syscall.h', ++ 'sys/capsicum.h', + 'sys/cdefs.h', + 'sys/cfgodm.h', + 'sys/elf.h', +diff --git ipc/chromium/src/base/shared_memory_posix.cc ipc/chromium/src/base/shared_memory_posix.cc +index 0be9cce0b4bed..6ef69686e1ca8 100644 +--- ipc/chromium/src/base/shared_memory_posix.cc ++++ ipc/chromium/src/base/shared_memory_posix.cc +@@ -148,7 +148,7 @@ static int SafeShmUnlink(bool freezeable, const char* name) { + } + } + +-#elif !defined(ANDROID) ++#elif !defined(ANDROID) && !defined(__FreeBSD__) + static int SafeShmOpen(bool freezeable, const char* name, int oflag, int mode) { + return shm_open(name, oflag, mode); + } +@@ -160,7 +160,7 @@ static int SafeShmUnlink(bool freezeable, const char* name) { + + // static + bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) { +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(__FreeBSD__) + return false; + #else + *str += '/'; +@@ -186,7 +186,7 @@ bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) { + // enough for this. + StringAppendF(str, "org.mozilla.ipc.%d.", static_cast<int>(pid)); + return true; +-#endif // !ANDROID ++#endif // !ANDROID && !__FreeBSD__ + } + + bool SharedMemory::CreateInternal(size_t size, bool freezeable) { +@@ -212,6 +212,9 @@ bool SharedMemory::CreateInternal(size_t size, bool freezeable) { + return false; + } + needs_truncate = false; ++#elif defined(__FreeBSD__) ++ // FreeBSD supports anonymous shm_open ++ fd.reset(shm_open(SHM_ANON, O_RDWR, 0600)); + #else + // Generic Unix: shm_open + shm_unlink + do { +@@ -275,6 +278,13 @@ bool SharedMemory::Freeze() { + CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno); + return false; + } ++#elif defined(__FreeBSD__) ++ cap_rights_t rights; ++ cap_rights_init(&rights, CAP_MMAP_R); ++ if (cap_rights_limit(mapped_file_, &rights) != 0) { ++ CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno); ++ return false; ++ } + #else + DCHECK(frozen_file_ >= 0); + DCHECK(mapped_file_ >= 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001090057.0090vtae045066>