From dca9db04cb76b399f33fd9920c459c927ad593ef Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 8 Sep 2018 08:22:28 -0300 Subject: [PATCH] lynx: update to 2.8.9.1. --- .../patches/ncurses-opaque_struct_term.patch | 59 ------------------- ...tch-WWW_Library_Implementation_HTTP.c.diff | 11 ---- srcpkgs/lynx/template | 18 +++--- 3 files changed, 9 insertions(+), 79 deletions(-) delete mode 100644 srcpkgs/lynx/patches/ncurses-opaque_struct_term.patch delete mode 100644 srcpkgs/lynx/patches/patch-WWW_Library_Implementation_HTTP.c.diff diff --git a/srcpkgs/lynx/patches/ncurses-opaque_struct_term.patch b/srcpkgs/lynx/patches/ncurses-opaque_struct_term.patch deleted file mode 100644 index 047fea9dea..0000000000 --- a/srcpkgs/lynx/patches/ncurses-opaque_struct_term.patch +++ /dev/null @@ -1,59 +0,0 @@ -Patch devised by comparing current source code against the -latest snapshot at https://github.com/ThomasDickey/lynx-snapshots/ -@pullmoll - ---- src/LYStrings.c 2013-11-29 01:52:56.000000000 +0100 -+++ src/LYStrings.c 2018-02-20 02:05:57.955776204 +0100 -@@ -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); - } - } ---- src/LYCurses.c 2014-03-09 22:43:10.000000000 +0100 -+++ src/LYCurses.c 2018-02-20 02:15:16.849798027 +0100 -@@ -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') ---- src/LYCurses.c 2018-02-20 02:16:04.602799891 +0100 -+++ src/LYCurses.c 2018-02-20 02:18:32.008805647 +0100 -@@ -1719,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 --git a/srcpkgs/lynx/patches/patch-WWW_Library_Implementation_HTTP.c.diff b/srcpkgs/lynx/patches/patch-WWW_Library_Implementation_HTTP.c.diff deleted file mode 100644 index 477bc8a43f..0000000000 --- a/srcpkgs/lynx/patches/patch-WWW_Library_Implementation_HTTP.c.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- WWW/Library/Implementation/HTTP.c.orig 2017-02-09 21:20:27 UTC -+++ WWW/Library/Implementation/HTTP.c -@@ -721,7 +722,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/srcpkgs/lynx/template b/srcpkgs/lynx/template index 6589252e68..c1e93e023d 100644 --- a/srcpkgs/lynx/template +++ b/srcpkgs/lynx/template @@ -1,19 +1,19 @@ -# Template build file for 'lynx' +# Template file for 'lynx' pkgname=lynx -_distver=2.8.8 -_patchver=2 -version=${_distver}.${_patchver} -revision=16 -wrksrc="${pkgname}${_distver//./-}" +_distver=2.8.9 +_patchver=1 +version="${_distver}.${_patchver}" +revision=1 +wrksrc="lynx${_distver}rel.${_patchver}" build_style=gnu-configure configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6" +makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel" short_desc="A text browser for the World Wide Web" maintainer="Enno Boland " -makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel" -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://lynx.invisible-island.net/" distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}rel.${_patchver}.tar.gz" -checksum=234c9dc77d4c4594ad6216d7df4d49eae3019a3880e602f39721b35b97fbc408 +checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e pre_configure() { sed -i configure \