CVS commit: pkgsrc/www/lynx

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb 16 07:17:09 UTC 2018

Modified Files:
        pkgsrc/www/lynx: Makefile distinfo
        pkgsrc/www/lynx/patches: patch-WWW_Library_Implementation_HTTP.c

Log Message:
lynx: fix build with openssl-1.1.

Bump PKGREVISION to be on the safe side.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/www/lynx/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/lynx/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTP.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/lynx/Makefile
diff -u pkgsrc/www/lynx/Makefile:1.128 pkgsrc/www/lynx/Makefile:1.129
--- pkgsrc/www/lynx/Makefile:1.128      Sun Feb 11 23:00:08 2018
+++ pkgsrc/www/lynx/Makefile    Fri Feb 16 07:17:09 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.128 2018/02/11 23:00:08 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2018/02/16 07:17:09 wiz Exp $
 
 DISTNAME=      lynx2.8.8rel.2
 PKGNAME=       ${DISTNAME:S/lynx/lynx-/:S/rel//}
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    www
 MASTER_SITES=  https://invisible-mirror.net/archives/lynx/tarballs/
 MASTER_SITES+= ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/

Index: pkgsrc/www/lynx/distinfo
diff -u pkgsrc/www/lynx/distinfo:1.35 pkgsrc/www/lynx/distinfo:1.36
--- pkgsrc/www/lynx/distinfo:1.35       Thu Dec 22 17:30:51 2016
+++ pkgsrc/www/lynx/distinfo    Fri Feb 16 07:17:09 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.35 2016/12/22 17:30:51 sevan Exp $
+$NetBSD: distinfo,v 1.36 2018/02/16 07:17:09 wiz Exp $
 
 SHA1 (lynx2.8.8rel.2.tar.bz2) = 65bbf95627c88723bbb5880155e5fe01c2753d0c
 RMD160 (lynx2.8.8rel.2.tar.bz2) = a683f9c163a6c343bde53ffde99dbecce4e41b02
 SHA512 (lynx2.8.8rel.2.tar.bz2) = a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362
 Size (lynx2.8.8rel.2.tar.bz2) = 2587120 bytes
 SHA1 (patch-WWW_Library_Implementation_HTTCP.c) = 7449ad250c5971483aba8bd3c233080deafe7837
-SHA1 (patch-WWW_Library_Implementation_HTTP.c) = 3249d46c1494f7913da71c8d1f689d9f3523d0f3
+SHA1 (patch-WWW_Library_Implementation_HTTP.c) = 0ae567e2c7622ba4ce43f48d717f4a5a6b4d01b1
 SHA1 (patch-WWW_Library_Implementation_HTTP.h) = 4ad3a9cf309c7ef32d0a53df6f5840ed57c25a31
 SHA1 (patch-WWW_Library_Implementation_HTUTILS.h) = 654c4bd1be5e2d8c74efb44e2a5e996957bf7622
 SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9

Index: pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTP.c
diff -u pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTP.c:1.1 pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTP.c:1.2
--- pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTP.c:1.1 Wed Dec 21 11:25:25 2016
+++ pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTP.c     Fri Feb 16 07:17:09 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-WWW_Library_Implementation_HTTP.c,v 1.1 2016/12/21 11:25:25 sevan Exp $
+$NetBSD: patch-WWW_Library_Implementation_HTTP.c,v 1.2 2018/02/16 07:17:09 wiz Exp $
 
 Mitigate POODLE vulnerability
 https://hg.java.net/hg/solaris-userland~gate/file/bc5351dcb9ac/components/lynx/patches/02-init-openssl.patch
@@ -49,6 +49,15 @@ https://hg.java.net/hg/solaris-userland~
            FREE(msg);
        }
        while ((*p1++ = *p2++) != '\0') {
+@@ -720,7 +728,7 @@ static int HTLoadHTTP(const char *arg,
+ #elif SSLEAY_VERSION_NUMBER >= 0x0900
+ #ifndef USE_NSS_COMPAT_INCL
+       if (!try_tls) {
+-          handle->options |= SSL_OP_NO_TLSv1;
++          SSL_CTX_set_options(handle, SSL_OP_NO_TLSv1);
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+       } else {
+           int ret = (int) SSL_set_tlsext_host_name(handle, ssl_host);
 @@ -1074,7 +1082,7 @@ static int HTLoadHTTP(const char *arg,
        char *host = NULL;