summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmael Luceno2019-05-23 20:45:49 +0200
committerIsmael Luceno2019-05-23 20:45:49 +0200
commitb58fa4939fbacd904b6414e47a0b560cffd390e4 (patch)
tree94af1e11d260140c48dc5c3c9332381f73f24af9
parentea05d55437e14ef9d12bb546bb510088cd5bcad7 (diff)
lynx 2.8.9rel.1
-rwxr-xr-xhttp/lynx/DETAILS4
-rw-r--r--http/lynx/HISTORY6
-rwxr-xr-xhttp/lynx/PRE_BUILD5
-rw-r--r--http/lynx/ncurses.patch65
-rw-r--r--http/lynx/openssl_api_fix.patch19
5 files changed, 7 insertions, 92 deletions
diff --git a/http/lynx/DETAILS b/http/lynx/DETAILS
index 19f338e05c..6301fd8293 100755
--- a/http/lynx/DETAILS
+++ b/http/lynx/DETAILS
@@ -1,7 +1,7 @@
SPELL=lynx
- VERSION=2.8.8rel.2
+ VERSION=2.8.9rel.1
SOURCE=${SPELL}${VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}2-8-8
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL$VERSION"
SOURCE_URL[0]=http://invisible-mirror.net/archives/${SPELL}/tarballs/${SOURCE}
SOURCE2=$SOURCE.asc
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
diff --git a/http/lynx/HISTORY b/http/lynx/HISTORY
index d037419801..63f26b8ae7 100644
--- a/http/lynx/HISTORY
+++ b/http/lynx/HISTORY
@@ -1,3 +1,8 @@
+2019-05-23 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated spell to 2.8.9rel.1
+ * PRE_BUILD, ncurses.patch, openssl_api_fix.patch: removed, not needed
+ anymore
+
2019-05-18 Ismael Luceno <ismael@sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/
@@ -113,4 +118,3 @@
2002-03-13 Eric Schabell <eric@schabell.com>
* HISTORY: Added
-
diff --git a/http/lynx/PRE_BUILD b/http/lynx/PRE_BUILD
deleted file mode 100755
index 0f925dbda1..0000000000
--- a/http/lynx/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-patch -fp1 < "$SPELL_DIRECTORY"/openssl_api_fix.patch &&
-message "${MESSAGE_COLOR}Fix compilation with current ncurses...${DEFAULT_COLOR}" &&
-patch -p1 < "${SPELL_DIRECTORY}"/ncurses.patch
diff --git a/http/lynx/ncurses.patch b/http/lynx/ncurses.patch
deleted file mode 100644
index 89ba214399..0000000000
--- a/http/lynx/ncurses.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# Based on upstream https://github.com/ThomasDickey/lynx-snapshots/commit/f0b064b47bfa046da941f5029cdc1b4c851553ce
-diff -Naur lynx2-8-8.orig/src/LYCurses.c lynx2-8-8/src/LYCurses.c
---- lynx2-8-8.orig/src/LYCurses.c 2018-03-08 19:48:25.407769464 -0800
-+++ lynx2-8-8/src/LYCurses.c 2018-03-08 19:51:20.086585678 -0800
-@@ -1695,7 +1695,7 @@
- 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;
-@@ -1704,8 +1704,10 @@
- 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')
-@@ -1717,14 +1719,17 @@
- 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 -Naur lynx2-8-8.orig/src/LYStrings.c lynx2-8-8/src/LYStrings.c
---- lynx2-8-8.orig/src/LYStrings.c 2018-03-08 19:48:25.403769514 -0800
-+++ lynx2-8-8/src/LYStrings.c 2018-03-08 19:52:23.681790628 -0800
-@@ -1004,12 +1004,13 @@
- {
- 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);
- }
- }
diff --git a/http/lynx/openssl_api_fix.patch b/http/lynx/openssl_api_fix.patch
deleted file mode 100644
index c6183a327a..0000000000
--- a/http/lynx/openssl_api_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Replace direct manipulation of the SSL struct with proper
-API usage; fixes building against LibreSSL.
-
---- a/WWW/Library/Implementation/HTTP.c
-+++ b/WWW/Library/Implementation/HTTP.c
-@@ -720,7 +720,12 @@ 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;
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) \
-+ || LIBRESSL_VERSION_NUMBER >= 0x2060000fL
-+ SSL_set_min_proto_version(handle, TLS1_1_VERSION);
-+#else
-+ SSL_set_options(handle, SSL_OP_NO_TLSv1);
-+#endif
- #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
- } else {
- int ret = (int) SSL_set_tlsext_host_name(handle, ssl_host);