main/lynx: upgrade to 2.8.9_p1

3 files changed, 4 insertions, 105 deletions

diff --git a/main/lynx/APKBUILD b/main/lynx/APKBUILD
index c044a6da30..5f5a2c0b16 100644
--- a/main/lynx/APKBUILD
+++ b/main/lynx/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 pkgname=lynx
-pkgver=2.8.8_p2
+pkgver=2.8.9_p1
 _relver=${pkgver/_p/rel.}
 _v=${_relver%rel.*}
 pkgrel=1
@@ -13,11 +13,9 @@ license="GPL-2.0-only"
 depends="gzip"
 makedepends="openssl-dev gettext zlib-dev glib-dev perl ncurses-dev"
 subpackages="$pkgname-doc"
-source="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2
-	ncurses.patch
-	libressl.patch"
+source="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2"
 
-builddir="$srcdir"/${pkgname}${_v//./-}
+builddir="$srcdir"/${pkgname}${_relver}
 build() {
 	cd "$builddir"
 	./configure \
@@ -46,6 +44,4 @@ package() {
 		docdir=/usr/share/doc/lynx
 }
 
-sha512sums="a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362  lynx2.8.8rel.2.tar.bz2
-cb5336b3528d2d52dc3414e908ffa8c01bea9c0d111d542259308d673ee7dd93814a6281ba7d0b31c96b4d1276726ec3806e29e3be287d0bc257a401826bdc3f  ncurses.patch
-e67413579c486a89dcd19bd8c3d8e719f9e2ac754e2466d4af1a5c32bc804358d7f11cf0313d4759b4ce330c0442a1f9edad6c63b90cdd4a321cc83b4d8a324b  libressl.patch"
+sha512sums="61edbe082684fcbd91bdbf4f4d27c3baf92358811aaffc2f8af46adf23ca7b48aede1520fc5f2a8fc974a2f4bbf4e57e7e6027a187bfc6101e56878c98178e6d  lynx2.8.9rel.1.tar.bz2"
diff --git a/main/lynx/libressl.patch b/main/lynx/libressl.patch
deleted file mode 100644
index 5b173b0c74..0000000000
--- a/main/lynx/libressl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch to fix SSL support with LibreSSL.
-
-Taken from https://invisible-mirror.net/archives/lynx/patches/lynx2.8.9dev.17.patch.gz
-
-See also: https://bugs.alpinelinux.org/issues/7859
-
-diff -upr lynx2-8-8.orig/WWW/Library/Implementation/HTTP.c lynx2-8-8/WWW/Library/Implementation/HTTP.c
---- lynx2-8-8.orig/WWW/Library/Implementation/HTTP.c	2018-05-20 11:28:09.464968615 +0200
-+++ lynx2-8-8/WWW/Library/Implementation/HTTP.c	2018-05-20 11:28:19.171665560 +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);
-Only in lynx2-8-8/WWW/Library/Implementation: HTTP.c.orig
diff --git a/main/lynx/ncurses.patch b/main/lynx/ncurses.patch
deleted file mode 100644
index 5acab0cf93..0000000000
--- a/main/lynx/ncurses.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From f0b064b47bfa046da941f5029cdc1b4c851553ce Mon Sep 17 00:00:00 2001
-From: "Thomas E. Dickey" <dickey@invisible-island.net>
-Date: Sat, 18 Mar 2017 21:44:28 +0000
-Subject: [PATCH] snapshot of project "lynx", label v2-8-9dev_11m
-
----
- CHANGES         |  5 +++--
- src/LYCurses.c  | 18 ++++++++++++------
- src/LYStrings.c |  7 ++++---
- 3 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/src/LYCurses.c b/src/LYCurses.c
-index 6b839c28..63b73ece 100644
---- a/src/LYCurses.c
-+++ b/src/LYCurses.c
-@@ -1696,7 +1696,7 @@ void lynx_enable_mouse(int state)
- void lynx_nl2crlf(int normal GCC_UNUSED)
- {
- #if defined(NCURSES_VERSION_PATCH) && defined(SET_TTY) && defined(TERMIOS) && defined(ONLCR)
--    static TTY saved_tty;
-+    static struct termios saved_tty;
-     static int did_save = FALSE;
-     static int waiting = FALSE;
-     static int can_fix = TRUE;
-@@ -1705,8 +1705,10 @@ void lynx_nl2crlf(int normal GCC_UNUSED)
- 	if (cur_term == 0) {
- 	    can_fix = FALSE;
- 	} else {
--	    saved_tty = cur_term->Nttyb;
-+	    tcgetattr(fileno(stdout), &saved_tty);
- 	    did_save = TRUE;
-+	    if ((saved_tty.c_oflag & ONLCR))
-+		can_fix = FALSE;
- #if NCURSES_VERSION_PATCH < 20010529
- 	    /* workaround for optimizer bug with nonl() */
- 	    if ((tigetstr("cud1") != 0 && *tigetstr("cud1") == '\n')
-@@ -1718,14 +1720,18 @@ void lynx_nl2crlf(int normal GCC_UNUSED)
-     if (can_fix) {
- 	if (normal) {
- 	    if (!waiting) {
--		cur_term->Nttyb.c_oflag |= ONLCR;
-+		struct termios alter_tty = saved_tty;
-+
-+		alter_tty.c_oflag |= ONLCR;
-+		tcsetattr(fileno(stdout), TCSAFLUSH, &alter_tty);
-+		def_prog_mode();
- 		waiting = TRUE;
- 		nonl();
- 	    }
- 	} else {
- 	    if (waiting) {
--		cur_term->Nttyb = saved_tty;
--		SET_TTY(fileno(stdout), &saved_tty);
-+		tcsetattr(fileno(stdout), TCSAFLUSH, &saved_tty);
-+		def_prog_mode();
- 		waiting = FALSE;
- 		nl();
- 		LYrefresh();
-diff --git a/src/LYStrings.c b/src/LYStrings.c
-index e97481c2..02b1286d 100644
---- a/src/LYStrings.c
-+++ b/src/LYStrings.c
-@@ -1004,12 +1004,13 @@ static const char *expand_tiname(const char *first, size_t len, char **result, c
- {
-     char name[BUFSIZ];
-     int code;
-+    TERMTYPE *tp = (TERMTYPE *) (cur_term);
- 
-     LYStrNCpy(name, first, len);
-     if ((code = lookup_tiname(name, strnames)) >= 0
- 	|| (code = lookup_tiname(name, strfnames)) >= 0) {
--	if (cur_term->type.Strings[code] != 0) {
--	    LYStrNCpy(*result, cur_term->type.Strings[code], (final - *result));
-+	if (tp->Strings[code] != 0) {
-+	    LYStrNCpy(*result, tp->Strings[code], (final - *result));
- 	    (*result) += strlen(*result);
- 	}
-     }