Index: head/www/firefox/Makefile =================================================================== --- head/www/firefox/Makefile (revision 522463) +++ head/www/firefox/Makefile (revision 522464) @@ -1,60 +1,61 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 72.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.24:devel/nspr \ nss>=3.48:security/nss \ icu>=64.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.4:print/harfbuzz \ graphite2>=1.3.13:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.30.1:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ zip:archivers/zip USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr USE_MOZILLA= -vpx USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: head/www/firefox/files/patch-bug1550891 =================================================================== --- head/www/firefox/files/patch-bug1550891 (nonexistent) +++ head/www/firefox/files/patch-bug1550891 (revision 522464) @@ -0,0 +1,77 @@ +commit 965eb33c5e86 +Author: Greg V +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(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); Property changes on: head/www/firefox/files/patch-bug1550891 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property