ports/contrib
3
3
Fork 2
Code Issues 1 Pull Requests Activity

lynx: add the missing patches

Browse Source
This commit is contained in:
Danny Rawlins 2018-05-14 19:56:43 +10:00
parent 585c83be63
commit d55c4f9854
2 changed files with 101 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
lynx/lynx-2.8.8rel.2-ncurses_6.1-1.patch Normal file
View File

@ -0,0 +1,80 @@
Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
Date: 2018-01-30
Initial Package Version: 2.8.8rel.2
Upstream Status: Fixed in master (at lynx-2.8.9dev.12)
Origin: Upstream
Description: Fix for building with ncurses-6.1
diff -ur lynx2.8.9dev.11/src/LYCurses.c lynx2.8.9dev.12/src/LYCurses.c
--- lynx2.8.9dev.11/src/LYCurses.c 2016-11-04 22:54:57.000000000 +0100
+++ lynx2.8.9dev.12/src/LYCurses.c 2017-03-18 22:42:48.000000000 +0100
@@ -1696,7 +1696,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;
@@ -1705,8 +1705,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')
@@ -1718,14 +1720,18 @@
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();
@@ -2203,6 +2209,8 @@
int y, x;
size_t inx;
+ (void) y;
+ (void) y0;
#ifdef USE_CURSES_PADS
/*
* If we've configured to use pads for left/right scrolling, that can
diff -ur lynx2.8.9dev.11/src/LYStrings.c lynx2.8.9dev.12/src/LYStrings.c
--- lynx2.8.9dev.11/src/LYStrings.c 2015-12-16 02:18:53.000000000 +0100
+++ lynx2.8.9dev.12/src/LYStrings.c 2017-04-29 02:32:21.000000000 +0200
@@ -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);
}
}

21
lynx/lynx-2.8.8rel.2-openssl_1.1.0-1.patch Normal file
View File

@ -0,0 +1,21 @@
Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
Date: 2017-06-28
Initial Package Version: 2.8.8rel.2
Upstream Status: Fixed in master (at lynx-2.8.9dev;10)
Origin: Upstream
Description: Fix for building with openssl-1.1
T--- ./WWW/Library/Implementation/HTTP.c.dist Thu Oct 27 20:10:54 2016
+++ ./WWW/Library/Implementation/HTTP.c Thu Oct 27 20:38:01 2016
@@ -720,7 +720,11 @@
#elif SSLEAY_VERSION_NUMBER >= 0x0900
#ifndef USE_NSS_COMPAT_INCL
if (!try_tls) {
- handle->options |= SSL_OP_NO_TLSv1;
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ SSL_set_min_proto_version(handle,TLS1_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);