lynx: update to 2.9.0

5 files changed, 7 insertions, 72 deletions

diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 8a1e2b2af..f5488dc1f 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -4,19 +4,19 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		lynx
-PKG_VERSION:=		2.8.8
-PKG_RELEASE:=		3
-PKG_HASH:=		234c9dc77d4c4594ad6216d7df4d49eae3019a3880e602f39721b35b97fbc408
+PKG_VERSION:=		2.9.0
+PKG_RELEASE:=		1
+PKG_HASH:=		746c926e28d50571a42d2477f9c50784b27fc8cba4c7db7f3e6c9e00dde89070
 PKG_DESCR:=		text browser
 PKG_SECTION:=		app/browser
 PKG_DEPENDS:=		libncurses zlib libressl
 PKG_BUILDDEP:=		ncurses zlib libressl
-PKG_URL:=		http://lynx.isc.org/
-PKG_SITES:=		http://lynx.isc.org/${PKG_NAME}${PKG_VERSION}/
+PKG_URL:=		https://lynx.invisible-island.net/
+PKG_SITES:=		https://invisible-island.net/archives/lynx/tarballs/
 PKG_NOPARALLEL:=	1
 
 DISTFILES:=		${PKG_NAME}${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/lynx2-8-8
+WRKDIST=		${WRKDIR}/$(PKG_NAME)$(PKG_VERSION)
 
 include ${ADK_TOPDIR}/mk/package.mk
 
@@ -24,6 +24,7 @@ $(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 
 TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/include/openssl
 TARGET_CPPFLAGS+=	-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
+HOST_CFLAGS+=		-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
 
 CONFIGURE_ENV+=		ac_cv_path_TELNET=telnet \
 			ac_cv_path_TN3270=tn3270 \
diff --git a/package/lynx/patches/patch-WWW_Library_Implementation_HTTP_c b/package/lynx/patches/patch-WWW_Library_Implementation_HTTP_c
deleted file mode 100644
index 8f563a71b..000000000
--- a/package/lynx/patches/patch-WWW_Library_Implementation_HTTP_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lynx2-8-8.orig/WWW/Library/Implementation/HTTP.c	2014-01-11 20:06:15.000000000 +0100
-+++ lynx2-8-8/WWW/Library/Implementation/HTTP.c	2017-06-05 13:30:53.165071650 +0200
-@@ -720,7 +720,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_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);
diff --git a/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h b/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h
deleted file mode 100644
index c8217b70e..000000000
--- a/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h
+++ /dev/null
@@ -1,34 +0,0 @@
---- lynx2-8-8.orig/WWW/Library/Implementation/HTUtils.h	2014-02-05 01:50:18.000000000 +0100
-+++ lynx2-8-8/WWW/Library/Implementation/HTUtils.h	2014-03-21 22:14:07.000000000 +0100
-@@ -725,6 +725,8 @@ extern int WWW_TraceMask;
- 
- #define SHORTENED_RBIND		/* FIXME: do this in configure-script */
- 
-+#ifdef DONT_USE_SSL
-+#else
- #ifdef USE_SSL
- 
- #define free_func free__func
-@@ -765,6 +767,7 @@ extern int WWW_TraceMask;
- 
- #undef free_func
- #endif /* USE_SSL */
-+#endif
- 
- #ifdef HAVE_BSD_STDLIB_H
- #include <bsd/stdlib.h>		/* prototype for arc4random.h */
-@@ -801,11 +804,14 @@ extern "C" {
- 
-     extern FILE *TraceFP(void);
- 
-+#ifdef DONT_USE_SSL
-+#else
- #ifdef USE_SSL
-     extern SSL *HTGetSSLHandle(void);
-     extern void HTSSLInitPRNG(void);
-     extern int HTGetSSLCharacter(void *handle);
- #endif				/* USE_SSL */
-+#endif
- 
- #ifdef __cplusplus
- }
diff --git a/package/lynx/patches/patch-makefile_in b/package/lynx/patches/patch-makefile_in
deleted file mode 100644
index 5cb6b5962..000000000
--- a/package/lynx/patches/patch-makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lynx2-8-8.orig/makefile.in	2014-03-09 22:43:10.000000000 +0100
-+++ lynx2-8-8/makefile.in	2014-03-21 23:17:26.000000000 +0100
-@@ -210,7 +210,7 @@ SRC_CFLAGS = \
- 	WWWINC=$(WWW_DIR) \
- 	WWWLIB="../$(WWW_DIR)/libwww.a"
- 
--actual_PROG  = `echo lynx|    sed '$(transform)'`
-+actual_PROG  = lynx
- binary_PROG  = $(actual_PROG)$x
- 
- all lynx$x: cfg_defs.h LYHelp.h
diff --git a/package/lynx/patches/patch-src_chrtrans_makeuctb_c b/package/lynx/patches/patch-src_chrtrans_makeuctb_c
deleted file mode 100644
index 9972a6f8c..000000000
--- a/package/lynx/patches/patch-src_chrtrans_makeuctb_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lynx2-8-8.orig/src/chrtrans/makeuctb.c	2013-11-29 01:52:56.000000000 +0100
-+++ lynx2-8-8/src/chrtrans/makeuctb.c	2014-03-21 22:12:13.000000000 +0100
-@@ -28,6 +28,7 @@
- 
- #define DONT_USE_GETTEXT
- #define DONT_USE_SOCKS5
-+#define DONT_USE_SSL
- #include <UCDefs.h>
- #include <UCkd.h>
-