update to the latest upstream pre-release: lynx2.8.9dev.11

Resolves: CVE-2016-9179
This commit is contained in:
Kamil Dudka 2017-01-24 13:52:09 +01:00
parent c65c126eb4
commit d00198ebf0
6 changed files with 12 additions and 38 deletions

View File

@ -1,25 +0,0 @@
From 778a766d5a4fc891412edfc856e439770f54bc5b Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 20 Oct 2016 15:46:53 +0200
Subject: [PATCH] lynx: fix compatibility with OpenSSL 1.1
---
WWW/Library/Implementation/HTTP.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 925512d..0909013 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -802,7 +802,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);
CTRACE((tfp, "...adding SSL_OP_NO_TLSv1\n"));
}
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
--
2.7.4

View File

@ -13,7 +13,7 @@ index f01782f..ccc0846 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,7 +1,9 @@
# $LynxId: lynx.cfg,v 1.272 2016/04/11 00:23:19 tom Exp $
# $LynxId: lynx.cfg,v 1.274 2016/11/15 09:04:25 tom Exp $
# lynx.cfg file.
-# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
-# or Lynx_Dir:lynx.cfg (VMS)
@ -23,7 +23,7 @@ index f01782f..ccc0846 100644
+# Linux update, overwriting your changes). Instead, edit /etc/lynx-site.cfg.
#
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
#PRCS LYNX_VERSION "2.8.9dev.9"
#PRCS LYNX_VERSION "2.8.9dev.11"
@@ -90,7 +92,7 @@
#
# Normally we expect you will connect to a remote site, e.g., the Lynx starting

View File

@ -16,7 +16,7 @@ diff --git a/CHANGES b/CHANGES
index 360be68..8eca013 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1108,6 +1108,13 @@ Changes since Lynx 2.8 release
@@ -1140,6 +1140,13 @@ Changes since Lynx 2.8 release
* update win32 makefiles/build scripts to add LYmktime, parsdate modules -TD
* update config.guess (2008-04-14), config.sub (2008-06-16)

View File

@ -1,9 +1,9 @@
%global devrel 9
%global devrel 11
Summary: A text-based Web browser
Name: lynx
Version: 2.8.9
Release: 0.13.dev%{devrel}%{?dist}
Release: 0.14.dev%{devrel}%{?dist}
License: GPLv2
Group: Applications/Internet
Source: http://invisible-mirror.net/archives/lynx/tarballs/lynx%{version}dev.%{devrel}.tar.bz2
@ -24,9 +24,6 @@ Patch2: lynx-CVE-2008-4690.patch
# avoid build failure caused by mistakenly excluded <locale.h>
Patch3: lynx-2.8.8-locale.patch
# fix compatibility with OpenSSL 1.1
Patch4: lynx-2.8.9-openssl.patch
Provides: webclient
Provides: text-www-browser
BuildRequires: gettext
@ -58,7 +55,6 @@ exits quickly and swiftly displays web pages.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost%{_pkgdocdir}/lynx_help/lynx_help_main.html,g" lynx.cfg
@ -132,6 +128,9 @@ EOF
%config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
%changelog
* Tue Jan 24 2017 Kamil Dudka <kdudka@redhat.com> - 2.8.9-0.14.dev11
- update to the latest upstream pre-release (fixes CVE-2016-9179)
* Thu Oct 20 2016 Kamil Dudka <kdudka@redhat.com> - 2.8.9-0.13.dev9
- fix compatibility with OpenSSL 1.1

View File

@ -2,7 +2,7 @@
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iEYEABECAAYFAlcgEKAACgkQcCNT4Pfkjtt8kwCffEwMJYViI9cKKNh3kdksIM4l
4iQAoLNIxH4pH5sysbMZlKOBrkCuwzDv
=z14W
iEYEABECAAYFAlgrtAYACgkQcCNT4Pfkjtv2LQCeKSwUw3Veke5dKTYO+lR8Pn3/
z7sAnj4xLoPBqC1NW7gGeIt6UBk8dFAR
=YZyv
-----END PGP SIGNATURE-----

View File

@ -1 +1 @@
d52603dea459a6887a990d1afdc27ef4 lynx2.8.9dev.9.tar.bz2
SHA512 (lynx2.8.9dev.11.tar.bz2) = 702be6cb4f97bae4765d3de3d6ef1cd09e2ef27b570dfbea4f26a411f5bba2ab6d16aee5dbec0ebe63533de17664684ff42fb857b2d17d416774777b38083f50