From d00198ebf0993133c1c3f8f57793d68779077230 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Tue, 24 Jan 2017 13:52:09 +0100 Subject: [PATCH] update to the latest upstream pre-release: lynx2.8.9dev.11 Resolves: CVE-2016-9179 --- lynx-2.8.9-openssl.patch | 25 ------------------- lynx-2.8.9-redhat.patch | 4 +-- lynx-CVE-2008-4690.patch | 2 +- lynx.spec | 11 ++++---- ...tar.bz2.asc => lynx2.8.9dev.11.tar.bz2.asc | 6 ++--- sources | 2 +- 6 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 lynx-2.8.9-openssl.patch rename lynx2.8.9dev.9.tar.bz2.asc => lynx2.8.9dev.11.tar.bz2.asc (61%) diff --git a/lynx-2.8.9-openssl.patch b/lynx-2.8.9-openssl.patch deleted file mode 100644 index 9ca461a..0000000 --- a/lynx-2.8.9-openssl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 778a766d5a4fc891412edfc856e439770f54bc5b Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -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 - diff --git a/lynx-2.8.9-redhat.patch b/lynx-2.8.9-redhat.patch index e3c8376..6d43ea2 100644 --- a/lynx-2.8.9-redhat.patch +++ b/lynx-2.8.9-redhat.patch @@ -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 diff --git a/lynx-CVE-2008-4690.patch b/lynx-CVE-2008-4690.patch index b2ed344..0763b9e 100644 --- a/lynx-CVE-2008-4690.patch +++ b/lynx-CVE-2008-4690.patch @@ -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) diff --git a/lynx.spec b/lynx.spec index aa72f36..0a727f6 100644 --- a/lynx.spec +++ b/lynx.spec @@ -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 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 - 2.8.9-0.14.dev11 +- update to the latest upstream pre-release (fixes CVE-2016-9179) + * Thu Oct 20 2016 Kamil Dudka - 2.8.9-0.13.dev9 - fix compatibility with OpenSSL 1.1 diff --git a/lynx2.8.9dev.9.tar.bz2.asc b/lynx2.8.9dev.11.tar.bz2.asc similarity index 61% rename from lynx2.8.9dev.9.tar.bz2.asc rename to lynx2.8.9dev.11.tar.bz2.asc index d3bf46f..1056eab 100644 --- a/lynx2.8.9dev.9.tar.bz2.asc +++ b/lynx2.8.9dev.11.tar.bz2.asc @@ -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----- diff --git a/sources b/sources index 03b47a5..2666a73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d52603dea459a6887a990d1afdc27ef4 lynx2.8.9dev.9.tar.bz2 +SHA512 (lynx2.8.9dev.11.tar.bz2) = 702be6cb4f97bae4765d3de3d6ef1cd09e2ef27b570dfbea4f26a411f5bba2ab6d16aee5dbec0ebe63533de17664684ff42fb857b2d17d416774777b38083f50