snapshot of project "lynx", label v2-8-8dev_16e

7 files changed, 63 insertions, 17 deletions

diff --git a/CHANGES b/CHANGES
index 928fbeb2..8ea87a12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
--- $LynxId: CHANGES,v 1.657 2013/10/01 23:46:43 tom Exp $
+-- $LynxId: CHANGES,v 1.658 2013/10/02 14:20:04 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2013-10-01 (2.8.8dev.17)
+2013-10-02 (2.8.8dev.17)
+* update COPYHEADER, clarifying license issues -TD
 * minor change to Content-Length logic from 2.8.8dev.13 to work with Amazon's
   cookies (Debian #720541) -TD
 * improve warning message for GNUTLS_CERT_SIGNER_NOT_FOUND (Debian #695653) -TD
diff --git a/COPYHEADER b/COPYHEADER
index a3d300e9..5e6fea82 100644
--- a/COPYHEADER
+++ b/COPYHEADER
@@ -1,18 +1,61 @@
-Most of the content of the lynx release (and corresponding copyright) is
+-- $LynxId: COPYHEADER,v 1.6 2013/10/02 14:18:35 tom Exp $
+-- vile:txtmode fc=72
+
+Copyright 1997-2012,2013 Thomas E. Dickey
+
+This copyright notice must be included in all copies or substantial
+portions of Lynx.  It outlines rights and restrictions for Lynx which
+override the guidelines given in the COPYING file.
+
+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 Public
 License (Version 2).  Note that the License text after the terms and
 conditions is advisory in nature, and contains neither terms nor
 conditions.  You may choose to follow that advice.
 
+The copyright owners and developers for Lynx grant their permission for
+using any version of these common libraries (which are known to have
+problematic licensing issues) with any operating system or platform:
+
+	GNUTLS
+
+	libbsd, e.g., from http://libbsd.freedesktop.org/releases/
+
+	libidn
+
+	libutf8
+
+	OpenSSL
+
+Additionally, the developers understand that these additional libraries
+have no licensing issues.  Permission is in any case granted to use Lynx
+without restriction for these as well:
+
+	libiconv
+
+	nss_compat_ossl, e.g, http://fedoraproject.org/wiki/Nss_compat_ossl
+
+	zlib, e.g., http://www.gzip.org/zlib/ 
+
+	libbz2, e.g., http://www.bzip.org/
+
+The list given is by no means exhaustive and may not be interpreted to
+limit the set of libraries with which Lynx can be used.
+
+The granted right to "use" (besides the obvious ability to run the
+program as a user) covers all development activities such as of building,
+modifying, distributing modified versions.
+
 Any licensing questions should be directed to the mailing list:
 
 	lynx-dev@nongnu.org
 
-or to the maintainer (Thomas E. Dickey):
+or to the developer/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.
diff --git a/COPYHEADER.asc b/COPYHEADER.asc
index df5cdade..e9e46c74 100644
--- a/COPYHEADER.asc
+++ b/COPYHEADER.asc
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 Comment: See http://invisible-island.net/public/public.html for info
 
-iD8DBQBFJtEJcCNT4PfkjtsRAnytAKC3rO7DVxVNHICFIKX+vgCCtFjc8wCfUnye
-cUEFsCqkOK7Xf7APdEsTc+k=
-=p72x
+iEYEABECAAYFAlJMK18ACgkQcCNT4PfkjtuMdQCdHzZhW8At2wa9zbshAUPIJamP
+GhoAn0Cz8ya3W9O59gdLwhziNcoi8/Qa
+=siaX
 -----END PGP SIGNATURE-----
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index f3fc7fcd..be9c942b 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.8dev.15"
+#define LYNX_VERSION "2.8.8dev.16"
 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.7"

diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 7ca34dd6..19016457 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.130 2013/10/01 21:58:37 tom Exp $
+ * $LynxId: HTTP.c,v 1.131 2013/10/02 14:33:32 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -717,7 +717,7 @@ static int HTLoadHTTP(const char *arg,
 	    handle->options |= SSL_OP_NO_TLSv1;
 #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
 	} else {
-	    int ret = SSL_set_tlsext_host_name(handle, ssl_host);
+	    int ret = (int) SSL_set_tlsext_host_name(handle, ssl_host);
 
 	    CTRACE((tfp, "...called SSL_set_tlsext_host_name(%s) ->%d\n",
 		    ssl_host, ret));
diff --git a/src/LYCurses.c b/src/LYCurses.c
index b8934930..28a0ff19 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.174 2013/07/21 00:40:06 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.175 2013/10/02 14:35:56 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -647,7 +647,7 @@ static int get_color_pair(int n)
 	&& lynx_color_pairs[n].bg == default_bg)
 	return 0;
 #endif
-    return COLOR_PAIR(n);
+    return (int) COLOR_PAIR(n);
 }
 
 /*
diff --git a/src/LYStyle.c b/src/LYStyle.c
index 40c419c7..3aa0517d 100644
--- a/src/LYStyle.c
+++ b/src/LYStyle.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYStyle.c,v 1.73 2013/06/02 19:17:06 tom Exp $
+ * $LynxId: LYStyle.c,v 1.75 2013/10/02 14:47:09 tom Exp $
  *
  * character level styles for Lynx
  * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
@@ -187,6 +187,7 @@ static void parse_attributes(const char *mono,
     int bA = default_bg;
     int cA = A_NORMAL;
     int newstyle = hash_code(element);
+    int colored_attr;
 
     CTRACE2(TRACE_STYLE, (tfp, "CSS(PA):style d=%d / h=%d, e=%s\n",
 			  style, newstyle, element));
@@ -254,9 +255,10 @@ static void parse_attributes(const char *mono,
 	    }
 	}
 	CTRACE2(TRACE_STYLE, (tfp, "CSS(CURPAIR):%d\n", curPair));
+	colored_attr = ((int) COLOR_PAIR(curPair)) | ((int) cA);
 	if (style < DSTYLE_ELEMENTS)
-	    setStyle(style, COLOR_PAIR(curPair) | cA, cA, mA);
-	setHashStyle(newstyle, COLOR_PAIR(curPair) | cA, cA, mA, element);
+	    setStyle(style, colored_attr, cA, mA);
+	setHashStyle(newstyle, colored_attr, cA, mA, element);
     } else {
 	if (lynx_has_color && fA != NO_COLOR) {
 	    CTRACE2(TRACE_STYLE,
@@ -812,7 +814,7 @@ void FreeCachedStyles(void)
  */
 void update_color_style(void)
 {
-    CTRACE((tfp, "update_color_style %p\n", lss_styles));
+    CTRACE((tfp, "update_color_style %p\n", (void *) lss_styles));
     memset(our_pairs, 0, sizeof(our_pairs));
     parse_userstyles();
 }