Index: head/www/waterfox/Makefile
===================================================================
--- head/www/waterfox/Makefile	(revision 472216)
+++ head/www/waterfox/Makefile	(revision 472217)
@@ -1,78 +1,78 @@
 # $FreeBSD$
 
 PORTNAME=	waterfox
 DISTVERSION=	56.2.0-31
 DISTVERSIONSUFFIX=	-gf435a827f82ac
-PORTREVISION=	5
+PORTREVISION=	6
 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 <bsd.port.mk>
Index: head/www/waterfox/files/patch-bug1467938
===================================================================
--- head/www/waterfox/files/patch-bug1467938	(nonexistent)
+++ head/www/waterfox/files/patch-bug1467938	(revision 472217)
@@ -0,0 +1,43 @@
+commit e390e1f2e6b3
+Author: Nils Ohlmeier [:drno] <drno@ohlmeier.org>
+Date:   Fri Jun 8 19:49:40 2018 -0700
+
+    Bug 1467938 - Fix out-of-bounds memory access in WebRTC VP9 Missing Frame Processing. r=ng, a=RyanVM
+    
+    --HG--
+    extra : source : 44ae071a453f285f841d4c3cc13e0b21427ace92
+---
+ .../modules/video_coding/rtp_frame_reference_finder.cc      | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git media/webrtc/trunk/webrtc/modules/video_coding/rtp_frame_reference_finder.cc media/webrtc/trunk/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
+index 3d5283378fb57..c7b893cdd4565 100644
+--- media/webrtc/trunk/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
++++ media/webrtc/trunk/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
+@@ -434,8 +434,11 @@ void RtpFrameReferenceFinder::ManageFrameVp9(
+       LOG(LS_WARNING) << "Received keyframe without scalability structure";
+ 
+     frame->num_references = 0;
+-    GofInfo info = gof_info_.find(codec_header.tl0_pic_idx)->second;
+-    FrameReceivedVp9(frame->picture_id, &info);
++    auto gof_info_it = gof_info_.find(codec_header.tl0_pic_idx);
++    if (gof_info_it == gof_info_.end())
++      return;
++
++    FrameReceivedVp9(frame->picture_id, &gof_info_it->second);
+     CompletedFrameVp9(std::move(frame));
+     return;
+   }
+@@ -508,6 +511,12 @@ bool RtpFrameReferenceFinder::MissingRequiredFrameVp9(uint16_t picture_id,
+   size_t gof_idx = diff % info.gof->num_frames_in_gof;
+   size_t temporal_idx = info.gof->temporal_idx[gof_idx];
+ 
++  if (temporal_idx >= kMaxTemporalLayers) {
++    LOG(LS_WARNING) << "At most " << kMaxTemporalLayers << " temporal "
++                    << "layers are supported.";
++    return true;
++  }
++
+   // For every reference this frame has, check if there is a frame missing in
+   // the interval (|ref_pid|, |picture_id|) in any of the lower temporal
+   // layers. If so, we are missing a required frame.

Property changes on: head/www/waterfox/files/patch-bug1467938
___________________________________________________________________
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