Update to lynx-2.8.4-rel1, patchset d, now with IPv6 as well

Local patches we maintain to the distribution are:
- replace unbounded fscanf with fgets (avsm)
- spelling fixes (deraadt)
- hppa -O0 workaround (mickey)
- default to ftp passive (deraadt)
- work with non-exec scripts (deraadt,hin,maja)
- be more careful with rlogin username (art)
- default to our webpage (deraadt)
- install helpfiles locally (maja)
- mkdtemp temp space directory (art)
- install more recent config.guess (avsm)

Tested by beck,millert,grange,fries,miod and others, deraadt@ ok

6 files changed, 430 insertions, 30 deletions

diff --git a/gnu/usr.bin/lynx/docs/OS-390.announce b/gnu/usr.bin/lynx/docs/OS-390.announce
index 6eac7d2536e..47cbae06092 100644
--- a/gnu/usr.bin/lynx/docs/OS-390.announce
+++ b/gnu/usr.bin/lynx/docs/OS-390.announce
@@ -1,26 +1,26 @@
 This document suggests steps to install Lynx on OS/390 systems.
 
 ========================================================================
-o Download the archive file lynx2-8-2.tar.Z in BINARY from the site
+o Download the archive file lynx2-8-4.tar.Z in BINARY from the site
   where you found this announcement or from a site listed at
   http://lynx.browser.org/
 
 o Unpack with:
 
-	uncompress <lynx2-8-2.tar.Z | pax -rv -o to=IBM-1047
+	uncompress <lynx2-8-4.tar.Z | pax -rv -o to=IBM-1047
 
   The "-o to=IBM-1047" is needed to convert the ASCII archive
   to EBCDIC.  You must not download as a text file; the conversion
   must be performed after the uncompress.
 
 ========================================================================
-o Alternatively, download the PKZIPped archive lynx2-8-2.zip in BINARY.
+o Alternatively, download the PKZIPped archive lynx2-8-4.zip in BINARY.
 
 o Unpack with:
 
-	unzip -a lynx2.8.2.zip
+	unzip -aa lynx2-8-4.zip
 
-  The "-a" is needed to convert the ASCII archive
+  The "-aa" is needed to convert the ASCII archive
   to EBCDIC.  (unzip is not shipped with OS/390.  You can
   obtain it from:
 
@@ -38,7 +38,7 @@ o Run the configure script:
 	cd       ./OS390
 	rm -f config.cache
 	CC=c89 CFLAGS="-D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE" \
-	    ../lynx2-8-2/configure
+	    ../lynx2-8-4/configure
 
   The definitions select the ANSI C compiler (c89) and options
   to select the right header file directories.  You may also
@@ -64,8 +64,8 @@ o Build Lynx
 ========================================================================
 o Test Lynx:
 
-	./lynx -cfg=../lynx2-8-2/lynx.cfg \
-	    ../lynx2-8-2/lynx_help/lynx_help_main.html
+	./lynx -cfg=../lynx2-8-4/lynx.cfg \
+	    ../lynx2-8-4/lynx_help/lynx_help_main.html
 
 ========================================================================
 o Install Lynx:
diff --git a/gnu/usr.bin/lynx/docs/README.TRST b/gnu/usr.bin/lynx/docs/README.TRST
new file mode 100644
index 00000000000..68b27af7bfc
--- /dev/null
+++ b/gnu/usr.bin/lynx/docs/README.TRST
@@ -0,0 +1,158 @@
+Tabular Support for Simple Tables
+=================================
+Some definitions first:
+
+* NO table support
+  What it says. :)  Table related tags are treated like other
+  completely unrecognized tags.
+  Only listed for completeness, this does not describe Lynx.
+
+* MINIMAL table support
+  Table related tags are recognized, and are used to separate
+  the contents of different cells (by at least a space) and rows
+  (by a line break) visibly from each other.
+
+* LYNX minimal table support (LMTS)
+  The minimal table support as implemented by Lynx up to this point,
+  also includes the way ALIGN attributes are handled on TABLE, TR
+  and other specific tweaks (e.g. handle TABLE within PRE specially).
+  LMTS formatting is briefly described in the Lynx User Guide, see
+  the section "Lynx and HTML Tables" there. (The Users Guide has not
+  yet been updated for tabular support.)
+
+* TABULAR support for tables
+  Support for tables that really arranges table cells in tabular form.
+
+* Tabular Rendering for SIMPLE Tables (TRST)
+  Tabular support for some tables that are 'simple' enough; what this
+  code change provides.
+
+One basic idea behind providing TRST is that correct tabular support
+for all tables is complex, doesn't fit well into the overwhelmingly
+one-pass way in which Lynx does things, and may in the end not give
+pleasant results anyway for pages that (ab-)use more complex table
+structures for display formatting purposes (especially in view of Lynx
+limitations such as fixed character cell size and lack of horizontal
+scrolling; see also emacs w3 mode).  Full table support within Lynx
+hasn't happened so far, and continues to seem unlikely to happen in the
+near future.
+
+The other basic idea is the observation that for simple tables, as
+used mostly for data that are really tabular in nature, LMTS rendering
+can be transformed into TRST rendering, after parsing the TABLE element,
+by two simple transformations applied line by line:
+- Insert spaces in the right places.
+- Shift the line as a whole.
+
+And that's exactly what TRST does.  An implementation based on the
+simple observation above is relatively straightforward, for simple
+tables.  On encountering the start of a TABLE element, Lynx generates
+output as usual for LMTS.  But it also keeps track of cell positions
+and lengths in parallel.  If all goes well, that additional information
+is used to fix up the already formatted output lines when the TABLE
+ends.  If not all goes well, the table was not 'simple' enough, the
+additional processing is canceled.  One advantage is that we always
+have a 'safe' fallback to well-understood traditional LMTS formatting:
+TRST won't make more complex tables look worse than before.
+
+What are 'simple' tables?  A table is simple enough if each of its TR
+rows translates into at most one display line in LMTS formatting (excluding
+leading and trailing line breaks), and the width required by each row
+(before as well as after fixup) does not exceed the available screen size.
+Note that this excludes all tables where some of the cells are marked up as
+block elements ('paragraphs').  Tables that include nested TABLE elements
+are always specifically excluded, but the inner tables may be subject to
+TRST handling.  Also excluded are some constructs that indicate that markup
+was already optimized for Lynx (or other browsers with no or minimal table
+support): TABLE in PRE, use of TAB.
+
+The description so far isn't completely accurate.  In many cases, tables are
+not simple enough according to the last paragraph, but parts of each TR row
+can still benefit from some TRST treatment.  Some partial treatment is done
+for some tables in this grey zone, which may or may not help to a better
+display, depending on how the table is used.  This is an area where tweaks
+in the future are most expected, and where the code's behavior is currently
+not well defined.
+
+One possible approach:
+- The table is 'simple' according to all criteria set out in the previous
+  paragraph, except that some cells at the beginning and/or end of TR rows
+  may contain block elements (or other markup that results in formatting
+  like separate paragraphs).
+- There is at most one range of (non-empty) table cells in each row whose
+  contents is not paragraph-formatted, and who are rendered on one line
+  together by LMTS, separate from the paragraph-formatted cells.  Let's
+  call these cells the 'core' of a row.
+Fixups are then only applied to the text lines showing the 'core' cells.
+The paragraph-formatted cells are effectively pulled out before/after
+their row (no horizontal space is allocated to them for the purpose of
+determining column widths for core line formatting).
+
+This is expected to be most useful for tables that are mostly
+simple tabular data cells, but with the occasional longer
+text thrown in.  For example, a table with intended rendering:
+
+      --------------------------------------------------------
+     |  date  |   item no.   |  price  |       remarks        |
+     |--------|--------------|---------|----------------------|
+     | date-1 | item #1      |   $0.00 |                      |
+     |--------|--------------|---------|----------------------|
+     | date-2 | item #2      | $101.99 | A longer annotation  |
+     |        |              |         | marked up as a block |
+     |        |              |         | of text.             |
+     |--------|--------------|---------|----------------------|
+     | date-3 | long item #3 |  $99.00 |                      |
+      -------------------------------------------------------- 
+
+It may now be shown by Lynx as
+
+    .................................................
+
+      date    item no.    price  remarks
+     date-1 item #1        $0.00
+     date-2 item #2      $101.99
+
+     A longer annotation marked up as a block of
+     text.
+
+     date-3 long item #3  $99.00
+
+    .................................................
+
+As can be seen, this is still quite far from the intended rendering,
+but it is better than without any tabular support.
+
+Whether the code does something sensible with "grey area" tables is up
+for testing.  Most of the typical tables in typical Web pages aren't
+used in a way that can benefit from the TRST approach.  Parts of such
+tables may still end up getting shifted left or right by the TRST code
+when that doesn't improve anything, but I haven't seen it make things
+really worse so far (with the current code).
+
+TRST and Partial Display
+------------------------
+[ Partial display mode is the feature which allows viewing and scrolling
+of pages while they are loaded, without having to wait for a complete
+transfer. ]  During partial display rendering, table lines can sometimes
+be shown in the original formatting, i.e. with horizontal fixups not yet
+applied.  This is more likely for longer tables, and depends on the state
+in which partial display 'catches' the TRST code.  Sometimes the display
+may flicker: first the preliminary rendering of table lines is shown, then
+after loading is finished it is replaced by the fixed-up version.  I do
+not consider this a serious problem: if you have partial display mode
+enabled, presumably you want to be able to see as much data as possible,
+and scroll up and down through it, as early as possible.  In fact, the
+approach taken keeps Lynx free from a problem that may graphical browsers
+have: they often cannot render a table at all until it is received in full.
+
+------------------------------------------------------------------------
+
+To summarize:
+ - TRST is a solution that works in many cases where lack of tabular support
+   was most annoying.
+ - TRST doesn't implement a full table model, and it is extremely unlikely
+   that it will ever be the basis for that.  Keep on exploring external
+   solutions, or perhaps waiting for (better: working on) a more fundamental
+   redesign of Lynx's rendering engine.
+
+Klaus Weide - kweide@enteract.com 1999-10-13
diff --git a/gnu/usr.bin/lynx/docs/README.defines b/gnu/usr.bin/lynx/docs/README.defines
index 5ca9c25b947..2ec2ac46426 100644
--- a/gnu/usr.bin/lynx/docs/README.defines
+++ b/gnu/usr.bin/lynx/docs/README.defines
@@ -5,10 +5,10 @@ Does not include
 - symbols defined and documented in userdefs.h
 - symbols expected to be set by compiler to indicate system type or
   compiler features
-- some symbols set and used only in connection with the ./configure
+- many symbols set and used only in connection with the ./configure
   mechanism - the full and current list can be found in config.hin
   (as a template) or, after running ./configure, in lynx_cfg.h.
-- symbols and macros defined in the source code
+- most symbols and macros defined in the source code
 
 ***Not complete.***
 
@@ -37,6 +37,16 @@ packet driver.  I created four new defines to accomplish this.
 Added for 8+3 filesystems (DOS):
 	FNAMES_8_3  also defined in userdefs.h if __DJGPP__
 
+* incorporate changes for win32 by Hiroyuki Senshu <senshu@shonai-cit.ac.jp>
+  (SH) from
+    ftp://crab.it.osha.sut.ac.jp/pub/Win32/develope/senshu/Lynx/
+  Most changes are ifdef'd
+    #define _WIN_CC=    .... for Windows C Compiler
+    #define CJK_EX      .... CJK EXtension
+    #define SH_EX       .... Senshu Hiroyuki EXtension
+    #define WIN_EX      .... Windows EXtension
+
+
 B. Symbols to enable or disable specific features, mostly
 =========================================================
 Note that some of these may be only usable on some system types,
@@ -48,10 +58,9 @@ Network related, specific protocols
        			see comments in makefile.in
 # -DSHORTENED_RBIND  For a SOCKSified lynx with the short version of Rbind.
                		see comments in makefile.in
-# -DNOPORT         if you must use PASV instead of PORT for FTP
 
-Related to DirEd code - probably one usable for UNIX or similar
----------------------------------------------------------------
+Related to DirEd code - probably only usable for UNIX or similar
+----------------------------------------------------------------
 # -DDIRED_SUPPORT  (see INSTALLATION, Section II-1c)
 # -DOK_GZIP        (see INSTALLATION, Section II-1c)
 # -DOK_OVERRIDE    (see INSTALLATION, Section II-1c)
@@ -59,8 +68,10 @@ Related to DirEd code - probably one usable for UNIX or similar
 # -DOK_TAR         (see INSTALLATION, Section II-1c)
 # -DOK_UUDECODE    (see INSTALLATION, Section II-1c)
 # -DOK_ZIP         (see INSTALLATION, Section II-1c)
+# -DOK_INSTALL     to enable dired menu "Install" function
 # -DARCHIVE_ONLY   (see INSTALLATION, Section II-1c)
 # -DNO_CHANGE_EXECUTE_PERMS (see INSTALLATION, Section II-1c)
+# -DCANT_EDIT_UNWRITABLE_FILES (see LYEdit.c - always in effect for VMS)
 
 Related to formatting of local directory listings
 -------------------------------------------------
@@ -82,8 +93,7 @@ Using curses or ncurses library:
 # -DNO_SIZECHANGE (old) or HAVE_SIZECHANGE (new) whether using code to detect
                    new size after size changes of the terminal (window).
                    for UNIX handled by ./configure, may be set in HTUtils.h
-# -DUSE_SIZECHANGEHACK  enable hack to handle increasing the window size
-			above window size at startup
+# -DUSE_SCROLLBAR  supports scrollbar when built with ncurses
 
 Using slang library:
 # -DUSE_SLANG      (see INSTALLATION, Section II-1c)
@@ -93,21 +103,61 @@ Both:
 # 	if you have the reverse clear screen problem of some SUN4 systems, or
 # 	to work around some other "garbage on the screen" problems
 
-Related to *experimental* (unsupported) character style code
+Related to experimental (unsupported) character style code
 ------------------------------------------------------------
-# -DUSE_COLOR_STYLE (see INSTALLATION, Section II-1c) probably needs -DNCURSES
-# -DUSE_HASH       (see INSTALLATION, Section II-1c)  probably needs the above
-# -DLINKEDSTYLES   (see INSTALLATION, Section II-1c)  probably needs the above
-
-Other
------
-# -DDONT_TRACK_INTERNAL_LINKS - Handle following links to same doc differently.
-# -DEXP_CHARTRANS_AUTOSWITCH also let lynx switch term mode(Linux console only)
+# -DUSE_COLOR_STYLE (see INSTALLATION, Section II-1c) needs SVr4 curses
+
+Other general
+-------------
 # -DIGNORE_CTRL_C  Define if Control-C shouldn't exit lynx.
-# -DLY_FIND_LEAKS  (see INSTALLATION, Section II-1c)
 # -DNO_CPU_LIMIT   Disables Max CPU timeout (includes CLOCKS_PER_SECOND)
-# -DNSL_FORK       For fork-based name server lookups that can be 'z'apped.
-# -DSYSLOG_REQUESTED_URLS
-# 	if you would like logging of client requests via syslog()
-# -DUSE_ZLIB       To use some functions from zlib library if you have it.
-# -DDECLARE_WAIS_LOGFILES   see comments in makefile.in
+# -DNO_DUMP_WITH_BACKSPACES Disables -with_backspaces code
+# -DUSE_VASPRINT   Use vasprintf() function
+# -DNO_RULES	   Disables code for CERN-style rules files
+# -DMISC_EXP       Enable some truly experimental stuff
+# -DINACTIVE_INPUT_STYLE_VH  Different style for showing inactive text fields
+
+Untested
+--------
+# -DNO_EXTENDED_HTMLDTD	Disable some "SortaSGML" code, see SGML.c
+# -DWIND_DOWN_STACK Aggressive handling of end tags for "TagSoup", SGML.c
+
+C. Secondary symbols
+====================
+Some macros that are not primary, i.e. they are normally automatically
+set or unset in the code based on other macros (including those from
+./configure), but it may be sometimes useful to set them differently.
+They may directly affect several source files.  Filenames show where
+they are set.  Normally installers shouldn't have to care about these
+symbols.
+
+COOKIE_FILE		LYMain.c	default cookie file in HOME dir
+SHOW_WHEREIS_TARGETS	LYCurses.h	whereis search highlighting
+USE_KEYMAPS		LYCurses.h	use of .lynx-keymaps files
+
+D. Symbols defined locally to modify some behavior
+==================================================
+Defined in the source files to which they apply.  Only filenames are listed,
+the files would have to be read and edited anyway to change the definition.
+Normally installers shouldn't have to care about any of these symbols.
+
+ADVANCED_INFO				LYShowInfo.c
+ALLOW_PROXY_HEAD			LYUtils.c
+CHECK_FREE_MEM				GridText.c
+CLEAN_URLS				HTParse.c
+DEBUG_HOSTENT				HTTCP.c
+DEBUG_HOSTENT_CHILD			HTTCP.c
+DEFAULT_INVCHECK_BV			LYCookie.c
+DUPLICATE_ANCHOR_NAME_WORKAROUND	HTAnchor.c
+EXTENDED_OPTION_LOGIC			LYMain.c
+EXTENDED_STARTFILE_RECALL		LYMain.c
+OPTNAME_ALLOW_DASHES			LYMain.c
+OVERLAP					HTNews.c
+RESTRICT_NM_ALLOW_DASHES		LYUtils.c
+SOCKET_DEBUG_TRACE			HTTCP.c
+TRADITIONAL_SUFFIXES			HTInit.c
+USE_XHDR				HTNews.c
+max_cookies_buffer			LYCookie.c
+max_cookies_domain			LYCookie.c
+max_cookies_global			LYCookie.c
+reverse_mailcap				HTInit.c
diff --git a/gnu/usr.bin/lynx/docs/README.jp b/gnu/usr.bin/lynx/docs/README.jp
new file mode 100644
index 00000000000..b2d5a526db0
--- /dev/null
+++ b/gnu/usr.bin/lynx/docs/README.jp
@@ -0,0 +1,133 @@
+README for Japanese
+===================
+
+This document shows some supplements for Japanese in Japanese.
+この文書では日本語で御利用の方のための補足事項が記述されています。
+
+1. 概要
+
+Lynx Version 2.8.3 (と恐らくそれ以降の Lynx) では、2.8.2 以前の
+ものと日本語の文字コードの扱いが異なっています。この文書では 
+Lynx を日本語環境で利用される場合の固有の設定を簡単に説明します。
+
+特に ASSUME_CHARSET の扱いが変更された関係上、以前と同じ設定で利用
+していると従来文字化けしていなかった文章が文字化けしてしまう可能性が
+ありますので御注意ください。この点に関しては、この文書の
+「4. lynx.cfg の設定」の章を御参照ください。
+
+
+2. 日本語の文書の新しい処理方法
+
+(1) 日本語で記述された HTML 文書の文字コード (Character-Set) が、
+    META 要素、もしくは HTTP の応答で指定されていた場合、文書が
+    その文字コードで記述されていると仮定して処理します。
+
+(2) (1) 以外の場合で、ASSUME_CHARSET が shift_jis もしくは euc_jp に
+    設定されていた場合、文書がその文字コードで記述されていると仮定して
+    処理します。
+
+(3) (1) および (2) 以外の場合、複数の文字コードを用いてひとつの文書が
+    書かれていないと仮定して処理します。
+
+
+3. インストール
+
+インストール時における日本語固有の設定には以下のものがあります。
+必要に応じて設定を変更してインストールしてください。
+
+configure オプション
+  ・enable-cjk
+        千秋氏による主に日本語の処理にかかわる拡張を有効にするための
+        オプションです。これらの拡張は今後標準で組み込まれるか、他の
+        オプションにより有効にする方針のため、このオプションは将来
+        廃止されると思われます。
+
+マクロ
+  ・USE_TH_JP_AUTO_DETECT
+        前章 (3) の処理を有効にします。
+        このマクロは userdefs.h において標準で定義されています。
+
+  ・CONV_JISX0201KANA_JISX0208KANA
+        いわゆる半角カナを全角に変換して表示します。
+        このマクロは userdefs.h において標準で定義されています。
+
+  ・KANJI_CODE_OVERRIDE
+        文書の文字コードをユーザが指定できるようにする処理を有効に
+        します。この指定は、META 要素、HTTP の応答、ASSUME_CHARSET 
+        で指定された文字コードよりも優先されます。主に文書が間違った
+        文字コードを指定していた場合に有効です。文字コードは ^L により
+        切り替えることができます。ただし、多くのケースでは不要です。
+        このマクロは標準で定義 *されません*。
+
+  ・SH_EX
+        千秋氏による一般的な拡張を有効にするためのマクロです。
+        このマクロを設定すると、上記 KANJI_CODE_OVERRIDE を有効に
+        した場合の文字コードが画面上部に常に表示されるようになります。
+        このマクロは標準で定義 *されません*。
+
+
+4. lynx.cfg の設定
+
+********************   重 要   ********************
+lynx.cfg では ASSUME_CHARSET、ASSUME_LOCAL_CHARSET、
+ASSUME_UNREC_CHARSET を設定しないでください。
+********************   重 要   ********************
+
+Lynx Version 2.8.3 以降では、日本語で記述された HTML 文書の文字コード
+が明示的に指定されていない場合で、ASSUME_CHARSET が shift_jis もしくは 
+euc_jp に設定されていた場合、文書がその文字コードで記述されていると
+仮定して処理するようになりました。
+
+ただし、ASSUME_CHARSET を指定しなくても日本語の文字コードは自動的に
+判別され、多くのケースでは適切に処理されます。むしろ、ASSUME_CHARSET 
+を shift_jis や euc_jp に指定していると、それぞれ EUC、SJIS で書かれた
+文書が文字化けすることがあります。
+
+従って、lynx.cfg 内に、
+
+-------------------- ここから --------------------
+ASSUME_CHARSET:euc-jp
+-------------------- ここまで --------------------
+
+のように記述されていると文字化けの原因になりますので、特に理由がない
+限り、以下のようにコメントアウトするなどして ASSUME_CHARSET が設定
+されないようにしてください (ASSUME_LOCAL_CHARSET、ASSUME_UNREC_CHARSET 
+についても同様)。
+
+-------------------- ここから --------------------
+#ASSUME_CHARSET:euc-jp
+-------------------- ここまで --------------------
+
+必要であれば ASSUME_CHARSET はオプションメニュー、もしくは
+コマンドラインオプションから変更して下さい。
+
+補足:
+ASSUME_LOCAL_CHARSET は Lynx Version 2.8.3 では参照していないかも
+しれませんが、将来参照するようになるかもしれませんので、やはり設定
+しない方がいいと思います。
+
+
+5. 日本語が文字化けしたら
+
+すべての日本語で書かれた文書が文字化けするなら、オプションメニューで
+「Display Character Set」を「Japanese (EUC-JP)」、もしくは 
+「Japanese (Shift_JIS)」に変更して、変更を保存してください。
+もしくは lynx.cfg 内で CHARACTER_SET を euc-jp もしくは shift_jis に
+設定してください。
+
+一部の日本語で書かれた文書が文字化けするなら、前章「4. lynx.cfg の設定」
+を参照し、ASSUME_CHARSET を設定しないようにするか、もしくはオプション
+メニューで「assumed document character set」の部分を参照し、shift_jis 
+や euc-jp になっていないか確認し、もしなっていたら iso-8859-1 等に変更
+して、Lynx が日本語の文字コードを自動判別するようにしてください。
+
+それでも文字化けする場合は、
+  ・META 要素、もしくは HTTP の応答で指定されてる文字コードとは異なる
+    文字コードで文書が記述されている
+もしくは
+  ・ひとつの文書中に複数の文字コードで書かれた文字が含まれている
+と思われます。前者の場合は文書の管理者に改善を依頼するか、
+KANJI_CODE_OVERRIDE を定義してコンパイルした Lynx をお使いください。
+後者の場合は残念ですがあきらめてください。
+----
+2000/3/28 Takeshi Hataguchi <patakuti@t3.rim.or.jp>
diff --git a/gnu/usr.bin/lynx/docs/README.ssl b/gnu/usr.bin/lynx/docs/README.ssl
new file mode 100644
index 00000000000..a560f476045
--- /dev/null
+++ b/gnu/usr.bin/lynx/docs/README.ssl
@@ -0,0 +1,47 @@
+SSL support for Lynx 2.8.4 (SSL-MM 1.4.1)
+-- adapted from http://www.moxienet.com/lynx/
+
+Lynx, in its unmodified form, will not allow you to make secure socket layer
+(SSL) connections.  SSL is used for the secure transfer of information over the
+Internet.  Many sites are now requiring SSL to ensure security for themselves
+and their users.  With a version of Lynx modified to support SSL, Lynx users
+can now visit these sites with ease as well.
+
+The SSL configure option (--with-ssl) for Lynx provides the ability to make use
+of SSL over HTTP for secure access to web sites (HTTPS) and over NNTP for
+secure access to news servers (SNEWS).  SSL is handled transparently, allowing
+users to continue accessing web sites and news services from within Lynx
+through the same interface for both secure and standard transfers.
+
+This is based on, and requires, the OpenSSL library.  OpenSSL's distribution
+and use may be restricted by licenses and laws.  For information on obtaining
+OpenSSL, as well as information on its distribution, see
+http://www.openssl.org/.  The main distribution site is ftp://ftp.openssl.org/. 
+
+To test your version of Lynx for its SSL support, try it out with an SSL site. 
+http://www.moxienet.com/lynx/ssl-test will redirect you to a secure (https)
+page which will load if your browser contains SSL support, and give you some
+information about the connection.  Note that the server that you are redirected
+to may not have a valid certificate.  Lynx will not complain, as it does not
+yet support certificates, but other browsers may.  Since you will not be
+sending any sensitive data to the test page, this should not present a problem.
+
+It is the user's responsibility to ensure that all patent laws,
+export restrictions, and other considerations have been taken into account
+before using this software.
+
+-- Note:
+
+Lynx is GPL'd, so it falls under the regulations in EAR section
+740.13(e)(1):
+
+    (1) Encryption source code controlled under 5D002, which would be
+        considered publicly available under section 734.3(b)(3) and
+        which is not subject an express agreement for the payment a
+        licensing fee or royalty for commercial production or sale of
+        any product developed with the source code, is released from
+        EI controls and may be exported or reexported without review
+        under License Exception TSU, provided you have submitted
+        written notification to BXA of the Internet location (e.g.,
+        URL or Internet address) or a copy of source code by the time
+        of export.
diff --git a/gnu/usr.bin/lynx/docs/win-386.announce b/gnu/usr.bin/lynx/docs/win-386.announce
index 2f36fb23723..dcc482b81a5 100644
--- a/gnu/usr.bin/lynx/docs/win-386.announce
+++ b/gnu/usr.bin/lynx/docs/win-386.announce
@@ -26,3 +26,15 @@ contacted the author of DJGPP for help with getting this port further.
 
 Wayne Buttles
 lynx-port@fdisk.com
+
+
+
+Win32 port was further extended by Hiroyuki Senshu <senshu@shonai-cit.ac.jp>
+ftp://crab.it.osha.sut.ac.jp/pub/Win32/develope/senshu/Lynx/
+  Most changes are ifdef'd
+    #define _WIN_CC=    .... for Windows C Compiler
+    #define CJK_EX      .... CJK EXtension
+    #define SH_EX       .... Senshu Hiroyuki EXtension
+    #define WIN_EX      .... Windows EXtension
+
+Lynx now builds with C++ Builder, Borland C++, Visual C++, and Cygwin.