commit 243d4a61e144572e45ad8f3c75a1712688372166 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Jun 14 23:41:34 2020 +1000 lynx: 2.8.8-p2 -> 2.8.9 diff --git a/lynx/.signature b/lynx/.signature index f74749bfa..9814d6337 100644 --- a/lynx/.signature +++ b/lynx/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36E/4zRliKLRQvC/oq73VWqI0HlrA12QHuCFPoy9aMbNuymKTMQ0W9upVu5pmQzJ/Sk67ZyHQSDMzrztEePLogo= -SHA256 (Pkgfile) = b410719c346e02646e51548799afffafe84af47d29b29626c6033679212e8481 +RWSagIOpLGJF3y3bgv009fEvcOxGaOcPlkWJWNtId1FjcFNxTWZog0cFSqQAICDkvEMAjj79dhHG0a2ftsHqFcTeeTdVWcbnDQo= +SHA256 (Pkgfile) = 34a60d0c724c82c30ccb9e9a80f0bc11e9f71028a6a494aa48e5b48022f13810 SHA256 (.footprint) = 3b22ed545f3a1403432447183afc67b052735c0869852b7771979b48e2e4fb09 -SHA256 (lynx2.8.8rel.2.tar.bz2) = 6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7 -SHA256 (lynx-2.8.8rel.2-openssl_1.1.0-1.patch) = 01ca7ef1b9c5bca880db5c349213357a5b0669a9606ea0fb137f244243ddd99a -SHA256 (lynx-2.8.8rel.2-ncurses_6.1-1.patch) = 35e903a53d91b10890782096a71ccbf7f2114ec3f79262c5bbc52f26e1af06a8 +SHA256 (lynx2.8.9rel.1.tar.bz2) = 387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595 diff --git a/lynx/Pkgfile b/lynx/Pkgfile index 21efc1fcd..7fdd39171 100644 --- a/lynx/Pkgfile +++ b/lynx/Pkgfile @@ -4,17 +4,13 @@ # Depends on: ncurses openssl zlib name=lynx -version=2.8.8-p2 -release=2 -source=(http://invisible-mirror.net/archives/lynx/tarballs/lynx2.8.8rel.2.tar.bz2 - lynx-2.8.8rel.2-openssl_1.1.0-1.patch - lynx-2.8.8rel.2-ncurses_6.1-1.patch) +version=2.8.9 +_relver=${version}rel.1 +release=1 +source=(https://invisible-mirror.net/archives/lynx/tarballs/${name}${_relver}.tar.bz2) build() { - cd lynx2-8-8 - - patch -p1 -i $SRC/lynx-2.8.8rel.2-openssl_1.1.0-1.patch - patch -p1 -i $SRC/lynx-2.8.8rel.2-ncurses_6.1-1.patch + cd ${name}${_relver} ./configure \ --prefix=/usr \ @@ -25,5 +21,5 @@ build() { --with-zlib make - make -j 1 DESTDIR=$PKG install + make DESTDIR=$PKG install } diff --git a/lynx/lynx-2.8.8rel.2-ncurses_6.1-1.patch b/lynx/lynx-2.8.8rel.2-ncurses_6.1-1.patch deleted file mode 100644 index 930689348..000000000 --- a/lynx/lynx-2.8.8rel.2-ncurses_6.1-1.patch +++ /dev/null @@ -1,80 +0,0 @@ -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); - } - } diff --git a/lynx/lynx-2.8.8rel.2-openssl_1.1.0-1.patch b/lynx/lynx-2.8.8rel.2-openssl_1.1.0-1.patch deleted file mode 100644 index 73710c2a7..000000000 --- a/lynx/lynx-2.8.8rel.2-openssl_1.1.0-1.patch +++ /dev/null @@ -1,21 +0,0 @@ -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);