Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/lynx/patches/lynx-2.8.6rel.4.patch

    Annotation of /trunk/lynx/patches/lynx-2.8.6rel.4.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (hide annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
    File size: 5084 byte(s) 
    -import
    1 niro 153 # ------------------------------------------------------------------------------
    2     # CHANGES | 10 ++++++++--
    3     # configure | 2 +-
    4     # configure.in | 4 ++--
    5     # lynx.cfg | 4 ++--
    6     # src/HTInit.c | 20 ++++++++------------
    7     # userdefs.h | 4 ++--
    8     # 6 files changed, 23 insertions(+), 21 deletions(-)
    9     # ------------------------------------------------------------------------------
    10     Index: CHANGES
    11     --- 2.8.6rel.3/CHANGES Mon Nov 6 17:27:15 2006
    12     +++ 2.8.6rel.4/CHANGES Wed Nov 15 16:42:22 2006
    13     @@ -1,9 +1,15 @@
    14     Changes since Lynx 2.8 release
    15     ===============================================================================
    16    
    17     +2006-11-15 (2.8.6rel.4 diverges from 2.8.7dev.4)
    18     +* limit files set via PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP to be found
    19     + relative to the user's home directory. This change is less flexible than the
    20     + development version, but simpler to implement. The check to ensure that
    21     + the files are controlled by the user is retained (Redhat #214205) -TD
    22     +
    23     2006-11-06 (2.8.6rel.3 from 2.8.7dev.2)
    24     -* ensure that the configured values for PERSONAL_EXTENSION_MAP and
    25     - PERSONAL_MAILCAP are absolute pathnames -TD
    26     +* ensure that the configured values for GLOBAL_EXTENSION_MAP and GLOBAL_MAILCAP
    27     + are absolute pathnames -TD
    28     * modify logic for reading PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP to
    29     ensure that they are files that are controlled only by the user. The
    30     default values for these allow lynx to read configuration information
    31     Index: configure
    32     --- 2.8.6rel.3/configure Tue Oct 10 16:39:50 2006
    33     +++ 2.8.6rel.4/configure Tue Oct 10 16:39:50 2006
    34     @@ -1228,7 +1228,7 @@
    35    
    36     PACKAGE=lynx
    37     # $Format: "VERSION=$ProjectVersion$"$
    38     -VERSION=2.8.6rel.3
    39     +VERSION=2.8.6rel.4
    40    
    41     test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
    42    
    43     Index: configure.in
    44     --- 2.8.6rel.3/configure.in Tue Oct 10 16:39:50 2006
    45     +++ 2.8.6rel.4/configure.in Tue Oct 10 16:39:50 2006
    46     @@ -25,7 +25,7 @@
    47     dnl
    48     dnl ask PRCS to plug-in the project-version for the configure-script.
    49     dnl $Format: "AC_REVISION($ProjectVersion$)"$
    50     -AC_REVISION(2.8.6rel.3)
    51     +AC_REVISION(2.8.6rel.4)
    52    
    53     # Save the original $CFLAGS so we can distinguish whether the user set those
    54     # in the environment, or whether autoconf added -O and -g options:
    55     @@ -57,7 +57,7 @@
    56     PACKAGE=lynx
    57     dnl ask PRCS to plug-in the project-version for the packages.
    58     # $Format: "VERSION=$ProjectVersion$"$
    59     -VERSION=2.8.6rel.3
    60     +VERSION=2.8.6rel.4
    61     AC_SUBST(PACKAGE)
    62     AC_SUBST(VERSION)
    63     AC_SUBST(DESTDIR)
    64     Index: lynx.cfg
    65     --- 2.8.6rel.3/lynx.cfg Mon Sep 18 17:28:28 2006
    66     +++ 2.8.6rel.4/lynx.cfg Mon Sep 18 17:28:28 2006
    67     @@ -3,10 +3,10 @@
    68     # or Lynx_Dir:lynx.cfg (VMS)
    69     #
    70     # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
    71     -#PRCS LYNX_VERSION "2.8.6rel.3"
    72     +#PRCS LYNX_VERSION "2.8.6rel.4"
    73     #
    74     # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
    75     -#PRCS LYNX_DATE "Mon, 06 Nov 2006 17:27:15 -0800"
    76     +#PRCS LYNX_DATE "Wed, 15 Nov 2006 16:42:22 -0800"
    77     #
    78     # Definition pairs are of the form VARIABLE:DEFINITION
    79     # NO spaces are allowed between the pair items.
    80     Index: src/HTInit.c
    81     --- 2.8.6rel.3/src/HTInit.c Mon Nov 6 17:27:15 2006
    82     +++ 2.8.6rel.4/src/HTInit.c Wed Nov 15 16:42:22 2006
    83     @@ -161,15 +161,13 @@
    84     /*
    85     * Load the local maps.
    86     */
    87     - if (IsOurFile(personal_type_map)
    88     - && LYCanReadFile(personal_type_map)) {
    89     - /* These should override everything else. */
    90     - HTLoadTypesConfigFile(personal_type_map, mediaUSR);
    91     - } else {
    92     + {
    93     char buffer[LY_MAXPATH];
    94    
    95     LYAddPathToHome(buffer, sizeof(buffer), personal_type_map);
    96     - HTLoadTypesConfigFile(buffer, mediaUSR);
    97     + if (IsOurFile(buffer)
    98     + && LYCanReadFile(buffer))
    99     + HTLoadTypesConfigFile(buffer, mediaUSR);
    100     }
    101    
    102     /*
    103     @@ -1341,15 +1339,13 @@
    104     /*
    105     * Load the local maps.
    106     */
    107     - if (IsOurFile(personal_extension_map)
    108     - && LYCanReadFile(personal_extension_map)) {
    109     - /* These should override everything else. */
    110     - HTLoadExtensionsConfigFile(personal_extension_map);
    111     - } else {
    112     + {
    113     char buffer[LY_MAXPATH];
    114    
    115     LYAddPathToHome(buffer, sizeof(buffer), personal_extension_map);
    116     - HTLoadExtensionsConfigFile(buffer);
    117     + if (IsOurFile(buffer)
    118     + && LYCanReadFile(buffer))
    119     + HTLoadExtensionsConfigFile(buffer);
    120     }
    121     }
    122    
    123     Index: userdefs.h
    124     --- 2.8.6rel.3/userdefs.h Thu Dec 30 04:11:59 2004
    125     +++ 2.8.6rel.4/userdefs.h Thu Dec 30 04:11:59 2004
    126     @@ -1360,11 +1360,11 @@
    127     * the version definition with the Project Version on checkout. Just
    128     * ignore it. - kw */
    129     /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
    130     -#define LYNX_VERSION "2.8.6rel.3"
    131     +#define LYNX_VERSION "2.8.6rel.4"
    132     #define LYNX_WWW_HOME "http://lynx.isc.org/"
    133     #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
    134     /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
    135     -#define LYNX_DATE "Mon, 06 Nov 2006 17:27:15 -0800"
    136     +#define LYNX_DATE "Wed, 15 Nov 2006 16:42:22 -0800"
    137     #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */
    138     #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */
    139