svn commit: r479105 - branches/2018Q3/www/links

[Yuri Victorovich]

Author: yuri
Date: Thu Sep  6 15:55:14 2018
New Revision: 479105
URL: https://svnweb.freebsd.org/changeset/ports/479105

Log:
  MFH: r479089
  
  www/links: Update 2.14 -> 2.16
  Fix CVE-2017-11114.
  
  PR:		230849
  Submitted by:	Dmitri Goutnik <dg at syrec.org>
  Approved by:	portmaster at BSDforge.com (maintainer's timeout; 14 days)
  
  Approved by:	ports-secteam miwi

Modified:
  branches/2018Q3/www/links/Makefile
  branches/2018Q3/www/links/distinfo
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/www/links/Makefile
==============================================================================
--- branches/2018Q3/www/links/Makefile	Thu Sep  6 15:44:12 2018	(r479104)
+++ branches/2018Q3/www/links/Makefile	Thu Sep  6 15:55:14 2018	(r479105)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	links
-DISTVERSION=	2.14
-PORTREVISION=	1
+DISTVERSION=	2.16
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://links.twibright.com/download/
@@ -26,10 +25,13 @@ CPE_VENDOR=	twibright
 
 PLIST_FILES=	bin/links man/man1/links.1.gz
 
-OPTIONS_DEFINE=	CIPHERSTRING DIRECTFB IPV6 NLS SVG SVGALIB THREADS TRANS \
+OPTIONS_DEFINE=	BROTLI CIPHERSTRING DIRECTFB IPV6 NLS SVG SVGALIB THREADS TRANS \
 		UTF8 X11
 OPTIONS_DEFAULT=	UTF8 X11
 
+BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
+BROTLI_CONFIGURE_WITH=	brotli
+
 CIPHERSTRING_DESC=	Select the OpenSSL ciphers used via CIPHERSTRING
 DIRECTFB_DESC=		DirectFB graphics support
 TRANS_DESC=		Hack for background transparency
@@ -93,7 +95,7 @@ post-patch:
 		${WRKSRC}/configure
 .if ${PORT_OPTIONS:MCIPHERSTRING}
 	@${REINPLACE_CMD} -e '/SSL_CTX_set_options/ \
-	s/;/; SSL_CTX_set_cipher_list(context, "${CIPHERSTRING}");/' \
+	s/;/; SSL_CTX_set_cipher_list(ctx, "${CIPHERSTRING}");/' \
 		${WRKSRC}/https.c
 .endif
 

Modified: branches/2018Q3/www/links/distinfo
==============================================================================
--- branches/2018Q3/www/links/distinfo	Thu Sep  6 15:44:12 2018	(r479104)
+++ branches/2018Q3/www/links/distinfo	Thu Sep  6 15:55:14 2018	(r479105)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515181008
-SHA256 (links-2.14.tar.gz) = 22fa8dcb5a60b8ffd611de31ebd4c79edce472637a3554bab401795da91d4387
-SIZE (links-2.14.tar.gz) = 7142389
+TIMESTAMP = 1535040129
+SHA256 (links-2.16.tar.gz) = 83ab4557d9b121570384d1bd27adf16f962b9b007bac5780ae094e6fff6b3d62
+SIZE (links-2.16.tar.gz) = 7365133