Commit 386553b0 authored by Axel Beckert's avatar Axel Beckert

New upstream version 2.8.9dev15

parent a65ab4d2
-- $LynxId: CHANGES,v 1.894 2017/05/11 01:03:49 tom Exp $
-- $LynxId: CHANGES,v 1.908 2017/07/04 22:48:35 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
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
......
See the COPYHEADER file which gives copyright information for Lynx.
------------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
......@@ -17,7 +17,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
......@@ -57,8 +57,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
......@@ -112,7 +112,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
......@@ -170,7 +170,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
......@@ -227,7 +227,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
......@@ -257,7 +257,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
......@@ -279,9 +279,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
......@@ -305,10 +305,9 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
......@@ -338,5 +337,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iD8DBQBFJtJ/cCNT4PfkjtsRArLIAJ4gKHdikok6gCcKfizm9T3HdEEP+wCfUj+N
9sC1gLEOekFUgKVqYsSTP+w=
=aDfb
iEYEABECAAYFAllK95IACgkQcCNT4PfkjtvvMQCfTRukMJdeFcMrh90cS7VdvjzF
etwAn1ZyAO6hHcIqxdbZpsu0ciSOmuYe
=2fkf
-----END PGP SIGNATURE-----
lynx-dev (2.8.9dev.14) unstable; urgency=low
lynx-dev (2.8.9dev.15) unstable; urgency=low
* maintenance updates
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 30 Apr 2017 12:02:52 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Thu, 11 May 2017 17:22:30 -0400
lynx-dev (2.8.8dev.16) unstable; urgency=high
......
......@@ -4,6 +4,9 @@ Current maintainer: Thomas Dickey <dickey@invisible-island.net>
-------------------------------------------------------------------------------
Copyright 1997-2016,2017 Thomas E. Dickey
Copyright (C) 1995 University of Kansas.
Most of the content of the lynx release (and corresponding copyright) is
the work of developers on the lynx-dev mailing list, who have agreed to
distribute their work under the terms and conditions of the GNU General
......@@ -19,30 +22,6 @@ or to the maintainer (Thomas E. Dickey):
dickey@invisible-island.net
For reference, below is the original copyright notice for Lynx (2.4.2).
------------------------------------------------------------------------------
/* Copyright (C) 1995 University of Kansas.
This file is part of Lynx, a text-based WWW browser.
Lynx is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
published by the Free Software Foundation.
Lynx is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
License for more details.
You should have received a copy of the GNU General Public License
along with Lynx; see the file COPYING. If not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
Any licensing or usage questions should be directed to Michael
Grobe <grobe@ukans.edu>.
*/
-------------------------------------------------------------------------------
Files: aclocal.m4
......@@ -101,7 +80,7 @@ License: other-BSD
shared with many OS's install programs.
Files: debian/*
Copyright: 2010-2015,2016 Thomas E. Dickey
Copyright: 2010-2016,2017 Thomas E. Dickey
License: other-BSD
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
......
# Lynx's version-numbering is not understood by lintian, though legal.
lynx-dev: rc-version-greater-than-expected-version 2.8.9dev.15 > 2.8.9 (consider using 2.8.9~dev.15)
# This is intentional because it is referenced from the documentation.
lynx-dev: extra-license-file usr/share/doc/lynx-dev/COPYING
# These are intentional, part of the sample files:
lynx-dev: zero-byte-file-in-doc-directory usr/share/doc/lynx-dev/test/X
lynx-dev: zero-byte-file-in-doc-directory usr/share/doc/lynx-dev/test/nobody
?package(lynx-dev):needs="text" section="Applications/Network/Web Browsing"\
title="Lynx-dev" command="lynx"
title="Lynx-dev" command="lynx-dev"
......@@ -22,7 +22,9 @@ helpdir := $(docdir)/help_dir
DSTDIR := $(CURDIR)/debian/$(PACKAGE)
DOCDIR := $(DSTDIR)$(docdir)
CFLAGS =
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
DEBOP=--enable-debug
......@@ -48,6 +50,9 @@ configure: configure-stamp
configure-stamp:
dh_testdir
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS)" \
env cf_cv_SYSTEM_MAIL=/usr/sbin/sendmail \
COMPRESS=/usr/bin/compress \
BZIP2=/bin/bzip2 \
......@@ -163,6 +168,7 @@ binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
dh_lintian
dh_installdebconf
dh_installdocs
dh_installmenu
......
; $LynxId: lynx.nsi,v 1.35 2017/04/30 16:02:52 tom Exp $
; $LynxId: lynx.nsi,v 1.36 2017/05/11 21:22:30 tom Exp $
; Script originally generated with the Venis Install Wizard, but customized.
; The Inno Setup script is preferred; but this can be built via cross-compiling.
......@@ -9,8 +9,8 @@
!define VERSION_EPOCH "2"
!define VERSION_MAJOR "8"
!define VERSION_MINOR "9"
!define VERSION_LEVEL "1014"
!define VERSION_PATCH "dev.14"
!define VERSION_LEVEL "1015"
!define VERSION_PATCH "dev.15"
!define SUBKEY "Lynx"
......
# $LynxId: lynx.spec,v 1.41 2017/04/30 16:02:52 tom Exp $
# $LynxId: lynx.spec,v 1.42 2017/05/11 21:22:30 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.9
Release: dev.14
Release: dev.15
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
......
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.9dev.14"
#define LYNX_VERSION "2.8.9dev.15"
; most-recent full release and target
#define LYNX_RELEASE "2.8.9"
......
/*
* $LynxId: HTFTP.c,v 1.128 2016/11/24 23:43:55 tom Exp $
* $LynxId: HTFTP.c,v 1.129 2017/07/02 20:42:32 tom Exp $
*
* File Transfer Protocol (FTP) Client
* for a WorldWideWeb browser
......@@ -2324,6 +2324,7 @@ static EntryInfo *parse_dir_entry(char *entry,
break;
}
/* fall through if server_type changed for *first == TRUE ! */
/* FALLTHRU */
case UNIX_SERVER:
case PETER_LEWIS_SERVER:
case MACHTEN_SERVER:
......@@ -2706,7 +2707,8 @@ static char *FormatSize(char **bufp,
char fmt[512];
if (*start) {
sprintf(fmt, "%%%.*s" PRI_off_t, (int) sizeof(fmt) - 3, start);
sprintf(fmt, "%%%.*s" PRI_off_t,
(int) sizeof(fmt) - DigitsOf(start) - 3, start);
HTSprintf(bufp, fmt, value);
} else {
......@@ -2724,7 +2726,8 @@ static char *FormatNum(char **bufp,
char fmt[512];
if (*start) {
sprintf(fmt, "%%%.*sld", (int) sizeof(fmt) - 3, start);
sprintf(fmt, "%%%.*sld",
(int) sizeof(fmt) - DigitsOf(start) - 3, start);
HTSprintf(bufp, fmt, value);
} else {
sprintf(fmt, "%lu", value);
......@@ -3951,12 +3954,22 @@ int HTFTPLoad(const char *name,
*/
if (control->is_binary) {
int code;
off_t size;
status = send_cmd_2("SIZE", filename);
if (status == 2 &&
sscanf(response_text, "%d %" PRI_off_t, &code, &size) == 2) {
anchor->content_length = size;
if (status == 2) {
#if !defined(HAVE_LONG_LONG) && defined(GUESS_PRI_off_t)
long size;
if (sscanf(response_text, "%d %ld", &code, &size) == 2) {
anchor->content_length = (off_t) size;
}
#else
off_t size;
if (sscanf(response_text, "%d %" SCN_off_t, &code, &size)
== 2) {
anchor->content_length = size;
}
#endif
}
}
status = send_cmd_2("RETR", filename);
......
/*
* $LynxId: HTFile.c,v 1.146 2017/04/27 20:51:05 tom Exp $
* $LynxId: HTFile.c,v 1.147 2017/07/02 20:42:33 tom Exp $
*
* File Access HTFile.c
* ===========
......@@ -208,7 +208,8 @@ static char *FormatSize(char **bufp,
char fmt[512];
if (*start) {
sprintf(fmt, "%%%.*s" PRI_off_t, (int) sizeof(fmt) - 3, start);
sprintf(fmt, "%%%.*s" PRI_off_t,
(int) sizeof(fmt) - DigitsOf(start) - 3, start);
HTSprintf0(bufp, fmt, entry);
} else {
......
/*
* $LynxId: HTFormat.c,v 1.85 2016/11/24 15:29:50 tom Exp $
* $LynxId: HTFormat.c,v 1.86 2017/07/02 17:09:45 tom Exp $
*
* Manage different file formats HTFormat.c
* =============================
......@@ -732,8 +732,7 @@ int HTCopy(HTParentAnchor *anchor,
HTStreamClass targetClass;
BOOL suppress_readprogress = NO;
off_t limit = anchor ? anchor->content_length : 0;
off_t bytes = anchor ? anchor->actual_length : 0;
off_t total;
off_t bytes = 0;
int rv = 0;
/* Push the data down the stream
......@@ -865,13 +864,8 @@ int HTCopy(HTParentAnchor *anchor,
}
#endif /* NOT_ASCII */
total = bytes + status;
if (limit == 0 || bytes == 0 || (total < limit)) {
(*targetClass.put_block) (sink, input_buffer, status);
} else if (bytes < limit) {
(*targetClass.put_block) (sink, input_buffer, (int) (limit - bytes));
}
bytes = total;
(*targetClass.put_block) (sink, input_buffer, status);
bytes += status;
if (!suppress_readprogress)
HTReadProgress(bytes, limit);
HTDisplayPartial();
......@@ -879,7 +873,7 @@ int HTCopy(HTParentAnchor *anchor,
/* a few buggy implementations do not close the connection properly
* and will hang if we try to read past the declared content-length.
*/
if (limit > 0 && bytes == limit)
if (limit > 0 && bytes >= limit)
break;
} /* next bufferload */
if (anchor != 0) {
......
/*
* $LynxId: HTMIME.c,v 1.93 2017/02/10 22:27:42 tom Exp $
* $LynxId: HTMIME.c,v 1.95 2017/07/02 19:40:06 tom Exp $
*
* MIME Message Parse HTMIME.c
* ==================
......@@ -2004,7 +2004,7 @@ static void HTMIME_put_character(HTStream *me, int c)
case miWWW_AUTHENTICATE:
me->field = me->state; /* remember it */
me->state = miSKIP_GET_VALUE;
/* Fall through! */
/* FALLTHRU */
case miSKIP_GET_VALUE:
if (c == '\n') {
......@@ -2021,6 +2021,7 @@ static void HTMIME_put_character(HTStream *me, int c)
me->value_pointer = me->value;
me->state = miGET_VALUE;
/* Fall through to store first character */
/* FALLTHRU */
case miGET_VALUE:
GET_VALUE:
......@@ -2033,6 +2034,7 @@ static void HTMIME_put_character(HTStream *me, int c)
}
}
/* Fall through (if end of line) */
/* FALLTHRU */
case miJUNK_LINE:
if (c == '\n') {
......@@ -2047,7 +2049,8 @@ static void HTMIME_put_character(HTStream *me, int c)
HTChunkPutc(&me->anchor->http_headers, UCH(c));
if (me->state == MIME_TRANSPARENT) {
HTChunkTerminate(&me->anchor->http_headers);
CTRACE((tfp, "Server Headers:\n%.*s\n",
CTRACE((tfp, "Server Headers (%d bytes):\n%.*s\n",
me->anchor->http_headers.size,
me->anchor->http_headers.size,
me->anchor->http_headers.data));
CTRACE((tfp, "Server Content-Type:%s\n",
......
/*
* $LynxId: HTRules.c,v 1.46 2016/11/24 15:29:50 tom Exp $
* $LynxId: HTRules.c,v 1.47 2017/07/02 19:45:22 tom Exp $
*
* Configuration manager for Hypertext Daemon HTRules.c
* ==========================================
......@@ -291,6 +291,7 @@ char *HTTranslate(const char *required)
case HT_Progress:
case HT_Alert:
LYFixCursesOn("show rule message:"); /* and fall through */
/* FALLTHRU */
case HT_AlwaysAlert:
pMsg = r->equiv ? r->equiv :
(r->op == HT_AlwaysAlert) ? "%s" : "Rule: %s";
......@@ -335,7 +336,7 @@ char *HTTranslate(const char *required)
CTRACE((tfp, "HTRule: Pass `%s'\n", current));
return current;
}
/* Else fall through ...to map and pass */
/* FALLTHRU */
case HT_Map:
case HT_Redirect:
......
/*
* $LynxId: HTUtils.h,v 1.122 2016/11/23 22:16:51 tom Exp $
* $LynxId: HTUtils.h,v 1.124 2017/07/02 20:40:14 tom Exp $
*
* Utility macros for the W3 code library
* MACROS FOR GENERAL USE
......@@ -19,11 +19,11 @@
/* see AC_FUNC_ALLOCA macro */
#ifdef __GNUC__
# define alloca __builtin_alloca
# define alloca(size) __builtin_alloca(size)
#else
# ifdef _MSC_VER
# include <malloc.h>
# define alloca _alloca
# define alloca(size) _alloca(size)
# else
# if HAVE_ALLOCA_H
# include <alloca.h>
......@@ -191,7 +191,11 @@ extern int ignore_unused;
#undef small /* see <w32api/rpcndr.h> */
#endif
#ifdef HAVE_ATOLL
#if defined(__DARWIN_NO_LONG_LONG)
#undef HAVE_ATOLL
#endif
#if defined(HAVE_ATOLL)
#define LYatoll(n) atoll(n)
#else
extern off_t LYatoll(const char *value);
......@@ -575,6 +579,8 @@ extern int WWW_TraceMask;
#include <inttypes.h>
#endif
#define DigitsOf(type) (int)((sizeof(type)*8)/3)
/*
* Printing/scanning-formats for "off_t", as well as cast needed to fit.
*/
......@@ -602,13 +608,18 @@ extern int WWW_TraceMask;
#endif
#ifndef PRI_off_t
#if defined(HAVE_LONG_LONG) && (SIZEOF_OFF_T > SIZEOF_LONG)
#define GUESS_PRI_off_t
#if (SIZEOF_OFF_T == SIZEOF_LONG)
#define PRI_off_t "ld"
#define SCN_off_t "ld"
#define CAST_off_t(n) (long)(n)
#elif defined(HAVE_LONG_LONG)
#define PRI_off_t "lld"
#define SCN_off_t "lld"
#define CAST_off_t(n) (long long)(n)
#else
#define PRI_off_t "ld"
#define SCN_off_t "ld"
/* SCN_off_t requires workaround */
#define CAST_off_t(n) (long)(n)
#endif
#endif
......
/*
* $LynxId: SGML.c,v 1.160 2017/01/01 00:56:18 Takeshi.Hataguchi Exp $
* $LynxId: SGML.c,v 1.161 2017/07/02 19:45:00 tom Exp $
*
* General SGML Parser code SGML.c
* ========================
......@@ -1895,7 +1895,7 @@ static void SGML_character(HTStream *me, int c_in)
if (!(c == '>' && me->slashedtag && TOASCII(clong) < 127)) {
me->state = S_text;
}
/* fall through in any case! */
/* FALLTHRU */
case S_text:
if (IS_CJK_TTY && ((TOASCII(c) & 0200) != 0)
#ifdef EXP_JAPANESEUTF8_SUPPORT
......@@ -3567,7 +3567,7 @@ static void SGML_character(HTStream *me, int c_in)
PSRCSTART(attrval);
#endif
me->state = S_value;
/* no break! fall through to S_value and process current `c` */
/* FALLTHRU */
case S_value:
if (WHITE(c) || (c == '>')) { /* End of word */
......
# $LynxId: makefile.in,v 1.32 2015/12/13 23:20:11 tom Exp $
# $LynxId: makefile.in,v 1.33 2017/07/04 22:45:38 tom Exp $
# Make WWW under unix for a.n.other unix system (bsd)
# Use this as a template
......@@ -170,7 +170,7 @@ lint:
.c.i:
@RULE_CC@
@ECHO_CC@$(CPP) -C $(CPPOPTS) $(srcdir)/$*.c >$@
@ECHO_CC@$(CPP) $(CPPOPTS) $(srcdir)/$*.c >$@
depend :
makedepend -fmakefile -- $(CFLAGS) -- $(CFILES)
......
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc.
675 Mass Ave, Cambridge, MA 02139, USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the library GPL. It is
numbered 2 because it goes with version 2 of the ordinary GPL.]
Preamble
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
......@@ -99,7 +99,7 @@ works together with the library.
Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.
GNU LIBRARY GENERAL PUBLIC LICENSE
GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library which
......@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
......@@ -434,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS
Appendix: How to Apply These Terms to Your New Libraries
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
......@@ -463,8 +463,8 @@ convey the exclusion of warranty; and each file should have at least the
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
......
dnl $LynxId: aclocal.m4,v 1.236 2017/05/10 22:32:05 tom Exp $
dnl $LynxId: aclocal.m4,v 1.237 2017/07/02 18:31:56 tom Exp $
dnl Macros for auto-configure script.
dnl by Thomas E. Dickey <dickey@invisible-island.net>
dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
......@@ -4686,6 +4686,37 @@ CF_ACVERSION_CHECK(2.52,
CF_CC_ENV_FLAGS
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PROG_CPP_COMMENTS version: 1 updated: 2017/07/02 14:31:07
dnl --------------------
dnl Ask for preprocessor "-C" option if we can get it.
AC_DEFUN([CF_PROG_CPP_COMMENTS],[
AC_REQUIRE([AC_PROG_CPP])
AC_MSG_CHECKING(if preprocessor -C option works)
AC_CACHE_VAL(cf_cv_prog_cpp_comments,[
cf_cv_prog_cpp_comments=no
cat >conftest.c <<CF_EOF
int main(void)
{
/* COMMENT */
return 0;
}
CF_EOF
if ( $CPP -C conftest.c >conftest.i 2>/dev/null )
then
if ( grep COMMENT conftest.i >/dev/null 2>/dev/null )
then
cf_cv_prog_cpp_comments=yes
fi
fi
rm -f conftest.[[ci]]
])
AC_MSG_RESULT($cf_cv_prog_cpp_comments)
if test x$cf_cv_prog_cpp_comments = xyes
then
CPP="$CPP -C"
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PROG_EXT version: 13 updated: 2015/04/18 09:03:58
dnl -----------
dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
......
This diff is collapsed.
dnl $LynxId: configure.in,v 1.288 2017/04/30 16:02:52 tom Exp $
dnl $LynxId: configure.in,v 1.290 2017/07/02 18:18:00 tom Exp $
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
......@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
dnl
dnl ask PRCS to plug-in the project-version for the configure-script.
dnl $Format: "AC_REVISION($ProjectVersion$)"$
AC_REVISION(2.8.9dev.14)
AC_REVISION(2.8.9dev.15)
# Save the original $CFLAGS so we can distinguish whether the user set those
# in the environment, or whether autoconf added -O and -g options:
......@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
PACKAGE=lynx
dnl ask PRCS to plug-in the project-version for the packages.
# $Format: "VERSION=$ProjectVersion$"$
VERSION=2.8.9dev.14
VERSION=2.8.9dev.15
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......@@ -93,7 +93,7 @@ case $host_os in
esac
CF_PROG_CC
AC_PROG_CPP
CF_PROG_CPP_COMMENTS
AC_PROG_LN_S
case $host_os in
(mingw*)
......
# $LynxId: lynx.cfg,v 1.281 2017/04/30 16:02:52 tom Exp $
# $LynxId: lynx.cfg,v 1.285 2017/07/04 22:57:01 tom Exp $
# lynx.cfg file.
# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
# or Lynx_Dir:lynx.cfg (VMS)
#
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
#PRCS LYNX_VERSION "2.8.9dev.14"
#PRCS LYNX_VERSION "2.8.9dev.15"
#
# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
#PRCS LYNX_DATE "Sun, 30 Apr 2017 12:02:52 -0400"
#PRCS LYNX_DATE "Thu, 11 May 2017 17:22:30 -0400"
#
# Definition pairs are of the form VARIABLE:DEFINITION
# NO spaces are allowed between the pair items.
# Definition pairs (configuration settings) are of the form
# VARIABLE:DEFINITION
# NO spaces are allowed around the colon ":" between the pair items.
#
# If you do not have write access to /usr/local/lib you may change
# the default location of this file in the userdefs.h file and recompile,
......@@ -21,6 +22,17 @@
# (Any line beginning with punctuation is ignored). Leading blanks on each
# line are ignored; trailing blanks may be significant depending on the option.
# In most cases, a definition can be overridden by another later in the
# file, or in an including configuration file. You can see the effect of
# definitions (and redefinitions) in the trace file Lynx.log by using the
# "-trace" and "-trace-mask" options, e.g.,
# lynx -trace -trace-mask=8
# As a documentation aid, the default values for each setting are shown
# commented-out. By convention, these default value comments have no space
# after the "#", e.g.,
# #HTTP_PROTOCOL:1.0
# An HTML'ized description of all settings (based on comments in this file,
# with alphabetical table of settings and with table of settings by category)
# is available at http://lynx.invisible-island.net/release/breakout/lynx_help/cattoc.html
......@@ -958,7 +970,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
# Local execution links and scripts are by default completely disabled,
# unless a change is made to the userdefs.h file to enable them or
# the configure script is used with the corresponding options
# (--enable-exec-links and --enable-exec-scripts).
# (-enable-exec-links and -enable-exec-scripts).
# See the Lynx source code distribution and the userdefs.h
# file for more detail on enabling execution links and scripts.
#
......@@ -1235,7 +1247,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
.h2 BIBP_BIBHOST
# BIBP_BIBHOST is the URL at which local bibp service may be found, if