svn commit: r478088 - in head/www/lynx: . files

[Alex Kozlov]

Author: ak
Date: Sat Aug 25 21:38:00 2018
New Revision: 478088
URL: https://svnweb.freebsd.org/changeset/ports/478088

Log:
  - Update to 2.8.9.1
    Changes: https://lynx.invisible-island.net/lynx2.8.9/breakout/CHANGES
  
  PR:	230568
  Submitted by:	Dmitri Goutnik <dg at syrec.org>
  Approved by:	jharris at widomaker.com (maintainer)

Deleted:
  head/www/lynx/files/patch-CVE-2016-9179
  head/www/lynx/files/patch-WWW_Library_Implementation_HTTP.c
Modified:
  head/www/lynx/Makefile
  head/www/lynx/distinfo
  head/www/lynx/files/patch-CVE-2014-3566

Modified: head/www/lynx/Makefile
==============================================================================
--- head/www/lynx/Makefile	Sat Aug 25 19:58:59 2018	(r478087)
+++ head/www/lynx/Makefile	Sat Aug 25 21:38:00 2018	(r478088)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lynx
-PORTVERSION=	2.8.8.2
-PORTREVISION=	6
+PORTVERSION=	2.8.9.1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/ \
@@ -21,7 +20,6 @@ CONFLICTS=	lynx-2.8.[8-9]d*
 
 USES=		cpe ncurses shebangfix tar:bzip2
 SHEBANG_FILES=	samples/mailto-form.pl
-WRKSRC=		${WRKDIR}/${PORTNAME}2-8-8
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-zlib --libdir="${PREFIX}/etc" \
 		--enable-nsl-fork --enable-persistent-cookies \

Modified: head/www/lynx/distinfo
==============================================================================
--- head/www/lynx/distinfo	Sat Aug 25 19:58:59 2018	(r478087)
+++ head/www/lynx/distinfo	Sat Aug 25 21:38:00 2018	(r478088)
@@ -1,2 +1,3 @@
-SHA256 (lynx2.8.8rel.2.tar.bz2) = 6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7
-SIZE (lynx2.8.8rel.2.tar.bz2) = 2587120
+TIMESTAMP = 1534076790
+SHA256 (lynx2.8.9rel.1.tar.bz2) = 387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595
+SIZE (lynx2.8.9rel.1.tar.bz2) = 2689171

Modified: head/www/lynx/files/patch-CVE-2014-3566
==============================================================================
--- head/www/lynx/files/patch-CVE-2014-3566	Sat Aug 25 19:58:59 2018	(r478087)
+++ head/www/lynx/files/patch-CVE-2014-3566	Sat Aug 25 21:38:00 2018	(r478088)
@@ -1,16 +1,16 @@
-Disable SSLv2 and SSLv3 in lynx to "mitigate POODLE vulnerability".
-
-This change has been passed upstream.
-
---- WWW/Library/Implementation/HTTP.c.orig	2015-02-16 12:48:34.014809453 -0800
-+++ WWW/Library/Implementation/HTTP.c	2015-02-16 12:49:09.627395954 -0800
-@@ -119,7 +119,8 @@
+--- WWW/Library/Implementation/HTTP.c.orig	2018-08-12 12:33:30 UTC
++++ WWW/Library/Implementation/HTTP.c
+@@ -206,11 +206,8 @@ SSL *HTGetSSLHandle(void)
  #else
  	SSLeay_add_ssl_algorithms();
- 	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
--	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
-+	/* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */
-+	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+ 	if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) != NULL) {
+-#ifdef SSL_OP_NO_SSLv2
+-	    SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
+-#else
+-	    SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
+-#endif
++		/* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */
++	    SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
  #ifdef SSL_OP_NO_COMPRESSION
- 	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION);
+ 	    SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION);
  #endif