Index: branches/2017Q1/security/mbedtls/Makefile
===================================================================
--- branches/2017Q1/security/mbedtls/Makefile	(revision 436046)
+++ branches/2017Q1/security/mbedtls/Makefile	(revision 436047)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	mbedtls
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.2
 DISTVERSIONSUFFIX=	-apache
 CATEGORIES=	security devel
 MASTER_SITES=	https://tls.mbed.org/download/
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SSL/TLS and cryptography library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/apache-2.0.txt
 
 ALL_TARGET=	no_test
 TEST_TARGET=	test
 MAKE_ENV=	SHARED=1
 USES=		gmake tar:tgz
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/mbedtls-${PORTVERSION}
 
 CONFLICTS_INSTALL=	polarssl13-[0-9]*
 
 post-patch:
 	@${RM} ${WRKSRC}/include/mbedtls/*.orig
 	@${REINPLACE_CMD} \
 		-e 's/PREFIX/NAMEPREFIX/' \
 		-e 's/$$(DESTDIR)/&$$(PREFIX)/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \
 		${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
Index: branches/2017Q1/security/mbedtls/distinfo
===================================================================
--- branches/2017Q1/security/mbedtls/distinfo	(revision 436046)
+++ branches/2017Q1/security/mbedtls/distinfo	(revision 436047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477912207
-SHA256 (mbedtls-2.4.0-apache.tgz) = c1c3559ed39f7a1b1550c4cf4ccb918bf239301a3311d98dda92bed8a25b7f0d
-SIZE (mbedtls-2.4.0-apache.tgz) = 1917968
+TIMESTAMP = 1489351554
+SHA256 (mbedtls-2.4.2-apache.tgz) = 17dd98af7478aadacc480c7e4159e447353b5b2037c1b6d48ed4fd157fb1b018
+SIZE (mbedtls-2.4.2-apache.tgz) = 1925368
Index: branches/2017Q1/security/polarssl13/Makefile
===================================================================
--- branches/2017Q1/security/polarssl13/Makefile	(revision 436046)
+++ branches/2017Q1/security/polarssl13/Makefile	(revision 436047)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	polarssl
-PORTVERSION=	1.3.18
+PORTVERSION=	1.3.19
 DISTVERSIONSUFFIX=	-gpl
 CATEGORIES=	security devel
 MASTER_SITES=	https://polarssl.org/download/
 PKGNAMESUFFIX=	13
 DISTNAME=	mbedtls-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SSL/TLS and cryptography library
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ALL_TARGET=	no_test
 MAKE_ENV=	SHARED=1
 USES=		cpe gmake tar:tgz
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/mbedtls-${PORTVERSION}
 
 CONFLICTS=	polarssl-[0-9]*
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's/PREFIX/NAMEPREFIX/' \
 		-e 's/$$(DESTDIR)/&$$(PREFIX)/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \
 		${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
Index: branches/2017Q1/security/polarssl13/distinfo
===================================================================
--- branches/2017Q1/security/polarssl13/distinfo	(revision 436046)
+++ branches/2017Q1/security/polarssl13/distinfo	(revision 436047)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477913236
-SHA256 (mbedtls-1.3.18-gpl.tgz) = a229217182e024847deba3cb70bdd17e5ff4ffd9ff306cbbccfdbdff41950ea1
-SIZE (mbedtls-1.3.18-gpl.tgz) = 1772357
+TIMESTAMP = 1489352352
+SHA256 (mbedtls-1.3.19-gpl.tgz) = 59654984c5a30575142fb30ed04c2c3ac3c94f1c27843a04bce80ca111a4b00e
+SIZE (mbedtls-1.3.19-gpl.tgz) = 1776296
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 436046)
+++ branches/2017Q1	(revision 436047)

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