Index: branches/2016Q1/archivers/brotli/Makefile
===================================================================
--- branches/2016Q1/archivers/brotli/Makefile	(revision 410669)
+++ branches/2016Q1/archivers/brotli/Makefile	(revision 410670)
@@ -1,28 +1,28 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	brotli
 PORTVERSION=	0.2.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generic-purpose lossless compression algorithm
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_PYTHON=	autoplist distutils
 USES=		compiler:c++0x python
 
 PLIST_FILES=	bin/brotli
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/python/bro.py ${STAGEDIR}${PREFIX}/bin/brotli
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/brotli.so
 
 .include <bsd.port.mk>
Index: branches/2016Q1/archivers/brotli/files/patch-CVE-2016-1624
===================================================================
--- branches/2016Q1/archivers/brotli/files/patch-CVE-2016-1624	(nonexistent)
+++ branches/2016Q1/archivers/brotli/files/patch-CVE-2016-1624	(revision 410670)
@@ -0,0 +1,24 @@
+From 37a320dd81db8d546cd24a45b4c61d87b45dcade Mon Sep 17 00:00:00 2001
+From: eustas <eustas.ru@gmail.com>
+Date: Thu, 4 Feb 2016 15:35:44 +0100
+Subject: [PATCH] Fix possible pointer underflow
+
+---
+ dec/decode.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dec/decode.c b/dec/decode.c
+index 920959c..892a254 100644
+--- dec/decode.c
++++ dec/decode.c
+@@ -1410,6 +1410,10 @@ postReadDistance:
+         } else {
+           const uint8_t *ringbuffer_end_minus_copy_length =
+               s->ringbuffer_end - i;
++          /* Check for possible underflow and clamp the pointer to 0. */
++          if (PREDICT_FALSE(s->ringbuffer_end < (const uint8_t*)0 + i)) {
++              ringbuffer_end_minus_copy_length = 0;
++          }
+           copy_src = &s->ringbuffer[(pos - s->distance_code) &
+                                     s->ringbuffer_mask];
+           copy_dst = &s->ringbuffer[pos];

Property changes on: branches/2016Q1/archivers/brotli/files/patch-CVE-2016-1624
___________________________________________________________________
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/2016Q1
===================================================================
--- branches/2016Q1	(revision 410669)
+++ branches/2016Q1	(revision 410670)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r410664