diff options
author | Thomas E. Dickey <dickey@invisible-island.net> | 2015-01-25 17:35:28 -0500 |
---|---|---|
committer | Thomas E. Dickey <dickey@invisible-island.net> | 2015-01-25 17:35:28 -0500 |
commit | 4b7192fcc61053dea1c187caf2d30bbdac8733cb (patch) | |
tree | bd3373d957d46cf8c0a6b60f0e75fc7a500f6bc0 | |
parent | 55df51e6ca5ebf5cd5910179f5e03b7a275a3e5d (diff) | |
download | lynx-snapshots-4b7192fcc61053dea1c187caf2d30bbdac8733cb.tar.gz |
snapshot of project "lynx", label v2-8-9dev_3a
-rw-r--r-- | CHANGES | 8 | ||||
-rw-r--r-- | PACKAGE/debian/changelog | 4 | ||||
-rw-r--r-- | PACKAGE/lynx.nsi | 6 | ||||
-rw-r--r-- | PACKAGE/lynx.spec | 4 | ||||
-rw-r--r-- | PACKAGE/version.iss | 2 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTTP.c | 22 | ||||
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | configure.in | 8 | ||||
-rw-r--r-- | lynx.cfg | 4 | ||||
-rw-r--r-- | makefile.in | 4 | ||||
-rw-r--r-- | src/LYIcon.rc | 10 | ||||
-rw-r--r-- | userdefs.h | 6 |
12 files changed, 52 insertions, 30 deletions
diff --git a/CHANGES b/CHANGES index cb415e47..3b82db6f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,14 @@ --- $LynxId: CHANGES,v 1.771 2015/01/05 09:17:08 tom Exp $ +-- $LynxId: CHANGES,v 1.775 2015/01/25 17:33:17 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== +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 diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog index fbce1533..41d1b8a8 100644 --- a/PACKAGE/debian/changelog +++ b/PACKAGE/debian/changelog @@ -1,8 +1,8 @@ -lynx-dev (2.8.9dev.3) unstable; urgency=low +lynx-dev (2.8.9dev.4) unstable; urgency=low * maintenance updates - -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 30 Dec 2014 16:37:40 -0500 + -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 25 Jan 2015 11:05:46 -0500 lynx-dev (2.8.8dev.16) unstable; urgency=high diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi index eaad131f..c2c46fd4 100644 --- a/PACKAGE/lynx.nsi +++ b/PACKAGE/lynx.nsi @@ -1,4 +1,4 @@ -; $LynxId: lynx.nsi,v 1.21 2015/01/02 12:27:30 tom Exp $ +; $LynxId: lynx.nsi,v 1.22 2015/01/25 16:05:46 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 "1003" -!define VERSION_PATCH "dev.3" +!define VERSION_LEVEL "1004" +!define VERSION_PATCH "dev.4" !define SUBKEY "Lynx" diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec index 3c44ca71..81e676e0 100644 --- a/PACKAGE/lynx.spec +++ b/PACKAGE/lynx.spec @@ -1,8 +1,8 @@ -# $LynxId: lynx.spec,v 1.28 2014/12/30 21:37:40 tom Exp $ +# $LynxId: lynx.spec,v 1.29 2015/01/25 16:05:46 tom Exp $ Summary: A text-based Web browser Name: lynx Version: 2.8.9 -Release: dev.3 +Release: dev.4 License: GPLv2 Group: Applications/Internet Source: lynx%{version}%{release}.tgz diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss index e0a67caa..69ac1342 100644 --- a/PACKAGE/version.iss +++ b/PACKAGE/version.iss @@ -1,7 +1,7 @@ ; version used for Inno Setup files. ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ -#define LYNX_VERSION "2.8.9dev.3" +#define LYNX_VERSION "2.8.9dev.4" ; most-recent full release and target #define LYNX_RELEASE "2.8.9" diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index bc3adff5..d7088fb4 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTP.c,v 1.136 2014/11/30 22:51:30 tom Exp $ + * $LynxId: HTTP.c,v 1.137 2015/01/25 16:58:33 tom Exp $ * * HyperText Tranfer Protocol - Client implementation HTTP.c * ========================== @@ -782,9 +782,24 @@ static int HTLoadHTTP(const char *arg, GNUTLS_VERIFY_DO_NOT_ALLOW_SAME | GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT); ret = gnutls_certificate_verify_peers2(handle->gnutls_state, &tls_status); - if (ret < 0 || (ret == 0 && - tls_status & GNUTLS_CERT_SIGNER_NOT_FOUND)) { + if (ret < 0 || tls_status != 0) { int flag_continue = 1; + +#if GNUTLS_VERSION_NUMBER >= 0x030104 + int type; + gnutls_datum_t out; + + if (ret < 0) { + HTSprintf0(&msg, SSL_FORCED_PROMPT, + gettext("GnuTLS error when trying to verify certificate.")); + } else { + type = gnutls_certificate_type_get(handle->gnutls_state); + ret = gnutls_certificate_verification_status_print(tls_status, + type, &out, 0); + HTSprintf0(&msg, SSL_FORCED_PROMPT, out.data); + gnutls_free(out.data); + } +#else char *msg2; if (ret == 0 && tls_status & GNUTLS_CERT_SIGNER_NOT_FOUND) { @@ -799,6 +814,7 @@ static int HTLoadHTTP(const char *arg, msg2 = gettext("the certificate is not trusted"); } HTSprintf0(&msg, SSL_FORCED_PROMPT, msg2); +#endif CTRACE((tfp, "HTLoadHTTP: %s\n", msg)); if (!ssl_noprompt) { if (!HTForcedPrompt(ssl_noprompt, msg, YES)) { diff --git a/configure b/configure index db617b5a..28eeb3ec 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in 2.8.9dev.2. +# From configure.in 2.8.9dev.4. # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20141204. # @@ -1274,7 +1274,7 @@ rm conftest.sed PACKAGE=lynx # $Format: "VERSION=$ProjectVersion$"$ -VERSION=2.8.9dev.2 +VERSION=2.8.9dev.4 echo "$as_me:1279: checking for DESTDIR" >&5 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6 diff --git a/configure.in b/configure.in index 1e30b9db..11467fa5 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $LynxId: configure.in,v 1.270 2014/12/30 21:37:40 tom Exp $ +dnl $LynxId: configure.in,v 1.272 2015/01/25 17:34:39 tom Exp $ dnl dnl Process this file with autoconf to produce a configure script. dnl @@ -7,7 +7,7 @@ dnl by T.E.Dickey <dickey@invisible-island.net> dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> dnl dnl --------------------------------------------------------------------------- -dnl Copyright 1997-2013,2014 by Thomas E. Dickey +dnl Copyright 1997-2014,2015 by Thomas E. Dickey dnl dnl Permission to use, copy, modify, and distribute this software and its dnl documentation for any purpose and without fee is hereby granted, @@ -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.3) +AC_REVISION(2.8.9dev.4) # 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.3 +VERSION=2.8.9dev.4 AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/lynx.cfg b/lynx.cfg index 6b2571ca..0af040f7 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,10 +1,10 @@ -# $LynxId: lynx.cfg,v 1.251 2014/12/30 21:37:40 tom Exp $ +# $LynxId: lynx.cfg,v 1.252 2015/01/25 16:05:46 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.3" +#PRCS LYNX_VERSION "2.8.9dev.4" # # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ #PRCS LYNX_DATE "Sun, 21 Dec 2014 17:39:40 -0800" diff --git a/makefile.in b/makefile.in index 30b6bc80..61bd515f 100644 --- a/makefile.in +++ b/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.148 2014/12/30 21:37:40 tom Exp $ +# $LynxId: makefile.in,v 1.149 2015/01/25 16:05:46 tom Exp $ ##makefile for lynx SHELL = @CONFIG_SHELL@ @@ -46,7 +46,7 @@ TAR_UP = $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@ TAR_DOWN = $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@ # $Format: "LYNX_VERSION = $ProjectVersion$"$ -LYNX_VERSION = 2.8.9dev.3 +LYNX_VERSION = 2.8.9dev.4 ## This is the version which we are developing (or, upon release, make this ## the same). Use no dots in the name, since it must work on VMS and MS-DOS. diff --git a/src/LYIcon.rc b/src/LYIcon.rc index 0bb08580..724ac3ba 100644 --- a/src/LYIcon.rc +++ b/src/LYIcon.rc @@ -1,12 +1,12 @@ -// $LynxId: LYIcon.rc,v 1.15 2015/01/02 12:27:53 tom Exp $ +// $LynxId: LYIcon.rc,v 1.16 2015/01/25 16:05:46 tom Exp $ #include <windows.h> 100 ICON "../samples/lynx.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,8,9,1003 -PRODUCTVERSION 2,8,9,1003 +FILEVERSION 2,8,9,1004 +PRODUCTVERSION 2,8,9,1004 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "http://lynx.isc.org" VALUE "FileDescription", "Lynx - web browser" - VALUE "FileVersion", "2.8.9.1003" + VALUE "FileVersion", "2.8.9.1004" VALUE "InternalName", "Lynx" VALUE "LegalCopyright", "©1997-2015 Thomas E. Dickey" VALUE "OriginalFilename", "lynx.exe" VALUE "ProductName", "Lynx - web browser" - VALUE "ProductVersion", "2.8.9.1003" + VALUE "ProductVersion", "2.8.9.1004" END END BLOCK "VarFileInfo" diff --git a/userdefs.h b/userdefs.h index 3c279e4f..64cf537c 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1,5 +1,5 @@ /* - * $LynxId: userdefs.h,v 1.300 2015/01/02 12:27:07 tom Exp $ + * $LynxId: userdefs.h,v 1.302 2015/01/25 16:05:46 tom Exp $ * * Lynx - Hypertext navigation system * @@ -1442,11 +1442,11 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.9dev.3" +#define LYNX_VERSION "2.8.9dev.4" #define LYNX_WWW_HOME "http://lynx.isc.org/" #define LYNX_WWW_DIST "http://lynx.isc.org/current/" /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Sun, 21 Dec 2014 17:39:40 -0800" +#define LYNX_DATE "Mon, 05 Jan 2015 16:40:38 -0800" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |