# ------------------------------------------------------------------------------
# CHANGES      |   10 ++++++++--
# configure    |    2 +-
# configure.in |    4 ++--
# lynx.cfg     |    4 ++--
# src/HTInit.c |   20 ++++++++------------
# userdefs.h   |    4 ++--
# 6 files changed, 23 insertions(+), 21 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- 2.8.6rel.3/CHANGES	Mon Nov  6 17:27:15 2006
+++ 2.8.6rel.4/CHANGES	Wed Nov 15 16:42:22 2006
@@ -1,9 +1,15 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2006-11-15 (2.8.6rel.4 diverges from 2.8.7dev.4)
+* limit files set via PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP to be found
+  relative to the user's home directory.  This change is less flexible than the
+  development version, but simpler to implement.  The check to ensure that
+  the files are controlled by the user is retained (Redhat #214205) -TD
+
 2006-11-06 (2.8.6rel.3 from 2.8.7dev.2)
-* ensure that the configured values for PERSONAL_EXTENSION_MAP and
-  PERSONAL_MAILCAP are absolute pathnames -TD
+* ensure that the configured values for GLOBAL_EXTENSION_MAP and GLOBAL_MAILCAP
+  are absolute pathnames -TD
 * modify logic for reading PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP to
   ensure that they are files that are controlled only by the user.  The
   default values for these allow lynx to read configuration information
Index: configure
--- 2.8.6rel.3/configure	Tue Oct 10 16:39:50 2006
+++ 2.8.6rel.4/configure	Tue Oct 10 16:39:50 2006
@@ -1228,7 +1228,7 @@
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6rel.3
+VERSION=2.8.6rel.4
 
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
Index: configure.in
--- 2.8.6rel.3/configure.in	Tue Oct 10 16:39:50 2006
+++ 2.8.6rel.4/configure.in	Tue Oct 10 16:39:50 2006
@@ -25,7 +25,7 @@
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.6rel.3)
+AC_REVISION(2.8.6rel.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:
@@ -57,7 +57,7 @@
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6rel.3
+VERSION=2.8.6rel.4
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(DESTDIR)
Index: lynx.cfg
--- 2.8.6rel.3/lynx.cfg	Mon Sep 18 17:28:28 2006
+++ 2.8.6rel.4/lynx.cfg	Mon Sep 18 17:28:28 2006
@@ -3,10 +3,10 @@
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.6rel.3"
+#PRCS LYNX_VERSION "2.8.6rel.4"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Mon, 06 Nov 2006 17:27:15 -0800"
+#PRCS LYNX_DATE "Wed, 15 Nov 2006 16:42:22 -0800"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
Index: src/HTInit.c
--- 2.8.6rel.3/src/HTInit.c	Mon Nov  6 17:27:15 2006
+++ 2.8.6rel.4/src/HTInit.c	Wed Nov 15 16:42:22 2006
@@ -161,15 +161,13 @@
     /*
      * Load the local maps.
      */
-    if (IsOurFile(personal_type_map)
-	&& LYCanReadFile(personal_type_map)) {
-	/* These should override everything else. */
-	HTLoadTypesConfigFile(personal_type_map, mediaUSR);
-    } else {
+    {
 	char buffer[LY_MAXPATH];
 
 	LYAddPathToHome(buffer, sizeof(buffer), personal_type_map);
-	HTLoadTypesConfigFile(buffer, mediaUSR);
+	if (IsOurFile(buffer)
+	    && LYCanReadFile(buffer))
+	    HTLoadTypesConfigFile(buffer, mediaUSR);
     }
 
     /*
@@ -1341,15 +1339,13 @@
     /*
      * Load the local maps.
      */
-    if (IsOurFile(personal_extension_map)
-	&& LYCanReadFile(personal_extension_map)) {
-	/* These should override everything else. */
-	HTLoadExtensionsConfigFile(personal_extension_map);
-    } else {
+    {
 	char buffer[LY_MAXPATH];
 
 	LYAddPathToHome(buffer, sizeof(buffer), personal_extension_map);
-	HTLoadExtensionsConfigFile(buffer);
+	if (IsOurFile(buffer)
+	    && LYCanReadFile(buffer))
+	    HTLoadExtensionsConfigFile(buffer);
     }
 }
 
Index: userdefs.h
--- 2.8.6rel.3/userdefs.h	Thu Dec 30 04:11:59 2004
+++ 2.8.6rel.4/userdefs.h	Thu Dec 30 04:11:59 2004
@@ -1360,11 +1360,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.6rel.3"
+#define LYNX_VERSION "2.8.6rel.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 "Mon, 06 Nov 2006 17:27:15 -0800"
+#define LYNX_DATE "Wed, 15 Nov 2006 16:42:22 -0800"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */