about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES11
-rw-r--r--PACKAGE/debian/changelog4
-rw-r--r--PACKAGE/lynx.nsi6
-rw-r--r--PACKAGE/lynx.spec4
-rw-r--r--PACKAGE/version.iss2
-rw-r--r--WWW/Library/Implementation/HTUtils.h6
-rw-r--r--configure.in6
-rw-r--r--lynx.cfg4
-rw-r--r--makefile.in21
-rw-r--r--src/LYIcon.rc10
-rw-r--r--src/LYJump.c4
-rw-r--r--src/chrtrans/makefile.in4
-rw-r--r--src/makefile.in10
-rw-r--r--userdefs.h4
14 files changed, 64 insertions, 32 deletions
diff --git a/CHANGES b/CHANGES
index 6ca8bcf1..0c8be0a6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,17 @@
--- $LynxId: CHANGES,v 1.723 2014/01/11 16:26:24 tom Exp $
+-- $LynxId: CHANGES,v 1.727 2014/01/19 15:21:18 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2014-01-19 (2.8.8pre.4)
+* disable EXP_JAPANESEUTF8_SUPPORT if the system has no iconv support -TD
+* modify makefiles to perform the src/chrtrans rules from the top-level rather
+  than via the src-level, solving the issue of "makefile races" -TD
+* reviewed minor fixes from OpenBSD CVS for these issues:
+  - fix makefile races [espie]
+  - read/write result checking fixes to avoid unsigned comparisons vs -1 [krw]
+  However, the former is not an improvement; kept only the latter -TD
+
 2014-01-11 (2.8.8pre.3)
 * apply analogous changes to tidytls.c interface -TD
 * apply openssl patch from openSUSE package for Lynx to modify the SSL options
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 9874b81b..25d11b69 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.8pre.3) unstable; urgency=low
+lynx-dev (2.8.8pre.4) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 04 Jan 2014 10:27:33 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 19 Jan 2014 06:47:17 -0500
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 45b79b57..90909bf4 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.13 2014/01/09 00:29:11 tom Exp $

+; $LynxId: lynx.nsi,v 1.14 2014/01/19 11:47:17 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 "8"

-!define VERSION_LEVEL "2003"

-!define VERSION_PATCH "pre.3"

+!define VERSION_LEVEL "2004"

+!define VERSION_PATCH "pre.4"

 

 !define SUBKEY "Lynx"

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 0acff5a6..c576f79c 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.21 2014/01/04 15:27:33 tom Exp $
+# $LynxId: lynx.spec,v 1.22 2014/01/19 11:47:17 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.8
-Release: pre.3
+Release: pre.4
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 6ffc5a54..24b88b1a 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.8pre.3"
+#define LYNX_VERSION "2.8.8pre.4"
 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.7"

diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 9bd760e5..d0757e55 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.119 2013/11/28 11:33:20 tom Exp $
+ * $LynxId: HTUtils.h,v 1.120 2014/01/19 15:18:01 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -136,6 +136,10 @@ char *alloca();
 #undef HAVE_LIBINTL_H
 #endif
 
+#ifndef HAVE_ICONV
+#undef EXP_JAPANESEUTF8_SUPPORT
+#endif
+
 #ifndef lynx_srand
 #define lynx_srand srand
 #endif
diff --git a/configure.in b/configure.in
index 8257d3b8..48844d2c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.258 2014/01/09 20:06:38 tom Exp $
+dnl $LynxId: configure.in,v 1.259 2014/01/19 11:47:17 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.8pre.3)
+AC_REVISION(2.8.8pre.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.8pre.3
+VERSION=2.8.8pre.4
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index a9cb575d..dc01a9f2 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,10 +1,10 @@
-# $LynxId: lynx.cfg,v 1.236 2014/01/11 19:33:24 tom Exp $
+# $LynxId: lynx.cfg,v 1.237 2014/01/19 11:47:17 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.8pre.3"
+#PRCS LYNX_VERSION "2.8.8pre.4"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
 #PRCS LYNX_DATE "Sat, 11 Jan 2014 11:06:15 -0800"
diff --git a/makefile.in b/makefile.in
index 64bf1e60..f4073939 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.137 2014/01/09 22:26:18 tom Exp $
+# $LynxId: makefile.in,v 1.139 2014/01/19 14:40:59 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -20,6 +20,14 @@ CPPFLAGS	= @CPPFLAGS@
 LINT		= @LINT@
 ETAGS		= @ETAGS@
 
+BUILD_CC	= @BUILD_CC@
+BUILD_CPP	= @BUILD_CPP@
+BUILD_CFLAGS	= @BUILD_CFLAGS@
+BUILD_CPPFLAGS	= @BUILD_CPPFLAGS@ @DEFS@
+BUILD_EXEEXT	= @BUILD_EXEEXT@
+BUILD_LDFLAGS	= @BUILD_LDFLAGS@
+BUILD_LIBS	= @BUILD_LIBS@
+
 x		= @EXEEXT@
 o		= .@OBJEXT@
 
@@ -38,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.8pre.3
+LYNX_VERSION	= 2.8.8pre.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.
@@ -185,6 +193,14 @@ WWW_CFLAGS = \
 	CPPFLAGS="$(CPPFLAGS)" \
 	LYFLAGS="$(SITE_LYDEFS)"
 
+CHR_CFLAGS = \
+	SITE_DEFS="$(SITE_DEFS)" \
+	BUILD_CFLAGS="$(BUILD_CFLAGS)" \
+	BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
+	BUILD_LDFLAGS="$(BUILD_LDFLAGS)" \
+	BUILD_LIBS="$(BUILD_LIBS)" \
+	BUILD_CC="$(BUILD_CC)"
+
 SRC_CFLAGS = \
 	CFLAGS="$(CFLAGS)" \
 	CPPFLAGS="$(CPPFLAGS)" \
@@ -201,6 +217,7 @@ all lynx$x: cfg_defs.h LYHelp.h
 @MSG_DIR_MAKE@	$(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
 @MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR)
 	cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
+	cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS)
 	cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
 
 lint:
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index 0975ee27..02126009 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.7 2014/01/09 00:26:48 tom Exp $
+// $LynxId: LYIcon.rc,v 1.8 2014/01/19 11:47:17 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,8,2003
-PRODUCTVERSION 2,8,8,2003
+FILEVERSION    2,8,8,2004
+PRODUCTVERSION 2,8,8,2004
 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.8.2003"
