Index: branches/2018Q2/www/waterfox/Makefile
===================================================================
--- branches/2018Q2/www/waterfox/Makefile	(revision 473107)
+++ branches/2018Q2/www/waterfox/Makefile	(revision 473108)
@@ -1,78 +1,78 @@
 # $FreeBSD$
 
 PORTNAME=	waterfox
 DISTVERSION=	56.2.1-19
 DISTVERSIONSUFFIX=	-gff88ad0b627dc
-PORTREVISION=	1
+PORTREVISION=	2
 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: branches/2018Q2/www/waterfox/files/patch-bug1458048
===================================================================
--- branches/2018Q2/www/waterfox/files/patch-bug1458048	(nonexistent)
+++ branches/2018Q2/www/waterfox/files/patch-bug1458048	(revision 473108)
@@ -0,0 +1,40 @@
+commit 66dfec8053be
+Author: Daniel Minor <dminor@mozilla.com>
+Date:   Wed Jun 20 21:18:50 2018 -0400
+
+    Bug 1458048 - Cherry pick usersctp rev 8789a6da02e2c7c03522bc6f275b302f6ef977fe; r=drno, a=RyanVM
+    
+    --HG--
+    extra : source : 492697e43fb4abf3cca014249bc35797f3312236
+    extra : amend_source : 2a960ee15610dd344ceffd22dab70994cbf52198
+---
+ netwerk/sctp/src/netinet/sctp_auth.c | 4 +++-
+ netwerk/sctp/src/netinet/sctp_pcb.c  | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git netwerk/sctp/src/netinet/sctp_auth.c netwerk/sctp/src/netinet/sctp_auth.c
+index 50432ad8a5954..ee5ca36ce37b1 100755
+--- netwerk/sctp/src/netinet/sctp_auth.c
++++ netwerk/sctp/src/netinet/sctp_auth.c
+@@ -1525,6 +1525,8 @@ sctp_auth_get_cookie_params(struct sctp_tcb *stcb, struct mbuf *m,
+ 	    if (p_random != NULL) {
+ 		keylen = sizeof(*p_random) + random_len;
+ 		bcopy(p_random, new_key->key, keylen);
++	    } else {
++		keylen = 0;
+ 	    }
+ 	    /* append in the AUTH chunks */
+ 	    if (chunks != NULL) {
+diff --git netwerk/sctp/src/netinet/sctp_pcb.c netwerk/sctp/src/netinet/sctp_pcb.c
+index 2970970250a2a..58c164f5039c7 100755
+--- netwerk/sctp/src/netinet/sctp_pcb.c
++++ netwerk/sctp/src/netinet/sctp_pcb.c
+@@ -7688,6 +7688,8 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
+ 		if (p_random != NULL) {
+ 			keylen = sizeof(*p_random) + random_len;
+ 			bcopy(p_random, new_key->key, keylen);
++		} else {
++			keylen = 0;
+ 		}
+ 		/* append in the AUTH chunks */
+ 		if (chunks != NULL) {

Property changes on: branches/2018Q2/www/waterfox/files/patch-bug1458048
___________________________________________________________________
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
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 473107)
+++ branches/2018Q2	(revision 473108)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r473095