Commit e039600f authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.7dev9

parent 28b9f78f
-- $LynxId: AUTHORS,v 1.5 2008/01/10 01:14:43 tom Exp $
-- $LynxId: AUTHORS,v 1.6 2008/04/11 22:36:11 tom Exp $
-- vile:txtmode
Most of the people who have contributed more than one patch to Lynx (as well as
a few who have only one) are noted in the changelogs by their initials (to keep
......@@ -41,7 +41,7 @@ PHDM Philippe De Muyter
PW Philip Webb
RN Ryan Nielsen
RS Rado Smiljanic
SC Stef Caunter
SC Stefan Caunter
SH Hiroyuki Senshu
SKY Sinan Kaan Yerli
SS Sergey Svishchev
......
-- $LynxId: CHANGES,v 1.242 2007/08/02 21:36:53 tom Exp $
-- $LynxId: CHANGES,v 1.271 2008/04/27 23:03:14 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2008-04-27 (2.8.7dev.9)
* update nl.po, vi.po from
http://translationproject.org/latest/lynx/
* additional def7_uni.tbl conversions (patch by Tim Larson).
* update config.guess (2008-03-12), config.sub (2008-03-08)
* add --enable-gnutls-compat option and associated files to configure with
GNU TLS without its gnutls-openssl library, whose newer versions are
available only under a restrictive license (reports by Andreas Metzler,
Atsuhito Kohda) -TD
* update README.sslcerts -SC
* add POSITIONAL_EDITOR setting to configure editors which accept a "+line"
parameter -PBM
* pass a newline after the start of PRE-section in HTGopher.c to force the
first newline between records to be seen and cause the lines to split
(report by Ciprian Dorin Craciun) -TD
* use TRST_MAXROWSPAN and TRST_MAXCOLSPAN limits in Stbl_reserveCellsInTable(),
to help the non-color-style version work with table using rowspan/colspan
set to "0", as well as correcting limits from original 2.8.3dev.14 changes
(report by George Sigletos) -TD, PBM
* modify behavior of "-nonumbers" option for -dump so it can be combined with
-listonly to obtain a list of the URLs without reference numbers (Debian
#398283) -TD
* typo in description of SESSION_FILE in lynx.cfg -PBM
* build-fix for WWW version on Windows -TD
2008-02-17 (2.8.7dev.8)
* add "nano" to list of editors accepting +number option (patch by Tim Chase)
* add configure --with-nss-compat option, for building with NSS library's
......@@ -80,7 +105,7 @@ Changes since Lynx 2.8 release
* modify HTDoRead() to add elapsed time to its debug trace -TD
* fix a case in LYGetfile.c which was broken by 2.8.7dev.3 changes to use
LYTildeExpand() to expand embedded "~" -TG
* updated config.guess (2007-05-17), config.sub (2007-06-28)
* update config.guess (2007-05-17), config.sub (2007-06-28)
2007-05-17 (2.8.7dev.5)
* build/install "en" po file so that GNU gettext LANGUAGE environment variable
......@@ -175,7 +200,7 @@ Changes since Lynx 2.8 release
* modify CF_SRAND to recognize the asymmetric variant of arc4random() -TD
* updated configure script macros CF_SUBDIR_PATH, CF_XOPEN_SOURCE,
CF_X_ATHENA_LIBS, CF_X_TOOLKIT -TD
* updated config.guess (2006-12-22), config.sub (2006-12-08)
* update config.guess (2006-12-22), config.sub (2006-12-08)
2006-11-14 (2.8.7dev.4)
* use RFC-822 encoding for filenames passed via file-upload forms (Debian
......@@ -320,7 +345,7 @@ Changes since Lynx 2.8 release
* fixes for GNU TLS configuration (also addresses Debian #231609) -TG, TH
* add check for failure to write to disk, e.g., on disk full, and report
error condition via HTAlert() -PG
* updated README.sslcerts -Stef Caunter
* updated README.sslcerts -SC
* add example of -source in manpage to explain how HREF's are constructed
(Debian #347989) -TD
* fixes to make redraw_part_of_line() to work with double-width characters.
......@@ -391,9 +416,9 @@ Changes since Lynx 2.8 release
* suppress OpenSSL URL from version message if it happens to be built using
GNU TLS -TD
* change default for DEFAULT_INDEX_FILE in lynx.cfg to http://lynx.isc.org/
since the Mosaic MetaIndex file is defunct (suggested by Stef Caunter)
since the Mosaic MetaIndex file is defunct (suggested by SC)
* update makelynx.bat (report by FLWM) -TD
* add presentation for text/css, to allow browsing ".css" files -Stef Caunter
* add presentation for text/css, to allow browsing ".css" files -SC
* modify LYPrint.c suggested_filename() to strip bzip2's ".bz2" suffixes as
well as ".zz" suffixes -TD
* modify configure script macro AM_PATH_PROG_WITH_TEST to allow for DOS device
......@@ -422,7 +447,7 @@ Changes since Lynx 2.8 release
using CVS (report by Atsuhito Kohda) -TD
* add a null-pointer check in handle_LYK_HEAD() to cover a case where doing
a HEAD on a link failed because there was no submit action associated with
the link (report by Walter Ian Kaye, Stef Caunter) -TD
the link (report by Walter Ian Kaye, SC) -TD
* improve tbl2html.pl script to cover the ranges and approximations used in
def7_uni.tbl -TD
* additional def7_uni.tbl conversions (patch by Tim Larson).
......@@ -467,7 +492,7 @@ Changes since Lynx 2.8 release
* fix some ifdef's that did not work when disabling all features -TD
* fix a typo in LYMap.c from Debian #335593 changes (report by Jens
Schleusener) -TD
* really remove pointer to moxienet (report by Stef Caunter) -TD
* really remove pointer to moxienet (report by SC) -TD
2005-12-18 (2.8.6dev.16)
* change configure option default for --enable-justify-elts to true -TD
......@@ -602,7 +627,7 @@ Changes since Lynx 2.8 release
* modify initialization so that
cat options.txt | lynx -
will allow interactive use (report by Arne Kowallik) -TD
* add NO_MARGINS and NO_TITLE to lynx.cfg (request by Stef Caunter) -TD
* add NO_MARGINS and NO_TITLE to lynx.cfg (request by SC) -TD
* adjust line-position for form fields when -notitle option is used (report by
Arne Kowallik) -TD
......@@ -638,7 +663,7 @@ Changes since Lynx 2.8 release
made in NetBSD "make" late in 2003, incorporated into the 2.0 release.
The CVS change notes:
Trim .SUFFIXES to only contain those used in this file.
(reported by Stef Caunter, comments by Klaus Klein and Martin Husemann) -TD
(reported by SC, comments by Klaus Klein and Martin Husemann) -TD
* modify LYhighlight() to allow for the case where a form link extends for
several lines. It was not providing enough padding to fill in the "_"
characters past the first line of the link -TD
......@@ -715,7 +740,7 @@ Changes since Lynx 2.8 release
* correct leak-checking for result of LYcommandList(), which was not freeing
the associated strings -TD
* correct pointer initialization in LYCheckForProxyURL() broken by fix for
Debian #240237 (reported by GV, Stef Caunter) -TD
Debian #240237 (reported by GV, SC) -TD
2004-12-30 (2.8.6dev.9)
* remove fixed limit on history[] array (report by Richard Eyre) -TD
......@@ -1068,7 +1093,7 @@ Changes since Lynx 2.8 release
* remove intl subdirectory (gettext-0.10.35), since some of the ".po" files
have been modified to rely upon newer features of gettext. Modified
configure script macro to report this properly -TD
* add SSL_CERT_DIR, SSL_CERT_FILE to lynx.man (suggested by Stef Caunter) -TD
* add SSL_CERT_DIR, SSL_CERT_FILE to lynx.man (suggested by SC) -TD
* documentation updates for DJGPP -DK, LP, FLWM
* update address for Free Software Foundation in COPYHEADER and COPYING
(Atsuhito Kohda).
......@@ -1092,7 +1117,7 @@ Changes since Lynx 2.8 release
Frederic L W Meunier) -TD
2004-01-19 (2.8.5pre.2)
* update URLs in docs/README.ssl (Stef Caunter, DK).
* update URLs in docs/README.ssl (SC, DK).
* use http://search.lycos.com rather than the messy http://www.lycos.com -DK
* update some URLs in lynx_help -FLWM (Frederic L W Meunier)
* remove a few unnecessary #include's (reported by Frederic L W Meunier) -TD
......@@ -1142,12 +1167,12 @@ FreeBSD 4.1, 4.8, NetBSD 1.5, 1.6 and OpenBSD 2.8 (curses/ncurses).
* fix ifdef's for alloca(), e.g., on AIX 4 -TD
* fix misspelled LYGetEnv/LYgetenv in DJGPP configuration -DK
* a few portability fixes to allow building on OS/2, AIX, Tru64 and HPUX -TD
* add docs/README.rootcerts -IZ, Stef Caunter, Johannes Hromadka
* add docs/README.rootcerts -IZ, SC, Johannes Hromadka
* update po files (ca.po, da.po, de.po, et.po, hu.po, ru.po, sv.po, tr.po and
zh_CN.po) from
http://www.iro.umontreal.ca/contrib/po/maint/lynx/
* correct some mismatches between INSTALLATION and "configure --help" (prompted
by discussion with Stef Caunter) -TD
by discussion with SC) -TD
* undef conflicting symbols "small" and FILE_DOES_NOT_EXIST which are
misdefined in Cygwin's w32api headers (report by Frederic L W Meunier) -TD
* amend check for refresh-URL to ensure it only prepends a link for text/html
......@@ -1258,7 +1283,7 @@ FreeBSD 4.1, 4.8, NetBSD 1.5, 1.6 and OpenBSD 2.8 (curses/ncurses).
platforms when POSIXLY_CORRECT (sic) is set -TD
* fix configure script check for term.h, which may be <ncursesw/term.h> -TD
* modify an ifdef in HTCheckForInterrupt() to allow compile with DJGPP -GV
* add docs/README.sslcerts (Stef Caunter <cauntes@mail.mohawkc.on.ca>).
* add docs/README.sslcerts (Stefan Caunter <cauntes@mail.mohawkc.on.ca>).
* modify LYLocalFileToURL() to allow for CurrentDir() returning a value that
does not begin with a slash, e.g., with DJGPP which returns a drive-letter
first -DK
......
......@@ -413,6 +413,10 @@ II. Compile instructions -- UNIX
fonts) according to the current Display Character Set. (Linux console
only. *Use with discretion.* See docs/README.chartrans.)
--enable-gnutls-compat (define USE_GNUTLS_FUNCS)
When --with-gnutls is used, tell whether to use GNUTLS's OpenSSL
compatibility library or use GNUTLS's low-level API directly.
--enable-gzip-help
Install the lynx help files in gzip'd format [*.gz] to save space.
......@@ -534,7 +538,7 @@ II. Compile instructions -- UNIX
--with-dmalloc
use Gray Watson's dmalloc library
--with-gnutls[=XXX] (define USE_SSL)
--with-gnutls[=XXX] (define USE_SSL, USE_GNUTLS_INCL)
Use this option to configure with the GNU TLS library.
See docs/README.ssl for additional information.
......@@ -544,6 +548,8 @@ II. Compile instructions -- UNIX
are assumed to be in the parallel "include" directory. The default
is /usr/local/gnutls.
See the "--enable-gnutls-compat" option.
--with-included-gettext
not supported in this package. The configure script uses macros which
are bundled together with more useful features.
......@@ -1329,4 +1335,4 @@ VIII. Acknowledgment
-- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp>
-- vile:txtmode
-- $LynxId: INSTALLATION,v 1.102 2008/02/17 19:58:25 tom Exp $
-- $LynxId: INSTALLATION,v 1.103 2008/04/13 16:22:59 tom Exp $
/* GOPHER ACCESS HTGopher.c
/*
* $LynxId: HTGopher.c,v 1.43 2008/03/17 00:03:23 tom Exp $
*
* GOPHER ACCESS HTGopher.c
* =============
*
* History:
......@@ -244,6 +247,7 @@ static void parse_menu(const char *arg GCC_UNUSED,
END(HTML_H1);
PUTC('\n');
START(HTML_PRE);
PUTC('\n'); /* newline after HTML_PRE forces split-line */
while ((ich = NEXT_CHAR) != EOF) {
if (interrupted_in_htgetcharacter) {
......
/*
* $LynxId: HTString.c,v 1.51 2008/02/17 19:30:56 Gisle.Vanem Exp $
* $LynxId: HTString.c,v 1.52 2008/02/18 00:04:16 tom Exp $
*
* Case-independent string comparison HTString.c
*
......@@ -21,6 +21,11 @@ BOOLEAN WWW_TraceFlag = 0; /* Global trace flag for ALL W3 code */
int WWW_TraceMask = 0; /* Global trace flag for ALL W3 code */
#endif
#ifdef _WINDOWS
#undef VC
#define VC "2.14FM"
#endif
#ifndef VC
#define VC "2.14"
#endif /* !VC */
......
/*
* $LynxId: HTTP.c,v 1.91 2008/02/17 19:36:08 Zdenek.Prikryl Exp $
* $LynxId: HTTP.c,v 1.94 2008/04/27 17:05:55 tom Exp $
*
* HyperText Tranfer Protocol - Client implementation HTTP.c
* ==========================
......@@ -452,7 +452,7 @@ static BOOL acceptEncoding(int code)
#ifdef USE_SSL
static void show_cert_issuer(X509 * peer_cert GCC_UNUSED)
{
#if defined(USE_OPENSSL_INCL)
#if defined(USE_OPENSSL_INCL) || defined(USE_GNUTLS_FUNCS)
char ssl_dn[1024];
char *msg = NULL;
......@@ -461,7 +461,7 @@ static void show_cert_issuer(X509 * peer_cert GCC_UNUSED)
_HTProgress(msg);
FREE(msg);
#elif defined(USE_GNUTLS_INCL)
/* the OpenSSL code compiles but dumps core with GNU TLS */
/* the OpenSSL "compat" code compiles but dumps core with GNU TLS */
#endif
}
#endif
......
/*
* $LynxId: HTUtils.h,v 1.78 2008/02/17 19:36:08 Zdenek.Prikryl Exp $
* $LynxId: HTUtils.h,v 1.79 2008/04/13 14:43:32 tom Exp $
*
* Utility macros for the W3 code library
* MACROS FOR GENERAL USE
......@@ -613,7 +613,10 @@ extern int WWW_TraceMask;
#else
#ifdef USE_GNUTLS_INCL
#if defined(USE_GNUTLS_FUNCS)
#include <tidy_tls.h>
#define USE_GNUTLS_INCL 1 /* do this for the ".c" ifdef's */
#elif defined(USE_GNUTLS_INCL)
#include <gnutls/openssl.h>
/*
* GNUTLS's implementation of OpenSSL is very incomplete and rudimentary.
......
/*
* $LynxId: tidy_tls.h,v 1.1 2008/04/27 22:50:39 tom Exp $
* Copyright 2008, Thomas E. Dickey
*/
#ifndef TIDY_TLS_H
#define TIDY_TLS_H
#include <gnutls/gnutls.h>
#define OPENSSL_VERSION_NUMBER (0x0090604F)
#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
#define SSLeay_add_ssl_algorithms() SSL_library_init()
#define SSL_ST_OK (1)
#define SSL_OP_ALL (0x000FFFFF)
#define SSL_OP_NO_SSLv2 (0x00100000)
#define SSL_OP_NO_SSLv3 (0x00200000)
#define SSL_OP_NO_TLSv1 (0x00400000)
#define SSL_get_cipher_name(ssl) SSL_CIPHER_get_name(SSL_get_current_cipher(ssl))
#define SSL_get_cipher(ssl) SSL_get_cipher_name(ssl)
#define SSL_get_cipher_bits(ssl,bp) SSL_CIPHER_get_bits(SSL_get_current_cipher(ssl),(bp))
#define SSL_get_cipher_version(ssl) SSL_CIPHER_get_version(SSL_get_current_cipher(ssl))
#define TIDY_TLS_BUFSIZE 256
typedef struct {
char common_name[TIDY_TLS_BUFSIZE];
char country[TIDY_TLS_BUFSIZE];
char email[TIDY_TLS_BUFSIZE];
char locality_name[TIDY_TLS_BUFSIZE];
char organization[TIDY_TLS_BUFSIZE];
char organizational_unit_name[TIDY_TLS_BUFSIZE];
char state_or_province_name[TIDY_TLS_BUFSIZE];
} X509_NAME;
typedef struct _SSL SSL;
typedef gnutls_datum_t X509;
typedef struct {
gnutls_connection_end_t connend;
struct {
int protocol[GNUTLS_MAX_ALGORITHM_NUM];
int encrypts[GNUTLS_MAX_ALGORITHM_NUM];
int compress[GNUTLS_MAX_ALGORITHM_NUM];
int key_xchg[GNUTLS_MAX_ALGORITHM_NUM];
int msg_code[GNUTLS_MAX_ALGORITHM_NUM];
} priority;
} SSL_METHOD;
typedef struct {
SSL *ssl;
int error;
const gnutls_datum_t *cert_list;
#define current_cert cert_list
} X509_STORE_CTX;
typedef struct {
gnutls_certificate_type_t cert;
gnutls_cipher_algorithm_t encrypts;
gnutls_compression_method_t compress;
gnutls_kx_algorithm_t key_xchg;
gnutls_mac_algorithm_t msg_code;
gnutls_protocol_t protocol;
} SSL_CIPHER;
typedef struct _SSL_CTX {
SSL_METHOD *method;
char *certfile;
int certfile_type;
char *keyfile;
int keyfile_type;
unsigned long options;
int (*verify_callback) (int, X509_STORE_CTX *);
int verify_mode;
} SSL_CTX;
struct _SSL {
gnutls_session_t gnutls_state;
gnutls_certificate_client_credentials gnutls_cred;
SSL_CTX *ctx;
SSL_CIPHER ciphersuite;
int last_error;
int shutdown;
int state;
unsigned long options;
int (*verify_callback) (int, X509_STORE_CTX *);
int verify_mode;
gnutls_transport_ptr_t rfd;
gnutls_transport_ptr_t wfd;
};
/* use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options
* are 'ored' with SSL_VERIFY_PEER if they are desired */
#define SSL_VERIFY_PEER 0x01
extern SSL *SSL_new(SSL_CTX * ctx);
extern SSL_CIPHER *SSL_get_current_cipher(SSL * ssl);
extern SSL_CTX *SSL_CTX_new(SSL_METHOD * method);
extern SSL_METHOD *SSLv23_client_method(void);
extern X509 *SSL_get_peer_certificate(SSL * ssl);
extern X509_NAME *X509_get_issuer_name(const X509 * cert);
extern X509_NAME *X509_get_subject_name(const X509 * cert);
extern char *X509_NAME_oneline(X509_NAME * name, char *buf, int len);
extern const char *ERR_error_string(unsigned long e, char *buf);
extern const char *RAND_file_name(char *buf, size_t len);
extern const char *SSL_CIPHER_get_name(SSL_CIPHER * cipher);
extern const char *SSL_CIPHER_get_version(SSL_CIPHER * cipher);
extern int RAND_bytes(unsigned char *buf, int num);
extern int RAND_load_file(const char *name, long maxbytes);
extern int RAND_status(void);
extern int RAND_write_file(const char *name);
extern int SSL_CIPHER_get_bits(SSL_CIPHER * cipher, int *bits);
extern int SSL_CTX_set_default_verify_paths(SSL_CTX * ctx);
extern int SSL_connect(SSL * ssl);
extern int SSL_library_init(void);
extern int SSL_read(SSL * ssl, void *buf, int len);
extern int SSL_set_fd(SSL * ssl, int fd);
extern int SSL_write(SSL * ssl, const void *buf, int len);
extern unsigned long ERR_get_error(void);
extern unsigned long SSL_CTX_set_options(SSL_CTX * ctx, unsigned long options);
extern void RAND_seed(const void *buf, int num);
extern void SSL_CTX_free(SSL_CTX * ctx);
extern void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode, int (*verify_callback) (int, X509_STORE_CTX *));
extern void SSL_free(SSL * ssl);
extern void SSL_load_error_strings(void);
#endif /* TIDY_TLS_H */
This diff is collapsed.
This diff is collapsed.
/*
* $LynxId: config.hin,v 1.100 2008/01/11 00:52:49 tom Exp $
* $LynxId: config.hin,v 1.101 2008/04/13 14:55:42 tom Exp $
* vile:cmode
*
* The configure script translates "config.hin" into "lynx_cfg.h"
......@@ -242,6 +242,7 @@
#undef USE_EXTERNALS /* CF_ARG_ENABLE(externs) */
#undef USE_FCNTL /* CF_FIONBIO */
#undef USE_FILE_UPLOAD /* CF_ARG_ENABLE(file-upload) */
#undef USE_GNUTLS_FUNCS /* CF_GNUTLS */
#undef USE_GNUTLS_INCL /* CF_GNUTLS */
#undef USE_LOCALE_CHARSET /* CF_ARG_ENABLE(locale-charset) */
#undef USE_OPENSSL_INCL /* CF_SSL */
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
timestamp='2007-06-28'
timestamp='2008-03-08'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -254,8 +254,10 @@ case $basic_machine in
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
| mips64vr | mips64vrel \
| mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
| mips64r5900 | mips64r5900el \
| mips64vr | mips64vrel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
......@@ -304,8 +306,8 @@ case $basic_machine in
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
i*86 | x86_64)
basic_machine=$basic_machine-pc
;;
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
*-*-*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
......@@ -329,14 +331,16 @@ case $basic_machine in
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
| m32c-* | m32r-* | m32rle-* \
| m32c- | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
| mips64vr-* | mips64vrel-* \
| mips64octeon-* | mips64octeonel-* \
| mips64orion-* | mips64orionel-* \
| mips64r5900-* | mips64r5900el-* \
| mips64vr-* | mips64vrel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
......@@ -364,15 +368,19 @@ case $basic_machine in
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
# Recognize the basic CPU types without company name, with glob match.
xtensa*)
basic_machine=$basic_machine-unknown
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
......@@ -389,7 +397,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
abacus)
abacus)
basic_machine=abacus-unknown
;;
adobe68k)
......@@ -443,6 +451,14 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
blackfin)
basic_machine=bfin-unknown
os=-linux
;;
blackfin-*)
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
c90)
basic_machine=c90-cray
os=-unicos
......@@ -668,6 +684,14 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
m88k-omron*)
basic_machine=m88k-omron
;;
......@@ -813,6 +837,14 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
parisc)
basic_machine=hppa-unknown
os=-linux
;;
parisc-*)
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
pbd)
basic_machine=sparc-tti
;;
......@@ -1021,6 +1053,10 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
;;
tx39)
basic_machine=mipstx39-unknown
;;
......@@ -1181,8 +1217,8 @@ esac
if [ x"$os" != x"" ]
then
case $os in
# First match some system type aliases
# that might get confused with valid system types.
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
......@@ -1265,7 +1301,7 @@ case $os in
-opened*)
os=-openedition
;;
-os400*)
-os400*)
os=-os400
;;
-wince*)
......@@ -1314,7 +1350,7 @@ case $os in
-sinix*)
os=-sysv4
;;
-tpf*)
-tpf*)
os=-tpf
;;
-triton*)
......@@ -1378,10 +1414,10 @@ else
# system, and we'll never get to this point.
case $basic_machine in
score-*)
score-*)
os=-elf
;;
spu-*)
spu-*)
os=-elf
;;
*-acorn)
......@@ -1393,8 +1429,8 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
c4x-* | tic4x-*)
os=-coff
c4x-* | tic4x-*)
os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
......@@ -1421,7 +1457,7 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
mep-*)
mep-*)
os=-elf
;;
mips*-cisco)
......@@ -1448,7 +1484,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
*-knuth)
*-knuth)
os=-mmixware
;;
*-wec)
......
This diff is collapsed.
dnl $LynxId: configure.in,v 1.162 2008/02/17 19:44:13 Zdenek.Prikryl Exp $
dnl $LynxId: configure.in,v 1.164 2008/04/13 20:05:41 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.7dev.8)
AC_REVISION(2.8.7dev.9)
# Save the original $CFLAGS so we can distinguish whether the user set those
# in the environment, or whether autoconf added -O and -g options:
......@@ -62,7 +62,7 @@ AC_ARG_WITH(system-type,
PACKAGE=lynx
dnl ask PRCS to plug-in the project-version for the packages.
# $Format: "VERSION=$ProjectVersion$"$
VERSION=2.8.7dev.8
VERSION=2.8.7dev.9
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......@@ -414,6 +414,14 @@ AC_ARG_WITH(gnutls,
[cf_cv_use_libgnutls=no])
])
# this option is mainly for comparing with/without Lynx's wrapper for GNUTLS.
AC_CACHE_CHECK(if you want gnutls-openssl compat,cf_cv_gnutls_compat,[
AC_ARG_ENABLE(gnutls-compat,
[ --with-gnutls{=path} link with gnutls-openssl compat],
[cf_cv_gnutls_compat=$withval],
[cf_cv_gnutls_compat=no])
])
AC_CACHE_CHECK(if you want socks library,cf_cv_use_libsocks,[
AC_ARG_WITH(socks,
[ --with-socks{=path} link with socks library if available],
......@@ -435,11 +443,17 @@ elif test "x$cf_cv_use_libsocks5" != xno ; then
else
CF_NETLIBS
fi
CF_INET_ADDR
if test "x$cf_cv_use_libssl" != xno ; then
CF_SSL($cf_cv_use_libssl)
elif test "x$cf_cv_use_libgnutls" != xno ; then
CF_GNUTLS($cf_cv_use_libgnutls)
if test "x$cf_cv_gnutls_compat" = xno ; then
CF_GNUTLS($cf_cv_use_libgnutls,tidy_tls\$o)
else
CF_GNUTLS($cf_cv_use_libgnutls)
fi
elif test "x$cf_cv_use_libnss_compat" != xno ; then
CF_NSS_COMPAT($cf_cv_use_libnss_compat)
fi
......
......@@ -17,8 +17,8 @@ Lynx relies on openssl to not only encrypt connections over https, but also to
determine whether it should even accept a certificate and establish a secure
connection with a remote host. Because of this reliance upon openssl by lynx,
most of this tutorial deals with how to use openssl to "install" both
vendor-provided CA cert bundles as well as self-signed certs from trusted
sources and, most importantly, how to get them recognized by lynx.
vendor-provided CA cert bundles as well as self-signed certs from trusted sources
and, most importantly, how to get them recognized by lynx.
While lynx on many systems will transparently accept valid certificates, not
all systems enjoy such functionality. Further, as noted above, older versions
......@@ -70,10 +70,9 @@ cert directory is /usr/local/ssl/certs, (it's often /etc/ssl/certs, but we
need a point of departure for the discussion) and that lynx has been compiled
--with-ssl.
The default location for certs on your system may be different, or there may
not be one. You will have to substitute that location for
/usr/local/ssl/certs
in the following instructions, and/or set environment variables.
The default location for certs on your system may be different, or there may not
be one. You will have to substitute that location for /usr/local/ssl/certs in
the following instructions, and/or set environment variables.
To determine the default location for certs on your system you may run the
following command:
......@@ -124,13 +123,12 @@ THE CA BUNDLE section.
INSTALLING A SELF-SIGNED CERTIFICATE:
When you would like to trust a self-signed (non-commercial) certificate you
will need to get hold of the actual file. If it's a cert local to your
network you can ask the sysadmin to make it available for download as a link
on a webpage.
When you would like to trust a self-signed (non-commercial) certificate you will
need to get hold of the actual file. If it's a cert local to your network you
can ask the sysadmin to make it available for download as a link on a webpage.
If such file is not human-readable it's probably DER formatted and will need
to be converted to PEM format to allow openssl to use it.
If such file is not human-readable it's probably DER formatted and will need to
be converted to PEM format to allow openssl to use it.
To convert DER formatted certificates into something openssl can deal with:
......@@ -160,11 +158,11 @@ for those who want to take that route, or you can extract the current bundle
from a current version of Internet Explorer (export them all from IE and
transfer it onto your system).
From MirOS, this cert bundle
From MirOS, a cert bundle is available at
http://cvs.mirbsd.de/src/etc/ssl.certs.shar