Index: head/devel/libsoup/Makefile
===================================================================
--- head/devel/libsoup/Makefile	(revision 448357)
+++ head/devel/libsoup/Makefile	(revision 448358)
@@ -1,77 +1,78 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libsoup
 PORTVERSION=	2.52.2
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	SOAP (Simple Object Access Protocol) implementation in C
 
 BUILD_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 RUN_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
 
 USES=		tar:xz
 PORTSCOUT=	limitw:1,even
 
 .if !defined(REFERENCE_PORT)
 
 USES+=		gettext gmake gnome libtool pathfix pkgconfig \
 		python:3:build sqlite:3 tar:xz
 USE_GNOME=	glib20 intlhack introspection:build \
 		libxml2 referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-more-warnings \
 		--disable-vala
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 LIBVERSION=	1.7.0
 PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
 
 .if defined(SOUP_SLAVE)
 USES+=		sqlite
 LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 CONFIGURE_ARGS+=--with-gnome
 .else
 CONFIGURE_ARGS+=--without-gnome
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
 		${WRKSRC}/libsoup/tld-parser.py
 	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
 		${WRKSRC}/configure
 
 .if defined(SOUP_SLAVE)
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gir-1.0/
 	${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.gir ${STAGEDIR}${PREFIX}/share/gir-1.0/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/girepository-1.0/
 	${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.typelib ${STAGEDIR}${PREFIX}/lib/girepository-1.0/
 	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/
 	cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${GMAKE} install-libsoupgnomeincludeHEADERS
 .endif
 
 post-install:
 .if defined(SOUP_SLAVE)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 .else
 	${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
 		${STAGEDIR}${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
 .endif
 
 .include <bsd.port.mk>
 
 .endif
Index: head/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c
===================================================================
--- head/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c	(nonexistent)
+++ head/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c	(revision 448358)
@@ -0,0 +1,58 @@
+From 03c91c76daf70ee227f38304c5e45a155f45073d Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Thu, 3 Aug 2017 09:56:43 -0400
+Subject: Fix chunked decoding buffer overrun (CVE-2017-2885)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=785774
+---
+ libsoup/soup-filter-input-stream.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/libsoup/soup-filter-input-stream.c b/libsoup/soup-filter-input-stream.c
+index cde4d12..2c30bf9 100644
+--- libsoup/soup-filter-input-stream.c
++++ libsoup/soup-filter-input-stream.c
+@@ -198,7 +198,7 @@ soup_filter_input_stream_read_until (SoupFilterInputStream  *fstream,
+ 				     GCancellable           *cancellable,
+ 				     GError                **error)
+ {
+-	gssize nread;
++	gssize nread, read_length;
+ 	guint8 *p, *buf, *end;
+ 	gboolean eof = FALSE;
+ 	GError *my_error = NULL;
+@@ -251,10 +251,11 @@ soup_filter_input_stream_read_until (SoupFilterInputStream  *fstream,
+ 	} else
+ 		buf = fstream->priv->buf->data;
+ 
+-	/* Scan for the boundary */
+-	end = buf + fstream->priv->buf->len;
+-	if (!eof)
+-		end -= boundary_length;
++	/* Scan for the boundary within the range we can possibly return. */
++	if (include_boundary)
++		end = buf + MIN (fstream->priv->buf->len, length) - boundary_length;
++	else
++		end = buf + MIN (fstream->priv->buf->len - boundary_length, length);
+ 	for (p = buf; p <= end; p++) {
+ 		if (*p == *(guint8*)boundary &&
+ 		    !memcmp (p, boundary, boundary_length)) {
+@@ -268,10 +269,9 @@ soup_filter_input_stream_read_until (SoupFilterInputStream  *fstream,
+ 	if (!*got_boundary && fstream->priv->buf->len < length && !eof)
+ 		goto fill_buffer;
+ 
+-	/* Return everything up to 'p' (which is either just after the boundary if
+-	 * include_boundary is TRUE, just before the boundary if include_boundary is
+-	 * FALSE, @boundary_len - 1 bytes before the end of the buffer, or end-of-
+-	 * file).
+-	 */
+-	return read_from_buf (fstream, buffer, p - buf);
++	if (eof && !*got_boundary)
++		read_length = MIN (fstream->priv->buf->len, length);
++	else
++		read_length = p - buf;
++	return read_from_buf (fstream, buffer, read_length);
+ }
+-- 
+cgit v0.12
+

Property changes on: head/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c
___________________________________________________________________
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