Hello ports@,
Here is a patch to update lynx to 2.8.9pl11.
A new patch is required to handle OpenSSL 1.1 API #if:
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
Comments? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/lynx/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 24 Sep 2016 15:50:36 -0000 1.30
+++ Makefile 17 Nov 2016 10:20:25 -0000
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.30 2016/09/24 15:50:36 fcambus Exp $
V = 2.8.9
-PL = 9
+PL = 11
COMMENT = text web browser
DISTNAME = lynx${V}dev.${PL}
PKGNAME = lynx-${V}pl${PL}
-REVISION = 2
EXTRACT_SUFX = .tar.bz2
CATEGORIES = www net
@@ -13,7 +12,7 @@ HOMEPAGE = http://lynx.invisible-island.
MAINTAINER = Frederic Cambus <fcam...@openbsd.org>
-# GPLv2 only
+# GPLv2
PERMIT_PACKAGE_CDROM = Yes
# uses pledge()
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/lynx/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 17 May 2016 00:08:44 -0000 1.8
+++ distinfo 17 Nov 2016 10:20:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (lynx2.8.9dev.9.tar.bz2) = 8PV/HfzwkwnXvGHANxC10mWsDUeVfTVPApV7mJB64tQ=
-SIZE (lynx2.8.9dev.9.tar.bz2) = 5343335
+SHA256 (lynx2.8.9dev.11.tar.bz2) = KhCS8s3nbxCeTx3xdgwdKoeSunAYq3/zzCsB0U4MFbM=
+SIZE (lynx2.8.9dev.11.tar.bz2) = 2665470
Index: patches/patch-WWW_Library_Implementation_HTTP_c
===================================================================
RCS file: patches/patch-WWW_Library_Implementation_HTTP_c
diff -N patches/patch-WWW_Library_Implementation_HTTP_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-WWW_Library_Implementation_HTTP_c 17 Nov 2016 10:20:25
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- WWW/Library/Implementation/HTTP.c.orig Thu Nov 17 10:11:54 2016
++++ WWW/Library/Implementation/HTTP.c Thu Nov 17 10:01:29 2016
+@@ -926,7 +926,7 @@ static int HTLoadHTTP(const char *arg,
+ #elif SSLEAY_VERSION_NUMBER >= 0x0900
+ #ifndef USE_NSS_COMPAT_INCL
+ if (!try_tls) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_set_min_proto_version(handle, TLS1_1_VERSION);
+ #else
+ SSL_set_options(handle, SSL_OP_NO_TLSv1);
Index: patches/patch-lynx_man
===================================================================
RCS file: /cvs/ports/www/lynx/patches/patch-lynx_man,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lynx_man
--- patches/patch-lynx_man 15 Apr 2016 03:21:51 -0000 1.2
+++ patches/patch-lynx_man 17 Nov 2016 10:20:25 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lynx_man,v 1.2 2016/04/15 03:21:51 tb Exp $
---- lynx.man.orig Thu Oct 8 02:19:45 2015
-+++ lynx.man Wed Apr 13 13:03:58 2016
-@@ -593,6 +593,22 @@ flushes the cache on a proxy server
+--- lynx.man.orig Fri Oct 14 10:59:24 2016
++++ lynx.man Thu Nov 17 09:58:04 2016
+@@ -590,6 +590,22 @@ flushes the cache on a proxy server
allows a list of services to be disabled selectively.
Dashes and underscores in option names can be intermixed.
The following list is printed if no options are specified.
Index: patches/patch-src_LYReadCFG_c
===================================================================
RCS file: /cvs/ports/www/lynx/patches/patch-src_LYReadCFG_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_LYReadCFG_c
--- patches/patch-src_LYReadCFG_c 4 Sep 2016 13:35:02 -0000 1.2
+++ patches/patch-src_LYReadCFG_c 17 Nov 2016 10:20:25 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_LYReadCFG_c,v 1.2 2016/09/04 13:35:02 fcambus Exp $
---- src/LYReadCFG.c.orig Fri Dec 18 02:58:34 2015
-+++ src/LYReadCFG.c Sat Sep 3 22:22:14 2016
-@@ -1544,7 +1544,6 @@ static Config_Type Config_Table [] =
+--- src/LYReadCFG.c.orig Wed Oct 12 01:44:06 2016
++++ src/LYReadCFG.c Thu Nov 17 09:58:04 2016
+@@ -1549,7 +1549,6 @@ static Config_Type Config_Table [] =
#endif
PARSE_Env(RC_FTP_PROXY, 0),
PARSE_STR(RC_GLOBAL_EXTENSION_MAP, global_extension_map),
@@ -9,7 +9,7 @@ $OpenBSD: patch-src_LYReadCFG_c,v 1.2 20
PARSE_Env(RC_GOPHER_PROXY, 0),
PARSE_SET(RC_GOTOBUFFER, goto_buffer),
PARSE_PRG(RC_GZIP_PATH, ppGZIP),
-@@ -1662,7 +1661,6 @@ static Config_Type Config_Table [] =
+@@ -1667,7 +1666,6 @@ static Config_Type Config_Table [] =
PARSE_SET(RC_PERSISTENT_COOKIES, persistent_cookies),
#endif /* USE_PERSISTENT_COOKIES */
PARSE_STR(RC_PERSONAL_EXTENSION_MAP, personal_extension_map),
@@ -17,7 +17,7 @@ $OpenBSD: patch-src_LYReadCFG_c,v 1.2 20
PARSE_LST(RC_POSITIONABLE_EDITOR, positionable_editor),
PARSE_STR(RC_PREFERRED_CHARSET, pref_charset),
PARSE_ENU(RC_PREFERRED_ENCODING, LYAcceptEncoding,
tbl_preferred_encoding),
-@@ -1773,11 +1771,9 @@ static Config_Type Config_Table [] =
+@@ -1778,11 +1776,9 @@ static Config_Type Config_Table [] =
PARSE_PRG(RC_UUDECODE_PATH, ppUUDECODE),
PARSE_SET(RC_VERBOSE_IMAGES, verbose_img),
PARSE_SET(RC_VI_KEYS_ALWAYS_ON, vi_keys),
Index: patches/patch-src_LYUtils_c
===================================================================
RCS file: /cvs/ports/www/lynx/patches/patch-src_LYUtils_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_LYUtils_c
--- patches/patch-src_LYUtils_c 12 Mar 2016 14:29:13 -0000 1.1
+++ patches/patch-src_LYUtils_c 17 Nov 2016 10:20:25 -0000
@@ -5,9 +5,9 @@ order to avoid a "getpw" promise. This
'-DNOUSERS' option in the Makefile. If HOME is unset, the fallback is /tmp, so
no breakage is to be expected from this.
---- src/LYUtils.c.orig Sun Mar 22 16:38:23 2015
-+++ src/LYUtils.c Sun Jan 31 07:49:03 2016
-@@ -5253,10 +5253,11 @@ const char *Home_Dir(void)
+--- src/LYUtils.c.orig Tue Nov 15 10:34:30 2016
++++ src/LYUtils.c Thu Nov 17 09:58:04 2016
+@@ -5254,10 +5254,11 @@ const char *Home_Dir(void)
/*
* One could use getlogin() and getpwnam() here instead.
*/
