lynx: update to 2.8.9

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11844 ec354946-7b23-47d6-9f5a-488ba84defc7

l/lynx/lynx-vl.spec

@@ -3,24 +3,40 @@
 Summary: A text-based Web browser.
 Summary(ja): テキストベースのウェブブラウザ
 Name: lynx
-Version: 2.8.7
+Version: 2.8.9
-Release: 4%{?_dist_release}
+Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/Internet
 URL: http://lynx.isc.org/
+
 # Source0: http://lynx.isc.org/current/lynx2.8.5dev.7.tar.bz2
-Source0: http://lynx.isc.org/current/lynx2.8.7.tar.bz2
+Source0: http://lynx.isc.org/current/lynx%{version}rel.1.tar.bz2
 Source1: lynx.cfg.ja
+
 # Patch0: lynx2-8-3-redhat.patch
-Patch0: lynx2-8-7-redhat.patch
+# Patch0: lynx2-8-7-redhat.patch
-Patch1: lynx2-8-6-telnet.patch
+# Patch1: lynx2-8-6-telnet.patch
-Patch2: lynx-284-i18ncfg.patch
+# Patch2: lynx-284-i18ncfg.patch
-Patch3: lynx2-8-7-vine.patch
+# Patch3: lynx2-8-7-vine.patch
+
+# prompt user before executing command via a lynxcgi link even in advanced mode,
+# as the actual URL may not be shown but hidden behind an HTTP redirect and set
+# TRUSTED_LYNXCGI:none in lynx.cfg to disable all lynxcgi URLs by default
+# [CVE-2008-4690]
+Patch11: lynx-CVE-2008-4690.patch
+
+Patch12: lynx-2.8.9-vine.patch
+
+
 # Requires: indexhtml
 Requires: vine-manual-base
 Provides: webclient
+
 BuildRequires: openssl-devel, ncurses-devel, slang-devel, zlib-devel
+BuildRequires: nkf
+
 Buildroot: %{_tmppath}/%{name}-root
+
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -32,6 +48,7 @@ quickly and swiftly displays Web pages.
 
 Install lynx if you would like to try this fast, non-graphical browser
 (you may learn to appreciate its strengths).
+#'
 
 %description -l ja
 lynx はテキストベースのウェブブラウザである。lynx は何のイメージも
@@ -42,37 +59,42 @@ lynx はウェブページを表示するのにすばやく即座に開始した
 この速い、グラフィカルでないブラウザを試したければインストールしなさい。
 (その長所のよさがわかるであろう)
 
+
 %prep
-%setup -q -n lynx2-8-7
+%setup -q -n lynx%{version}rel.1
-%patch0 -p1 -b .rh
+# %patch0 -p1 -b .rh
-%patch1 -p0 -b .telnet
+# %patch1 -p0 -b .telnet
 # %patch2 -p1 -b .i18ncfg
-%patch3 -p1 -b .vine
+# %patch3 -p1 -b .vine
+%patch11 -p1 -b .CVE-2008-4690
+%patch12 -p1 -b .vine
+
 perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost%{_docdir}/lynx-%{version}/lynx_help/lynx_help_main.html,g" lynx.cfg
 perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://www.google.com/,g" lynx.cfg
+nkf -w -Lu --overwrite docs/README.jp
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %configure --libdir=/etc \
-	--with-screen=slang --enable-warnings \
+  --with-screen=slang --enable-warnings \
-	--enable-default-colors --enable-externs \
+  --enable-default-colors --enable-externs \
-	--enable-internal-links --enable-nsl-fork \
+  --enable-internal-links --enable-nsl-fork \
-	--enable-persistent-cookies --enable-prettysrc \
+  --enable-persistent-cookies --enable-prettysrc \
-	--disable-font-switch --enable-source-cache \
+  --disable-font-switch --enable-source-cache \
-	--enable-kbd-layout --with-zlib \
+  --enable-kbd-layout --with-zlib \
-	--enable-charset-choice --enable-file-upload \
+  --enable-charset-choice --enable-file-upload \
-	--enable-cgi-links --enable-read-eta \
+  --enable-cgi-links --enable-read-eta \
-	--enable-addrlist-page --enable-cjk \
+  --enable-addrlist-page --enable-cjk \
-	--enable-justify-elts --enable-scrollbar \
+  --enable-justify-elts --enable-scrollbar \
-	--enable-libjs --enable-cgi-links --enable-nls \
+  --enable-libjs --enable-cgi-links --enable-nls \
-	--with-ssl=/usr
+  --with-ssl=/usr
 make
 
 %install
 rm -rf %{buildroot}
 %makeinstall mandir=%{buildroot}%{_mandir}/man1 libdir=%{buildroot}/etc
 # Install Lang dependent resources
-install -m444 %{SOURCE1} %{buildroot}/etc/lynx.cfg.ja
+# install -m444 %{SOURCE1} %{buildroot}/etc/lynx.cfg.ja
 
 mkdir -p %{buildroot}%{_datadir}/applications
 cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
@@ -108,7 +130,13 @@ rm -rf %{buildroot}
 %config %{_sysconfdir}/lynx.cfg
 #%lang(ja) %config %{_sysconfdir}/lynx.cfg.ja
 
+
 %changelog
+* Mon Nov 14 2016 Toshiaki Ara <ara_t@384.jp> 2.8.9-1
+- update to 2.8.9
+- drop old patches (0 to 3)
+- add new patches (11, 12)
+
 * Sun May 15 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.7-4
 - rebuild with openssl-1.0.2