Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 23 Jun 2018 00:34:10 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r473108 - in branches/2018Q2/www/waterfox: . files
Message-ID:  <201806230034.w5N0YAEV006779@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Sat Jun 23 00:34:09 2018
New Revision: 473108
URL: https://svnweb.freebsd.org/changeset/ports/473108

Log:
  MFH: r473095
  
  www/waterfox: apply some FF61 fix
  
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q2/www/waterfox/files/patch-bug1458048
     - copied unchanged from r473095, head/www/waterfox/files/patch-bug1458048
Modified:
  branches/2018Q2/www/waterfox/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/www/waterfox/Makefile
==============================================================================
--- branches/2018Q2/www/waterfox/Makefile	Sat Jun 23 00:16:27 2018	(r473107)
+++ branches/2018Q2/www/waterfox/Makefile	Sat Jun 23 00:34:09 2018	(r473108)
@@ -3,7 +3,7 @@
 PORTNAME=	waterfox
 DISTVERSION=	56.2.1-19
 DISTVERSIONSUFFIX=	-gff88ad0b627dc
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich@FreeBSD.org

Copied: branches/2018Q2/www/waterfox/files/patch-bug1458048 (from r473095, head/www/waterfox/files/patch-bug1458048)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/www/waterfox/files/patch-bug1458048	Sat Jun 23 00:34:09 2018	(r473108, copy of r473095, head/www/waterfox/files/patch-bug1458048)
@@ -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) {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806230034.w5N0YAEV006779>