diff --git a/lynx-2.8.9-redhat.patch b/lynx-2.8.9-redhat.patch index 1410281..0e00e20 100644 --- a/lynx-2.8.9-redhat.patch +++ b/lynx-2.8.9-redhat.patch @@ -4,28 +4,27 @@ Date: Wed, 13 Feb 2013 15:17:08 +0100 Subject: [PATCH] lynx-2.8.6-redhat.patch rebased for 2.8.9 --- - lynx.cfg | 14 +++++++++++--- + lynx.cfg | 15 +++++++++++---- userdefs.h | 18 +++++++++--------- - 2 files changed, 20 insertions(+), 12 deletions(-) + 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/lynx.cfg b/lynx.cfg index f01782f..ccc0846 100644 --- a/lynx.cfg +++ b/lynx.cfg -@@ -1,8 +1,11 @@ - # $LynxId: lynx.cfg,v 1.252 2015/01/25 16:05:46 tom Exp $ +@@ -1,7 +1,9 @@ + # $LynxId: lynx.cfg,v 1.254 2015/03/22 15:16:20 tom Exp $ # lynx.cfg file. -# The default placement for this file is /usr/local/lib/lynx.cfg (Unix) -+# The default placement for this file is /etc/lynx.cfg (Red Hat Linux, Fedora) - # or Lynx_Dir:lynx.cfg (VMS) - # +-# or Lynx_Dir:lynx.cfg (VMS) ++# The default placement for this file is /etc/lynx.cfg ++# +# Please don't edit this file directly (it is updated with every Red Hat +# Linux update, overwriting your changes). Instead, edit /etc/lynx-site.cfg. -+# - # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ - #PRCS LYNX_VERSION "2.8.9dev.4" # -@@ -90,7 +93,7 @@ + # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ + #PRCS LYNX_VERSION "2.8.9dev.5" +@@ -90,7 +92,7 @@ # # Normally we expect you will connect to a remote site, e.g., the Lynx starting # site: @@ -34,7 +33,7 @@ index f01782f..ccc0846 100644 # # As an alternative, you may want to use a local URL. A good choice for this is # the user's home directory: -@@ -436,7 +439,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ +@@ -436,7 +438,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ # Find RFC 1345 at .url http://tools.ietf.org/html/rfc1345 # @@ -43,7 +42,7 @@ index f01782f..ccc0846 100644 .h2 LOCALE_CHARSET # LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to -@@ -1823,6 +1826,10 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ +@@ -1823,6 +1825,10 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ .ex #DOWNLOADER:Save OS/390 binary file: iconv -f IBM-1047 -t ISO8859-1 %s >%s:FALSE @@ -54,7 +53,7 @@ index f01782f..ccc0846 100644 .h1 Interaction .h2 NO_DOT_FILES -@@ -3422,6 +3429,7 @@ COLOR:6:brightred:black +@@ -3422,6 +3428,7 @@ COLOR:6:brightred:black #ENABLE_LYNXRC:VI_KEYS:ON #ENABLE_LYNXRC:VISITED_LINKS:ON .fi diff --git a/lynx-CVE-2008-4690.patch b/lynx-CVE-2008-4690.patch index b166d30..f2a4365 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 -@@ -998,6 +998,13 @@ Changes since Lynx 2.8 release +@@ -1010,6 +1010,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) @@ -34,7 +34,7 @@ diff --git a/lynx.cfg b/lynx.cfg index ee2aad3..144050d 100644 --- a/lynx.cfg +++ b/lynx.cfg -@@ -1070,7 +1070,7 @@ CHARACTER_SET:utf-8 +@@ -1069,7 +1069,7 @@ CHARACTER_SET:utf-8 # # The default TRUSTED_LYNXCGI rule is "none". # diff --git a/lynx.spec b/lynx.spec index 07c296b..4ba4133 100644 --- a/lynx.spec +++ b/lynx.spec @@ -1,9 +1,9 @@ -%global devrel 4 +%global devrel 5 Summary: A text-based Web browser Name: lynx Version: 2.8.9 -Release: 0.6.dev%{devrel}%{?dist} +Release: 0.7.dev%{devrel}%{?dist} License: GPLv2 Group: Applications/Internet Source: http://lynx.isc.org/current/lynx%{version}dev.%{devrel}.tar.bz2 @@ -123,6 +123,9 @@ EOF %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg %changelog +* Tue Apr 28 2015 Kamil Dudka - 2.8.9-0.7.dev5 +- update to the latest upstream pre-release + * Wed Feb 11 2015 Ville Skyttä - 2.8.9-0.6.dev4 - do not remove -g from our CFLAGS (#1191706) diff --git a/lynx2.8.9dev.4.tar.bz2.asc b/lynx2.8.9dev.5.tar.bz2.asc similarity index 59% rename from lynx2.8.9dev.4.tar.bz2.asc rename to lynx2.8.9dev.5.tar.bz2.asc index 65ac63a..c934ab4 100644 --- a/lynx2.8.9dev.4.tar.bz2.asc +++ b/lynx2.8.9dev.5.tar.bz2.asc @@ -2,7 +2,7 @@ Version: GnuPG v2.0.17 (FreeBSD) Comment: See http://lynx.isc.org/signatures.html for info -iEYEABECAAYFAlTFUSQACgkQXd+Pt2iOMabVzgCfQpqWZGNX/Jl9wXZ88kTRZku3 -8YUAoK5eFrzSQXBLjX96W9eweeV99CnX -=PKgo +iEYEABECAAYFAlUrFTEACgkQXd+Pt2iOMaa6cQCgxRPY+mrKtyWRjryEQXycl9gA +2WIAn1y+PmWefLhpMGElFDIm4qEyVqKt +=VDbl -----END PGP SIGNATURE----- diff --git a/sources b/sources index 84c1d6f..3b43794 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac82492886913f8c9285a2f1e9f2e5aa lynx2.8.9dev.4.tar.bz2 +2c24a391150273f23ff1211f976ea39f lynx2.8.9dev.5.tar.bz2