+      VALUE "FileVersion",      "2.8.8.2004"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2014 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.8.2003"
+      VALUE "ProductVersion",   "2.8.8.2004"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYJump.c b/src/LYJump.c
index ebe09d61..98632df5 100644
--- a/src/LYJump.c
+++ b/src/LYJump.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYJump.c,v 1.49 2013/11/28 11:19:08 tom Exp $
+ * $LynxId: LYJump.c,v 1.50 2014/01/19 11:43:21 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAlert.h>
@@ -419,7 +419,7 @@ static unsigned LYRead_Jumpfile(struct JumpTable *jtp)
     if (IsStream_LF) {
     /** Handle as a stream. **/
 #endif /* VMS */
-	if (read(fd, mp, (size_t) st.st_size) < st.st_size) {
+	if (read(fd, mp, (size_t) st.st_size) != st.st_size) {
 	    HTAlert(ERROR_READING_JUMP_FILE);
 	    FREE(mp);
 	    close(fd);
diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
index 1b7c2416..042657c2 100644
--- a/src/chrtrans/makefile.in
+++ b/src/chrtrans/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.38 2012/08/12 23:54:57 tom Exp $
+# $LynxId: makefile.in,v 1.39 2014/01/19 14:42:43 tom Exp $
 #
 # Makefile for the makeuctb and unicode tables.
 #
@@ -117,7 +117,7 @@ TABLES= \
 
 default: $(FONTMAP_INC)
 
-tables: $(TABLES)
+all tables: $(TABLES)
 
 OBJS		= makeuctb$o
 C_SRC		= $(OBJS:$o=.c)
diff --git a/src/makefile.in b/src/makefile.in
index 3c797293..55611da1 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.70 2013/10/13 22:58:41 tom Exp $
+# $LynxId: makefile.in,v 1.73 2014/01/19 14:41:13 tom Exp $
 # template-makefile for Lynx src directory
 
 SHELL		= @CONFIG_SHELL@
@@ -34,6 +34,8 @@ BUILD_CPP	= @BUILD_CPP@
 BUILD_CFLAGS	= @BUILD_CFLAGS@
 BUILD_CPPFLAGS	= @BUILD_CPPFLAGS@ @DEFS@
 BUILD_EXEEXT	= @BUILD_EXEEXT@
+BUILD_LDFLAGS	= @BUILD_LDFLAGS@
+BUILD_LIBS	= @BUILD_LIBS@
 
 MAKE_RECUR	= $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)"
 
@@ -104,7 +106,7 @@ all: lynx$x
 	@RULE_CC@
 	@ECHO_CC@$(CPP) -C $(CPP_OPTS) $< >$@
 
-lynx$x:   message do_chartrans_stuff $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB)
+lynx$x:   message $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB)
 	@echo "Linking and creating Lynx executable"
 	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@  $(OBJS) $(WWWLIB) $(LIBS) $(INTLLIB)
 	@echo "Copying Lynx executable into top-level directory"
@@ -155,7 +157,7 @@ LYUtils$o :		$(top_srcdir)/userdefs.h
 LYmktime$o :		$(top_srcdir)/userdefs.h
 LYrcFile$o :		$(top_srcdir)/userdefs.h
 
-LYIcon$o: LYIcon.rc 
+LYIcon$o: LYIcon.rc
 	$(WINDRES) -i LYIcon.rc -o LYIcon$o -O coff
 
 CHRTR= chrtrans/
@@ -230,7 +232,7 @@ test_mktime: test_mktime.o parsdate.o LYebcdic.o
 
 # update generated source (may be in ".", or srcdir)
 parsdate.c : $(srcdir)/parsdate.y
-	$(YACC)  $(srcdir)/parsdate.y 
+	$(YACC)  $(srcdir)/parsdate.y
 	-rm -f $@
 	mv y.tab.c $@
 
diff --git a/userdefs.h b/userdefs.h
index 420eb7a3..4fa93acc 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.286 2014/01/11 19:33:24 tom Exp $
+ * $LynxId: userdefs.h,v 1.287 2014/01/19 11:47:17 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1442,7 +1442,7 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.8pre.3"
+#define LYNX_VERSION "2.8.8pre.4"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-04-17 02:41:09 +0000