Index: head/www/waterfox/Makefile =================================================================== --- head/www/waterfox/Makefile (revision 473936) +++ head/www/waterfox/Makefile (revision 473937) @@ -1,77 +1,78 @@ # $FreeBSD$ PORTNAME= waterfox DISTVERSION= 56.2.1-55 DISTVERSIONSUFFIX= -g6395bf177f76a +PORTREVISION= 1 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment EXPIRATION_DATE=2018-07-10 BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.4.7:print/harfbuzz \ graphite2>=1.3.10:graphics/graphite2 \ png>=1.6.31:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.19.3:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GITHUB= yes GH_ACCOUNT= MrAlex94 GH_PROJECT= Waterfox USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch MOZILLA_NAME= Waterfox USE_GL= gl WATERFOX_ICON= ${MOZILLA}.png WATERFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default256.png WATERFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop MOZ_OPTIONS= --enable-application=browser \ --with-app-name=${MOZILLA} \ --with-app-basename=${MOZILLA_NAME} \ --with-distribution-id=org.${MOZILLA}project OPTIONS_DEFAULT= BUNDLED_CAIRO .include "${.CURDIR}/../../www/firefox/Makefile.options" # Inconsistent fallback order (libcubeb vs. audio_device) SNDIO_PREVENTS= ${OPTIONS_MULTI_AUDIO:NSNDIO} post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e 's/firefox/${MOZILLA}/' \ -e 's/Firefox/${MOZILLA_NAME}/' \ ${WATERFOX_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} ${WATERFOX_DESKTOP} \ ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON} .include Index: head/www/waterfox/files/patch-bug1469879 =================================================================== --- head/www/waterfox/files/patch-bug1469879 (nonexistent) +++ head/www/waterfox/files/patch-bug1469879 (revision 473937) @@ -0,0 +1,44 @@ +commit 9d9ab00e672b +Author: Kyle Machulis +Date: Mon Jun 25 16:59:08 2018 -0700 + + Bug 1469879 - Add check for closed socket on Multicast IPC parent funcs. r=baku, a=lizzard + + MozReview-Commit-ID: CaNYPtgFz87 + + --HG-- + extra : source : ca98b6f47b4e33673291a4dc2a4ebca28ce6db00 +--- + dom/network/UDPSocketParent.cpp | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git dom/network/UDPSocketParent.cpp dom/network/UDPSocketParent.cpp +index 5198c4be50c06..174d1e87b13e1 100644 +--- dom/network/UDPSocketParent.cpp ++++ dom/network/UDPSocketParent.cpp +@@ -450,6 +450,12 @@ mozilla::ipc::IPCResult + UDPSocketParent::RecvJoinMulticast(const nsCString& aMulticastAddress, + const nsCString& aInterface) + { ++ if (!mSocket) { ++ NS_WARNING("multicast socket is closed"); ++ FireInternalError(__LINE__); ++ return IPC_OK(); ++ } ++ + nsresult rv = mSocket->JoinMulticast(aMulticastAddress, aInterface); + + if (NS_WARN_IF(NS_FAILED(rv))) { +@@ -463,6 +469,12 @@ mozilla::ipc::IPCResult + UDPSocketParent::RecvLeaveMulticast(const nsCString& aMulticastAddress, + const nsCString& aInterface) + { ++ if (!mSocket) { ++ NS_WARNING("multicast socket is closed"); ++ FireInternalError(__LINE__); ++ return IPC_OK(); ++ } ++ + nsresult rv = mSocket->LeaveMulticast(aMulticastAddress, aInterface); + + if (NS_WARN_IF(NS_FAILED(rv))) { Property changes on: head/www/waterfox/files/patch-bug1469879 ___________________________________________________________________ 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