Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
lynx
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
lynx
Commits
b7f62582
Commit
b7f62582
authored
Oct 18, 2019
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated lynx to 2.8.9rel.1
parent
5d7fe064
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
108 deletions
+5
-108
Makefile
Makefile
+5
-7
lynx-2.8.8rel.2-ncurses_6.1-1.patch
lynx-2.8.8rel.2-ncurses_6.1-1.patch
+0
-80
lynx-2.8.8rel.2-openssl_1.1.0-1.patch
lynx-2.8.8rel.2-openssl_1.1.0-1.patch
+0
-21
lynx2.8.8rel.2.tar.bz2
lynx2.8.8rel.2.tar.bz2
+0
-0
lynx2.8.9rel.1.tar.bz2
lynx2.8.9rel.1.tar.bz2
+0
-0
No files found.
Makefile
View file @
b7f62582
all
:
all
:
tar
xf lynx2.8.8rel.2.tar.bz2
tar
xf lynx2.8.9rel.1.tar.bz2
patch
-Np1
-d
lynx2-8-8 < lynx-2.8.8rel.2-openssl_1.1.0-1.patch
cd
lynx2.8.9rel.1
&&
./configure
--prefix
=
/usr
--sysconfdir
=
/etc/lynx
--datadir
=
/usr/share/doc/lynx-2.8.9rel.1
--with-zlib
--with-bzlib
--with-ssl
--with-screen
=
ncursesw
--enable-locale-charset
patch
-Np1
-d
lynx2-8-8 < lynx-2.8.8rel.2-ncurses_6.1-1.patch
$(MAKE)
-C
lynx2.8.9rel.1
cd
lynx2-8-8
&&
./configure
--prefix
=
/usr
--sysconfdir
=
/etc/lynx
--datadir
=
/usr/share/doc/lynx-2.8.8rel.2
--with-zlib
--with-bzlib
--with-ssl
--with-screen
=
ncursesw
--enable-locale-charset
$(MAKE)
-C
lynx2.8.9rel.1 install-full
$(MAKE)
-C
lynx2-8-8
chgrp
-v
-R
root /usr/share/doc/lynx-2.8.9rel.1/lynx_doc
$(MAKE)
-C
lynx2-8-8 install-full
chgrp
-v
-R
root /usr/share/doc/lynx-2.8.8rel.2/lynx_doc
rm
-rf
lynx2.8.8
rm
-rf
lynx2.8.8
lynx-2.8.8rel.2-ncurses_6.1-1.patch
deleted
100644 → 0
View file @
5d7fe064
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);
}
}
lynx-2.8.8rel.2-openssl_1.1.0-1.patch
deleted
100644 → 0
View file @
5d7fe064
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);
lynx2.8.8rel.2.tar.bz2
deleted
100644 → 0
View file @
5d7fe064
File deleted
lynx2.8.9rel.1.tar.bz2
0 → 100644
View file @
b7f62582
File added
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment