www/lynx: Update to lynx-2.8.9.1

Changes:

2018-07-08 (2.8.9rel.1)
* documentation/metrics updates -TD

2018-06-10 (2.8.9pre.1)
* fix an inconsistency in message for "-listonly" option (Debian #805753) -TD

2018-05-17 (2.8.9dev.19)
* update test-packages to use current ncurses test-packages -TD
* improve portability for sockaddr structures used in HTTP and FTP, for
  IPv6 and SOCKS configurations -TD
* fix several minor warnings reported by Coverity -TD
* build-fix overlooked in 2.8.9dev.3 when INACTIVE_INPUT_STYLE_VH is defined,
  for problem introduced by 2.8.8dev.17 code-cleanup -GV
* trim unnecessary intllib symbols from src/chrtrans/makefile.in -TD
* when cross-compiling, trim LDFLAGS from makefile rule linking makeuctb,
  because it is a build tool, which should generally use BUILD_LDFLAGS
  (patch by Thomas Petazzoni)

2018-05-06 (2.8.9dev.18)
* ignore content-encoding in HTContentToCompressType() if the content-type is
  known, to improve the suggested filename (report by Russell Bell) -TD
* add support for using client certificate with OpenSSL configuration (patch
  by Elliot Thomas).
* fix a few more memory leaks -TD
* put Lynx.leaks file in home directory like Lynx.trace (report by GV) -TD
* fix a memory leak in HTFTP.c -GV
* modify HTDoConnect(), adding a check for keyboard interrupt with 'z' in the
  select-loop -TD
* modify legacy feature from Lynx 2.7.2 which checks the hostname of a URI
  to guess whether to use HTTP, FTP, etc., depending upon the prefix of the
  URIs hostname.  This is now an optional feature, GUESS_SCHEME, which defaults
  to FALSE (Debian #893907) -TD

2018-03-21 (2.8.9dev.17)
* modify samples/oldlynx.bat to check if Lynx recognizes the -lss option -TD
* modify samples/*lynx.bat to check for environment variables that Lynx would
  test for temp-directory, and only if those are absent will the scripts
  attempt to create a temp-directory -TD
* modify samples/*lynx.bat to set PATH for executing utility programs -TD
* remove unused critSec_DNS -TD
* use EnterCriticalSection in ws_netread rather than InitializeCriticalSection
  since critSec_READ was initialized in LYMain.c (report by GV) -TD
* use freeaddrinfo() in one case where free() was used (report by GV) -TD
* implement "+" item type for gopher protocol (report by James Tomasino) -TD
* add checks in options-menu in case no color-styles have been defined -TD
* add Visual Studio project files for 2010, 2012 -TD
* improve checks for strings which should not be empty -TD
* check for empty personal-mail-address (report by TG) -TD
* modify samples/lynx-demo.cfg to use SOURCE_CACHE:memory -TD
* modify samples/*lynx.bat to use existing TEMP-directory if possible -TD
* modify windows installer to select directory containing SSL DLLs and copy
  them into lynx's application directory -TD
* add oldlynx.bat sample script to windows installer -TD
* use default lynx.lss color scheme with samples/lynx.bat -TD
* modify windows installers to use static libraries for pdcurses and slang,
  because the dll for the latter is much larger than the rest of lynx.
  Even with this change, lynx.exe is 50% larger when using slang than with
  pdcurses -TD
* rename test-package for ".rpm" to "lynx-dev" for consistency with ".deb" -TD
* improve samples/lynx.bat by using location of script rather than current
  directory -loto1992@inbox.ru ("Smuggler")
* permanently enable MISC_EXP feature -TD
* remove several obsolete ifdefs: DGUX, DGUX_OLD, HP_TERMINAL,
  REVERSE_CLEAR_SCREEN_PROBLEM, SHORTENED_RBIND, SLANG_MBCS_HACK, SNAKE -TD
* improve logic in HTCopy used to limit reads based on content-length to
  take into account server headers which extend past the first block read
  (report/test-case by Dick Wesseling) -TD
* permanently enable EXP_HTTP_HEADERS feature -TD
* modify color-style hashing to check for collisions (reported by TG, Russell
  Bell) -TD
* add PREFERRED_CONTENT_TYPE defaulting to text/plain and options-menu to
  replace an assumption in HTMIMEConvert that everything is text/html.
  Since most servers provide a valid Content-Type for HTML, and are more likely
  to omit it for files lacking a known suffix, defaulting to text/plain is a
  better choice -TD
* remove dead-code for OMIT_SCN_KEEPING -TD
* remove dead/unreachable pretty-source code in HTML.c, noticed because
  it complicates hashing -TD
* improve hashing for anchors and styles by using a more suitable hash-table
  size -TD
* add a note in lynx.cfg telling how to remove a default key-mapping -TD
* modify "=" command to make it possible to disable margins for the URL string,
  by first disabling wrapping using "|" -TD
* several fixes for Windows version -TH
  + fix an abnormal terminate when pressing 'd'(download) on no action button.
  + work around incompatibility in move() between POSIX and Windows.
    ref: https://www.securecoding.cert.org/confluence/display/c/FIO10-C.+Take+care+when+using+the+rename%28%29+function
  + fix limit-check for SJIS which prevented showing a show long title in the
    title bar on Windows environment.
  + fix problem with PDCurses when wrapping lines.
    ref: lynx-dev discussions "Subject: Wrapping line behavior"
  + fix resizing terminal problem with Windows + PDCurses.
    This problem occurs only with some combinations of source and destination
    screen size.
    For example: 80x25 -> 90x20
  + including some code clean up
* improve consistency in help-files discussing line-edit keymaps (prompted by
  Debian #888391) -TD
* additional fixes to work with LibreSSL on OpenBSD 6.2 -TD
* build-fixes for OpenSSL 1.1.0 versus 1.0.0 (patch by Quentin Minster).
* modify configure script to make a quirk of NetBSD's make-program less
  noticeable -TD
* modify configure script to work around pkgsrc's misconfiguration of shared
  libraries -TD
* modify po/makefile.inn to ensure the temporary files have distinct names
  to avoid problem with "make -j8" (Debian #890811) -TD
* update makefile/batch-scripts to allow building with newer Visual Studio
  versions, e.g., 2010, 2012, so that a 64-bit executable can be built -TD
* repair link in lynx_help_main.html to HTML 3.2 documentation
  (Savannah #47803) -TD
* update eo.po, fr.po from
    http://translationproject.org/latest/lynx
* improved several configure macros:
  CF_BUILD_CC, CF_CC_ENV_FLAGS, CF_CURSES_FUNCS, CF_CURSES_LIBS,
  CF_NCURSES_CONFIG -D
* updated ftp-site url -TD
* update config.guess (2018-01-26), config.sub (2018-01-15)

2017-07-10 (2.8.9dev.16)
* modify configure script to warn if NLS cannot be configured, and disable
  the feature rather than leaving it partly configured and failing during
  the build -TD
* modify configure script to allow pre-set $MSGFMT and $XGETTEXT variables to
  to used to build the NLS configuration using system's native NLS support -TD
* convert po/zh_TW.po to UTF-8 to work with Solaris10, which lacks big5 -TD
* build-fix for OSX Panther, which has PRId64 but not SCNd64 (patch by Martijn
  Dekker).
* modify po-makefile to use msgmerge to align with lynx.pot, and also use sed
  to update some obsolete homepage URLs in translations -TD
* add a note in the comments for INCLUDE in lynx.cfg regarding the default
  directory searches LYOpenCFG(), added in 2.8.4dev.20 (Debian #818047) -TD
* add a check to ensure that HTML_put_string() will not append a chunk onto
  itself (report by Ned Williamson) -TD
* update da.po, et.po, tr.po from
    http://translationproject.org/latest/lynx

2017-07-04 (2.8.9dev.15)
* add note in lynx.cfg about default values (Debian #408448) -TD
* amended Backes' change to the COLLAPSE_BR_TAGS feature for compatibility -TD
  + use ENABLE_LYNXRC to determine whether it is written to the .lynxrc file.
  + add command-line option, etc., for controlling whether blank lines are
    trimmed, e.g., trailing lines as well as the special case for collapsing
    br-tags.  Leading blank lines at the top of the document are untouched.
  + modify limit for trimmed lines to retain as little as 1 line; previously
    the trimming would go no smaller than 2 lines.
* add command-line option and options-menu item for COLLAPSE_BR_TAGS (patch
  by Peter Backes).
* fix strict gcc7 warnings on OSX, aside from those due to incorrect system
  headers -TD
* adjust definition of alloca() in HTUtils.h to quiet bogus compiler warning
  with NetBSD 7 -TD
* add configure check for preprocessor -C option, overlooked in c99 -TD
* correct logic in HTCopy() when re-reading a page (Debian #863008) -TD
* fix lintian warnings in ".deb" test-package -TD
* build-fix for PGI compilers, e.g., symbol conflicts -TD
* update eo.po from
    http://translationproject.org/latest/lynx

2017-05-10 (2.8.9dev.14)
* amend fix for Debian #841155, adding check for complete multibyte strings to
  decide when the cell-limit has been met (Debian #862148) -TD
* minor improvements to configure script to reduce warnings in config.log -TD
* update config.sub (2017-04-02)
* compiler-warning fixes for c99 on OSX -TD

2017-04-29 (2.8.9dev.13)
* amend fix for Debian #841155, adding check for special case where the
  expected number of cells is zero (report by Larry Hynes) -TD

2017-04-28 (2.8.9dev.12)
* correct logic in cell2char(), which gave up too early in determining the
  number of cells needed for a multibyte string in the editable text-fields
  (Debian #841155) -TD
* improve manual page discussion of environment variables, prompted by
  comments in Debian #791452, which overlooked the fact that details of proxy
  behavior are found in the user guide -TD
* cleanup some of the user's guide formatting, e.g., for quote-characters -TD
* consistently use "_" in command-line options table and manual page, to work
  with program logic that treats "-" as "_", but not the reverse (report by
  Larry Hynes) -TD
* improved several configure macros:  CF_ADD_CFLAGS, CF_CC_ENV_FLAGS,
  CF_GNU_SOURCE, CF_LARGEFILE, CF_MATH_LIB, CF_PROG_LINT, CF_SRAND,
  CF_XOPEN_SOURCE -TD
* modify Windows makefile to allow SSL_LIBS and SSL_DEFS to be overridden,
  reflecting naming-incompatibility in recent OpenSSL development -TD
* modify ncurses-specific code to allow its TERMINAL struct to be opaque -TD
* refine special case of server Content-Type from 2.8.7dev.11 changes to
  decompress files offered for download when the server has gzip'd them
  (report by TH) -TD
* amend comparision from 2.8.8dev.10 changes to handle slang specially
  (report/testcase by TH) -TD
* minor cleanup of UCDomap.c -TD
* build-fix for color-style with leak-checking -TD
* amend merge/fixes from
	http://en.sourceforge.jp/project/lynx-win32-pata
  as well as problem introduced by 2.8.8dev.6 cleanup -TH
* update ca.po, from
    http://translationproject.org/latest/lynx
* tidy whitespace in lynx.cfg (report by David Niklas) -TD
* fix two more typos in the list of ENABLE_LYNXRC in lynx.cfg -TD
* remove a repeated item for SEND_USERAGENT from lynx.cfg (Larry Hynes)
* accept userinfo in a URL, subject to override by -auth option or -pauth
  options.  According to RFC-3986, this is deprecated, but testing shows other
  clients support it -TD
* fix several minor warnings reported by Coverity -TD
* remove redundant asserts which follow a check that leads to outofmem(),
  added in 2.8.8dev.4 to appease clang 2.6, since clang 3.x understands
  no-return function declarations -TD
* when converting host+params to idna, temporarily separate the params to
  avoid a warning from idna_to_ascii_8z() -TD
* improve warning messages from 2.8.9dev.11 fixes when stripping user/password,
  dropping an unnecessary message and fixing a case where all-punctuation
  user name was not logged (report by Axel Beckert) -TD
* update config.guess (2017-03-05), config.sub (2017-02-07)

2016-11-15 (2.8.9dev.11)
* amend fix for stripping user/password to ensure that the stripped value is
  used when connecting to the host (prompted by discussion of CVE-2016-9179
  at https://lists.debian.org/debian-lts/2016/11/threads.html#00072) -TD

2016-11-08 (2.8.9dev.10)
* improved fix for OpenSSL 1.1 (Taketo Kabe).
* improve warning message when stripping user/password from URL; report on
  http://seclists.org/oss-sec/2016/q4/322 treated as a Lynx parsing error the
  punctuation such as "?" which is permitted by RFC-1738 in a user or password
  field.  RFC-3986 subsequently modified this.  The improved message points out
  the possible confusion by users when these fields contain punctuation -TD
* build-fix for OpenSSL 1.1 (Kamil Dudka)
* begin work to parse gopher extension "link to URL" -TD
* remove an obsolete comment in the manual page about -dump versus -force_html
  (report by Peter Schmitt) -TD
* modify samples/oldlynx to provide an empty ".lss" file as a better default
  than providing an empty "-lss" option -TD
* amend change made in 2.8.8dev.17 to permit multiple COLOR_STYLE items to
  restore the ability to cancel the color-style by providing an explicitly
  empty configuration item (in lynx.cfg, -lss or $LYNX_LSS).  In lynx.cfg, it
  is possible to follow the empty COLOR_STYLE with other data, but the -lss
  option overrides everything, and if that is not found, $LYNX_LSS overrides
  lynx.cfg -TD
* correct ifdef so that if the "news" parsing is disabled at compile time,
  HTTP.c interprets https:// links correctly when a https_proxy is set up
  (patch by Al Walker).
* add a limit-check in case colspan is given as zero for non-nested-table case
  (report by Sami Liedes) -TD
* update nl.po, sl.po from
    http://translationproject.org/latest/lynx

2016-04-26 (2.8.9dev.9)
* add workaround for servers such as https://www.xing.com which fail to close
  the connection when they finish sending compressed data.  This relies on
  the content-length (report by Klaus-Peter Wegge) -TD
* restore fix to filter out left-to-right marks which was broken in refactoring
  in 2.8.9dev.2, and also filter out right-to-left marks (Debian #808949) -TD
* fix build for current gnutls configuration which dropped the
  gnutls_protocol_set_priority function (reported by Axel Beckert, Andreas
  Metzler) -TD
* modify CF_LD_RPATH_OPT configure macro, changing FreeBSD case to use
  -Wl,-rpath rather than -rpath option.  According to FreeBSD #178732, either
  works since FreeBSD 4.x; however scons does not accept anything except the
  -Wl,-rpath form -TD
* add null-pointer checks for ssl_ctx in HTTP.c in case of error from calls
  on SSL_CTX_new (report by Yuan Jochen Kang) -TD
* update config.guess (2016-01-01), config.sub (2016-01-01)
* update da.po, fi.po, tr.po from
    http://translationproject.org/latest/lynx

2015-12-18 (2.8.9dev.8)
* fix regression in SSL support (report by Axel Beckert) -TD
* update et.po, fr.po, vi.po, zh_CN.po from
    http://translationproject.org/latest/lynx

2015-12-18 (2.8.9dev.7)
* make the HTTP version configurable, defaulting to "1.0" (HTTP/1.0) as
  HTTP_PROTOCOL, and make it changeable in the options menu -TD
* switch HTTP version to 1.1, adding an explicit "close" to work around
  the pitfall of persistent connections.  This is to work around a selective
  reading of RFC 2068 by duckduckgo.com - see
    http://lists.nongnu.org/archive/html/lynx-dev/2015-12/index.html
  -Axel Beckert
* fix a potential null dereference in tidy_tls.c reported by Coverity -TD
* extend advanced mode by showing field names in forms in the status line
  (suggested by TG) -TD
* fix some typos found by lintian -Axel Beckert
* correct buffer size in pretty_html() function of LYKeymap.c -TG
* add support for some HTML5 elements -Kihara Hideto
  Using this change, you can jump to <section id="speakers">.
  (The addition in src{0,1}_HTMLDTD.txt is copied from DIV.)
  <section>, <article>, <main>, <aside>, <header>, <footer>, <nav>, <figure>
* improve configure check for extended curses functions, needed for compiling
  with ncursesw on OSX, in particular when configuring with ncurses6 (report
  by Tom Wyant) -TD
* set SSL_MODE_AUTO_RETRY in OpenSSL configuration, completing work needed for
  Debian #707059 -TD
* correct description used for "K" vs "k" key binding in manpage -TD
* adopt some of the patches from Debian lynx package:
  + add Delete key usage to manpage (patch by Denis Briand, Debian #74358)
  + add $(LDFLAGS) when building makeuctb (patch by Atsuhito Kohda).
  + add NO_BUILDSTAMP symbol to appease
    https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros
  + add -n option to gzip when making gzip'd helpfiles (patch by Andreas
    Metzler).
  + add support for client certificates (patch by Simon Kainz, Debian #797901).
* use POSIX locale when sorting entries in cfg_defs.h (patch by Reiner Hermann,
  Debian #792770).
* move homepage for Lynx from
    http://lynx.isc.org
  to
    http://lynx.invisible-island.net
  because ISC has ended support -TD
* change "GNU Public License" to "GNU General Public License" for consistency
  (report by Axel Beckert) -TD
* free a use-after-free in scan_cookie_sublist (Redhat #1120925) -TG
* updates for configure macros from ncurses and xterm -TD
* fix for gnutls logic to support rehandshake on negotiation for optional
  client certificate, e.g., for https://contributors.debian.org (patch by
  Simon Kainz, Debian #797059).
* update ca.po, sv.po, et.po from
    http://translationproject.org/latest/lynx
* use gnutls_set_default_priority() to simplify algorithm priorities in the
  gnutls configuration as well as track occassional changes in that library
  (patch by Andreas Metzler, Debian #789189, Debian #784430).
* correct logic in LYsetRcValue() from 2.8.8dev.13, which would free the wrong
  pointer if the input had leading blanks (patch by Ruda Moura).
* fix CF_CHECK_SIZEOF autoconf macro to work when its working variables have
  been preset to an empty value (report by Andrew Arensburger) -TD
* update config.guess (2015-10-21), config.sub (2015-08-20)

2015-05-06 (2.8.9dev.6)
* add a note about OCSP to url-support documentation (Debian #745835) -TD
* change defaults for SSL prompts when a problem is detected to "no" (Debian
  #783477) -TD
* if an SSL error message is too long for the screen-width, trim it with an
  ellipsis so that the "(y)" part of the prompt for continuing will be visible
  (Debian #783476) -TD
* update test-packages to use ncurses6 test-packages -TD
* modify configure script to check for ncurses ".pc" files first before looking
  for the "ncurses*-config" scripts -TD
* modify configure script to accept a release-number for the ncurses/ncursesw
  values of the "--with-screen" option, e.g., "--with-screen=ncursesw6" -TD
* cosmetic fixes for autoconf macros to avoid vi-workaround -TD
* update da.po, et.po, fr.po, nl.po, vi.po from
    http://translationproject.org/latest/lynx
* regenerated lynx.pot, sent to translation project -TD
* update config.guess (2015-03-04), config.sub (2015-03-08)

2015-04-12 (2.8.9dev.5)
* add codes U+200A, U+200B to def7_uni.tbl (prompted by report by Sven
  Hartrumpf, as well as referring to
  https://www.cs.tut.fi/~jkorpela/chars/spaces.html) -TD
* restore large buffer-size from follow_link_number() which was altered in
  2.8.8dev.10 changes to use LYgetBString() (Debian #699068) -TD, -TG
* loosen the check in IsOurFile() to permit hard-linked files
  (Debian #429606) -TD
* update ca.po, cs.po, et.po, fi.po, fr.po, id.po, nl.po, pt_BR.po, ru.po,
  sl.po, tr.po, vi.po from
    http://translationproject.org/latest/lynx

2015-01-25 (2.8.9dev.4)
* modify check after gnutls_certificate_verify_peers2() to use
  gnutls_certificate_verification_status_print() when available, to give
  potentially more details on certficate revocation (patch by Andreas Metzler,
  Debian #745835, Debian #752610)

2015-01-05 (2.8.9dev.3)
* correct shortcut for "Send To" link used in Inno Setup script, broken in
  2.8.8dev.15 -TD
* amend change made in 2.8.8dev.10 to LYLocal.c get_filename(), ensuring that
  the bstring parameter can be (re)allocated within that function's call to
  LYgetBString() (report by Raoul Megelas) -TG
* build-fixes for djgpp 2.04 and gcc 4.8.4 using Watt-32 -GV

2014-12-21 (2.8.9dev.2)
* correct an inconsistent check for reload using isLYNXCGI() in the
  options-screen -TD
* add script after using msginit to create en.po, to work around renaming in
  Cygwin environment -TD
* improve overlay of field contents in form for "-dump" option; the change
  in 2.8.8dev.3 did not take into account UTF-8 values (Debian #770011) -TD
* correct a bug in the map_string_to_keysym() function introduced in
  2.8.8dev.17:  as used via the remap() function, this returns the curses
  code for a special key rather than Lynx's internal code (Debian #769601) -TD
* add checks when translating from UTF-8 to Unicode, to ensure that only the
  shortest encoding is accepted.  Other/longer encodings are mapped to the UCS
  replacement character as in xterm (Debian #763268) -TD
* modify LYExpandHostForURL() to call HTGetAddrInfo(), allowing DNS lookups
  for IPv6 to be interrupted, e.g., by typing ^G.  This was a path overlooked
  in 2.8.8dev.13 (reports by Chad Kline, etc.) -TD
* drop libgnutls-extra when using --with-gnutls-compat option -TD
* drop libgcrypt dependency when building with gnutls, using gnutls_rnd()
  rather than gcry_randomize() (adapted from patch by Andreas Metzler,
  Debian #753699) -TD
* fix a reference-after-free in scan_cookie_sublist(), probably fixing RedHat
  #1120925 -Mike Gorse
* update eo.po, id.po from
    http://translationproject.org/latest/lynx
* improve workaround for too-long pathnames in LYPrint.c SetupFilename() -TD
* fix a few inconsistencies between #if / #ifdef, including one for sleep()
  which broke cross-compiles for MinGW -TD
* updated/improved configure script macros (TD):
  + CF_ACVERSION_CHECK:  work around another gratuitous incompatibility
    introduced in 2.69 (reported by Ross Burton, openembedded.org)
  + CF_ADD_CFLAGS:  workaround for ash-shell
  + CF_ADD_LIBS:  workaround in CF_X_TOOLKIT uses pkgconfig, whose files
    generally are using incomplete dependencies - in turn introducing lots of
    duplication.  filter out the duplicates.
  + CF_CHECK_CFLAGS:  workaround for ash-shell
  + CF_CURSES_FUNCS:  improve workaround for weak-linkage, seems to fix tests
    with NetBSD 6.1
  + CF_INTEL_COMPILER:  cleanup the -no-gcc option which was leftover from
    testing - prcs does not build with this option.
  + CF_MAKEFLAGS:  workaround for GNU make 4.0 incompatibility with previous
    releases.
  + CF_SUBDIR_PATH:  add /usr/pkg and /opt/local to help configuring with
    pkgsrc and macports -TD
  + CF_XOPEN_SOURCE:  Minix3.2 ifdef's the POSIX.1-2001 functions inside
    _NETBSD_SOURCE, even though it was released 2012-02-29 - appease it.  At
    the same time, turn on the verbose flag to show that most platforms need
    platform-specific define's to get POSIX (sic).  Also, add case for UnixWare
    (report/discussion with Mark Ryan).
  + CF_X_ATHENA:  add --with-Xaw3dxft option
  + CF_X_TOOLKIT:  add workaround for breakage in XQuartz upgrades
* add check to ensure that "submit" command from 2.8.8dev.10 is performed
  in a form (report by Karen Lewellen) -TD
* update config.guess (2014-03-23), config.sub (2014-07-28)
This commit is contained in:
nia 2018-11-14 16:09:03 +00:00
parent 41d70568ea
commit 16067bf2d0
11 changed files with 7 additions and 325 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.131 2018/06/15 22:24:38 tez Exp $
# $NetBSD: Makefile,v 1.132 2018/11/14 16:09:03 nia Exp $
DISTNAME= lynx2.8.8rel.2
DISTNAME= lynx2.8.9rel.1
PKGNAME= ${DISTNAME:S/lynx/lynx-/:S/rel//}
PKGREVISION= 9
CATEGORIES= www
MASTER_SITES= https://invisible-mirror.net/archives/lynx/tarballs/
MASTER_SITES+= ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/
@ -17,7 +16,6 @@ LICENSE= gnu-gpl-v2
MAKE_JOBS_SAFE= no
SUBDIR= current
WRKSRC= ${WRKDIR}/lynx2-8-8
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
BROKEN_GETTEXT_DETECTION= yes

View file

@ -1,17 +1,8 @@
$NetBSD: distinfo,v 1.38 2018/06/15 22:24:38 tez Exp $
$NetBSD: distinfo,v 1.39 2018/11/14 16:09:03 nia Exp $
SHA1 (lynx2.8.8rel.2.tar.bz2) = 65bbf95627c88723bbb5880155e5fe01c2753d0c
RMD160 (lynx2.8.8rel.2.tar.bz2) = a683f9c163a6c343bde53ffde99dbecce4e41b02
SHA512 (lynx2.8.8rel.2.tar.bz2) = a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362
Size (lynx2.8.8rel.2.tar.bz2) = 2587120 bytes
SHA1 (patch-WWW_Library_Implementation_HTTCP.c) = 7449ad250c5971483aba8bd3c233080deafe7837
SHA1 (patch-WWW_Library_Implementation_HTTP.c) = 0ae567e2c7622ba4ce43f48d717f4a5a6b4d01b1
SHA1 (patch-WWW_Library_Implementation_HTTP.h) = 4ad3a9cf309c7ef32d0a53df6f5840ed57c25a31
SHA1 (patch-WWW_Library_Implementation_HTUTILS.h) = 654c4bd1be5e2d8c74efb44e2a5e996957bf7622
SHA1 (lynx2.8.9rel.1.tar.bz2) = 3e00ac30d008e0aa879bfd037abcfd9c0dd2faec
RMD160 (lynx2.8.9rel.1.tar.bz2) = 0923d229a32c6fc2586798a2b80630fca34e7493
SHA512 (lynx2.8.9rel.1.tar.bz2) = 61edbe082684fcbd91bdbf4f4d27c3baf92358811aaffc2f8af46adf23ca7b48aede1520fc5f2a8fc974a2f4bbf4e57e7e6027a187bfc6101e56878c98178e6d
Size (lynx2.8.9rel.1.tar.bz2) = 2689171 bytes
SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9
SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a
SHA1 (patch-af) = 31399c0c3394b90c0680708fff06f6f9e19674b3
SHA1 (patch-src_HTML.c) = 466ad0025bed3f3868e23867a83df405f20b9576
SHA1 (patch-src_LYCurses.c) = 66f416fd17cdb7a00beb4b850be711faf0afb605
SHA1 (patch-src_LYStrings.c) = 7472abbb8dd864f9361b0371c5ceff9a1e257ed6
SHA1 (patch-src_LYUtils.c) = fadef16c363b3e4327dd822f57b99274bcc6c6e3

View file

@ -1,31 +0,0 @@
$NetBSD$
Fix CVE-2016-9179
https://hg.java.net/hg/solaris-userland~gate/file/0a979060f73b/components/lynx/patches/05-fix-CVE-2016-9179.patch
--- WWW/Library/Implementation/HTTCP.c.orig 2016-12-21 10:03:58.000000000 +0000
+++ WWW/Library/Implementation/HTTCP.c
@@ -1792,7 +1792,6 @@ int HTDoConnect(const char *url,
int status = 0;
char *line = NULL;
char *p1 = NULL;
- char *at_sign = NULL;
char *host = NULL;
#ifdef INET6
@@ -1814,14 +1813,8 @@ int HTDoConnect(const char *url,
* Get node name and optional port number.
*/
p1 = HTParse(url, "", PARSE_HOST);
- if ((at_sign = StrChr(p1, '@')) != NULL) {
- /*
- * If there's an @ then use the stuff after it as a hostname.
- */
- StrAllocCopy(host, (at_sign + 1));
- } else {
StrAllocCopy(host, p1);
- }
+ strip_userid(host, FALSE);
FREE(p1);
HTSprintf0(&line, "%s%s", WWW_FIND_MESSAGE, host);

View file

@ -1,69 +0,0 @@
$NetBSD: patch-WWW_Library_Implementation_HTTP.c,v 1.2 2018/02/16 07:17:09 wiz Exp $
Mitigate POODLE vulnerability
https://hg.java.net/hg/solaris-userland~gate/file/bc5351dcb9ac/components/lynx/patches/02-init-openssl.patch
Fix CVE-2016-9179
https://hg.java.net/hg/solaris-userland~gate/file/0a979060f73b/components/lynx/patches/05-fix-CVE-2016-9179.patch
--- WWW/Library/Implementation/HTTP.c.orig 2014-01-11 19:06:15.000000000 +0000
+++ WWW/Library/Implementation/HTTP.c
@@ -105,6 +105,8 @@ static int HTSSLCallback(int preverify_o
SSL *HTGetSSLHandle(void)
{
+ char *ciphers;
+
#ifdef USE_GNUTLS_INCL
static char *certfile = NULL;
#endif
@@ -119,7 +121,12 @@ SSL *HTGetSSLHandle(void)
#else
SSLeay_add_ssl_algorithms();
ssl_ctx = SSL_CTX_new(SSLv23_client_method());
- SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
+ /* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */
+ SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+
+ ciphers = (char *)DEFAULT_CIPHER_SELECTION;
+ SSL_CTX_set_cipher_list(ssl_ctx, ciphers);
+
#ifdef SSL_OP_NO_COMPRESSION
SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION);
#endif
@@ -419,7 +426,7 @@ int ws_netread(int fd, char *buf, int le
/*
* Strip any username from the given string so we retain only the host.
*/
-static void strip_userid(char *host)
+void strip_userid(char *host, int parse_only)
{
char *p1 = host;
char *p2 = StrChr(host, '@');
@@ -432,7 +439,8 @@ static void strip_userid(char *host)
CTRACE((tfp, "parsed:%s\n", fake));
HTSprintf0(&msg, gettext("Address contains a username: %s"), host);
- HTAlert(msg);
+ if (msg !=0 && !parse_only)
+ HTAlert(msg);
FREE(msg);
}
while ((*p1++ = *p2++) != '\0') {
@@ -720,7 +728,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_CTX_set_options(handle, SSL_OP_NO_TLSv1);
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
} else {
int ret = (int) SSL_set_tlsext_host_name(handle, ssl_host);
@@ -1074,7 +1082,7 @@ static int HTLoadHTTP(const char *arg,
char *host = NULL;
if ((host = HTParse(anAnchor->address, "", PARSE_HOST)) != NULL) {
- strip_userid(host);
+ strip_userid(host, TRUE);
HTBprintf(&command, "Host: %s%c%c", host, CR, LF);
FREE(host);
}

View file

@ -1,16 +0,0 @@
$NetBSD: patch-WWW_Library_Implementation_HTTP.h,v 1.1 2016/12/21 11:25:25 sevan Exp $
Drop the use of weak ciphers
https://hg.java.net/hg/solaris-userland~gate/file/bc5351dcb9ac/components/lynx/patches/03-weak-ciphers-by-default.patch
--- WWW/Library/Implementation/HTTP.h.orig 2016-12-21 03:04:50.000000000 +0000
+++ WWW/Library/Implementation/HTTP.h
@@ -21,6 +21,8 @@ extern "C" {
GLOBALREF HTProtocol HTTPS;
#endif /* GLOBALREF_IS_MACRO */
+#define DEFAULT_CIPHER_SELECTION "ALL!EXPORT!EXPORT40!EXPORT56!aNULL!LOW!RC4"
+
#define URL_GET_METHOD 1
#define URL_POST_METHOD 2
#define URL_MAIL_METHOD 3

View file

@ -1,16 +0,0 @@
$NetBSD: patch-WWW_Library_Implementation_HTUTILS.h,v 1.1 2016/12/21 11:25:25 sevan Exp $
Fix CVE-2016-9179
https://hg.java.net/hg/solaris-userland~gate/file/0a979060f73b/components/lynx/patches/05-fix-CVE-2016-9179.patch
--- WWW/Library/Implementation/HTUtils.h.orig 2016-12-21 10:08:13.000000000 +0000
+++ WWW/Library/Implementation/HTUtils.h
@@ -801,6 +801,8 @@ extern "C" {
extern FILE *TraceFP(void);
+ extern void strip_userid(char *host, int warn);
+
#ifdef USE_SSL
extern SSL *HTGetSSLHandle(void);
extern void HTSSLInitPRNG(void);

View file

@ -1,16 +0,0 @@
$NetBSD: patch-af,v 1.7 2014/02/20 10:07:35 wiz Exp $
--- po/makefile.inn.orig 2010-10-04 09:44:56.000000000 +0000
+++ po/makefile.inn
@@ -82,6 +82,11 @@ INSTOBJ = $(NLS_TEXTDOMAIN)$(INSTOBJEXT
$(MSGFMT) -o $@ $<
.po.gmo:
+ @if [ `$(GMSGFMT) --version | head -1 | cut -d . -f 2` -lt 11 ]; then \
+ mv $< $<.bak; \
+ sed '/^msgstr/s/\([^\\]\)\(\\[^[:print:]]\)/\1\\\2/g' \
+ <$<.bak >$<; \
+ fi
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<

View file

@ -1,73 +0,0 @@
$NetBSD: patch-src_HTML.c,v 1.1 2018/06/15 22:24:39 tez Exp $
--- src/HTML.c.orig 2018-06-15 21:56:18.188943200 +0000
+++ src/HTML.c
@@ -505,6 +505,8 @@ void HTML_put_character(HTStructured * m
*/
void HTML_put_string(HTStructured * me, const char *s)
{
+ HTChunk *target = NULL;
+
#ifdef USE_PRETTYSRC
char *translated_string = NULL;
#endif
@@ -525,15 +527,15 @@ void HTML_put_string(HTStructured * me,
break; /* Do Nothing */
case HTML_TITLE:
- HTChunkPuts(&me->title, s);
+ target = &me->title;
break;
case HTML_STYLE:
- HTChunkPuts(&me->style_block, s);
+ target = &me->style_block;
break;
case HTML_SCRIPT:
- HTChunkPuts(&me->script, s);
+ target = &me->script;
break;
case HTML_PRE: /* Formatted text */
@@ -547,20 +549,20 @@ void HTML_put_string(HTStructured * me,
break;
case HTML_OBJECT:
- HTChunkPuts(&me->object, s);
+ target = &me->object;
break;
case HTML_TEXTAREA:
- HTChunkPuts(&me->textarea, s);
+ target = &me->textarea;
break;
case HTML_SELECT:
case HTML_OPTION:
- HTChunkPuts(&me->option, s);
+ target = &me->option;
break;
case HTML_MATH:
- HTChunkPuts(&me->math, s);
+ target = &me->math;
break;
default: /* Free format text? */
@@ -651,6 +653,15 @@ void HTML_put_string(HTStructured * me,
} /* for */
}
} /* end switch */
+
+ if (target != NULL) {
+ if (target->data == s) {
+ CTRACE((tfp, "BUG: appending chunk to itself: `%.*s'\n",
+ target->size, target->data));
+ } else {
+ HTChunkPuts(target, s);
+ }
+ }
#ifdef USE_PRETTYSRC
if (psrc_convert_string) {
psrc_convert_string = FALSE;

View file

@ -1,49 +0,0 @@
$NetBSD: patch-src_LYCurses.c,v 1.3 2018/05/17 10:16:25 jperkin Exp $
Pull in upstream patch to fix build against newer ncurses.
--- src/LYCurses.c.orig 2014-03-09 21:43:10.000000000 +0000
+++ src/LYCurses.c
@@ -1695,7 +1695,7 @@ void lynx_enable_mouse(int state)
void lynx_nl2crlf(int normal GCC_UNUSED)
{
#if defined(NCURSES_VERSION_PATCH) && defined(SET_TTY) && defined(TERMIOS) && defined(ONLCR)
- static TTY saved_tty;
+ static struct termios saved_tty;
static int did_save = FALSE;
static int waiting = FALSE;
static int can_fix = TRUE;
@@ -1704,8 +1704,10 @@ void lynx_nl2crlf(int normal GCC_UNUSED)
if (cur_term == 0) {
can_fix = FALSE;
} else {
- saved_tty = cur_term->Nttyb;
+ tcgetattr(fileno(stdout), &saved_tty);
did_save = TRUE;
+ if ((saved_tty.c_oflag & ONLCR))
+ can_fix = FALSE;
#if NCURSES_VERSION_PATCH < 20010529
/* workaround for optimizer bug with nonl() */
if ((tigetstr("cud1") != 0 && *tigetstr("cud1") == '\n')
@@ -1717,14 +1719,18 @@ void lynx_nl2crlf(int normal GCC_UNUSED)
if (can_fix) {
if (normal) {
if (!waiting) {
- cur_term->Nttyb.c_oflag |= ONLCR;
+ struct termios alter_tty = saved_tty;
+
+ alter_tty.c_oflag |= ONLCR;
+ tcsetattr(fileno(stdout), TCSAFLUSH, &alter_tty);
+ def_prog_mode();
waiting = TRUE;
nonl();
}
} else {
if (waiting) {
- cur_term->Nttyb = saved_tty;
- SET_TTY(fileno(stdout), &saved_tty);
+ tcsetattr(fileno(stdout), TCSAFLUSH, &saved_tty);
+ def_prog_mode();
waiting = FALSE;
nl();
LYrefresh();

View file

@ -1,22 +0,0 @@
$NetBSD: patch-src_LYStrings.c,v 1.3 2018/05/17 10:16:25 jperkin Exp $
Pull in upstream patch to fix build against newer ncurses.
--- src/LYStrings.c.orig 2013-11-29 00:52:56.000000000 +0000
+++ src/LYStrings.c
@@ -1004,12 +1004,13 @@ static const char *expand_tiname(const c
{
char name[BUFSIZ];
int code;
+ TERMTYPE *tp = (TERMTYPE *) (cur_term);
LYStrNCpy(name, first, len);
if ((code = lookup_tiname(name, strnames)) >= 0
|| (code = lookup_tiname(name, strfnames)) >= 0) {
- if (cur_term->type.Strings[code] != 0) {
- LYStrNCpy(*result, cur_term->type.Strings[code], (final - *result));
+ if (tp->Strings[code] != 0) {
+ LYStrNCpy(*result, tp->Strings[code], (final - *result));
(*result) += strlen(*result);
}
}

View file

@ -1,15 +0,0 @@
$NetBSD: patch-src_LYUtils.c,v 1.1 2016/12/21 11:25:25 sevan Exp $
Fix CVE-2016-9179
https://hg.java.net/hg/solaris-userland~gate/file/0a979060f73b/components/lynx/patches/05-fix-CVE-2016-9179.patch
--- src/LYUtils.c.orig 2016-12-21 10:09:24.000000000 +0000
+++ src/LYUtils.c
@@ -4693,6 +4693,7 @@ BOOLEAN LYExpandHostForURL(char **Alloca
* Do a DNS test on the potential host field as presently trimmed. - FM
*/
StrAllocCopy(host, Str);
+ strip_userid(host, FALSE);
HTUnEscape(host);
if (LYCursesON) {
StrAllocCopy(MsgStr, WWW_FIND_MESSAGE);