Contents of /trunk/lynx/patches/lynx-2.8.6rel.3.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 7314 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 7314 byte(s)
-import
1 | # ------------------------------------------------------------------------------ |
2 | # CHANGES | 8 ++++++++ |
3 | # configure | 2 +- |
4 | # configure.in | 4 ++-- |
5 | # lynx.cfg | 4 ++-- |
6 | # src/HTInit.c | 24 +++++++++++++++--------- |
7 | # src/LYUtils.c | 21 ++++++++------------- |
8 | # src/LYUtils.h | 6 ++++++ |
9 | # userdefs.h | 4 ++-- |
10 | # 8 files changed, 44 insertions(+), 29 deletions(-) |
11 | # ------------------------------------------------------------------------------ |
12 | Index: CHANGES |
13 | --- 2.8.6rel.2/CHANGES Thu Oct 12 16:00:01 2006 |
14 | +++ 2.8.6rel.3/CHANGES Mon Nov 6 17:27:15 2006 |
15 | @@ -1,6 +1,14 @@ |
16 | Changes since Lynx 2.8 release |
17 | =============================================================================== |
18 | |
19 | +2006-11-06 (2.8.6rel.3 from 2.8.7dev.2) |
20 | +* ensure that the configured values for PERSONAL_EXTENSION_MAP and |
21 | + PERSONAL_MAILCAP are absolute pathnames -TD |
22 | +* modify logic for reading PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP to |
23 | + ensure that they are files that are controlled only by the user. The |
24 | + default values for these allow lynx to read configuration information |
25 | + from the user's current directory at lynx's startup (Debian #396949) -TD |
26 | + |
27 | 2006-10-12 (2.8.6rel.2) |
28 | * update version numbers in documentation -TD |
29 | * change embedded URL for HTML'ized lynx.cfg to point to example in current |
30 | Index: configure |
31 | --- 2.8.6rel.2/configure Tue Oct 10 16:39:50 2006 |
32 | +++ 2.8.6rel.3/configure Tue Oct 10 16:39:50 2006 |
33 | @@ -1228,7 +1228,7 @@ |
34 | |
35 | PACKAGE=lynx |
36 | # $Format: "VERSION=$ProjectVersion$"$ |
37 | -VERSION=2.8.6rel.2 |
38 | +VERSION=2.8.6rel.3 |
39 | |
40 | test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` |
41 | |
42 | Index: configure.in |
43 | --- 2.8.6rel.2/configure.in Tue Oct 10 16:39:50 2006 |
44 | +++ 2.8.6rel.3/configure.in Tue Oct 10 16:39:50 2006 |
45 | @@ -25,7 +25,7 @@ |
46 | dnl |
47 | dnl ask PRCS to plug-in the project-version for the configure-script. |
48 | dnl $Format: "AC_REVISION($ProjectVersion$)"$ |
49 | -AC_REVISION(2.8.6rel.2) |
50 | +AC_REVISION(2.8.6rel.3) |
51 | |
52 | # Save the original $CFLAGS so we can distinguish whether the user set those |
53 | # in the environment, or whether autoconf added -O and -g options: |
54 | @@ -57,7 +57,7 @@ |
55 | PACKAGE=lynx |
56 | dnl ask PRCS to plug-in the project-version for the packages. |
57 | # $Format: "VERSION=$ProjectVersion$"$ |
58 | -VERSION=2.8.6rel.2 |
59 | +VERSION=2.8.6rel.3 |
60 | AC_SUBST(PACKAGE) |
61 | AC_SUBST(VERSION) |
62 | AC_SUBST(DESTDIR) |
63 | Index: lynx.cfg |
64 | --- 2.8.6rel.2/lynx.cfg Mon Sep 18 17:28:28 2006 |
65 | +++ 2.8.6rel.3/lynx.cfg Mon Sep 18 17:28:28 2006 |
66 | @@ -3,10 +3,10 @@ |
67 | # or Lynx_Dir:lynx.cfg (VMS) |
68 | # |
69 | # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ |
70 | -#PRCS LYNX_VERSION "2.8.6rel.2" |
71 | +#PRCS LYNX_VERSION "2.8.6rel.3" |
72 | # |
73 | # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ |
74 | -#PRCS LYNX_DATE "Thu, 12 Oct 2006 16:00:01 -0700" |
75 | +#PRCS LYNX_DATE "Mon, 06 Nov 2006 17:27:15 -0800" |
76 | # |
77 | # Definition pairs are of the form VARIABLE:DEFINITION |
78 | # NO spaces are allowed between the pair items. |
79 | Index: src/HTInit.c |
80 | --- 2.8.6rel.2/src/HTInit.c Mon Oct 2 12:56:53 2006 |
81 | +++ 2.8.6rel.3/src/HTInit.c Mon Nov 6 17:27:15 2006 |
82 | @@ -153,15 +153,16 @@ |
83 | SET_INTERNL("text/html", "www/present", HTMLPresent, 1.0); |
84 | SET_INTERNL("text/xml", "www/present", HTMLPresent, 2.0); |
85 | |
86 | - /* |
87 | - * These should override the default types as necessary. |
88 | - */ |
89 | - HTLoadTypesConfigFile(global_type_map, mediaSYS); |
90 | + if (LYisAbsPath(global_type_map)) { |
91 | + /* These should override the default types as necessary. */ |
92 | + HTLoadTypesConfigFile(global_type_map, mediaSYS); |
93 | + } |
94 | |
95 | /* |
96 | * Load the local maps. |
97 | */ |
98 | - if (LYCanReadFile(personal_type_map)) { |
99 | + if (IsOurFile(personal_type_map) |
100 | + && LYCanReadFile(personal_type_map)) { |
101 | /* These should override everything else. */ |
102 | HTLoadTypesConfigFile(personal_type_map, mediaUSR); |
103 | } else { |
104 | @@ -1332,17 +1333,22 @@ |
105 | SET_SUFFIX1(".html", "text/html", "8bit"); |
106 | #endif /* BUILTIN_SUFFIX_MAPS */ |
107 | |
108 | - /* These should override the default extensions as necessary. */ |
109 | - HTLoadExtensionsConfigFile(global_extension_map); |
110 | + if (LYisAbsPath(global_extension_map)) { |
111 | + /* These should override the default extensions as necessary. */ |
112 | + HTLoadExtensionsConfigFile(global_extension_map); |
113 | + } |
114 | |
115 | - if (LYCanReadFile(personal_extension_map)) { |
116 | + /* |
117 | + * Load the local maps. |
118 | + */ |
119 | + if (IsOurFile(personal_extension_map) |
120 | + && LYCanReadFile(personal_extension_map)) { |
121 | /* These should override everything else. */ |
122 | HTLoadExtensionsConfigFile(personal_extension_map); |
123 | } else { |
124 | char buffer[LY_MAXPATH]; |
125 | |
126 | LYAddPathToHome(buffer, sizeof(buffer), personal_extension_map); |
127 | - /* These should override everything else. */ |
128 | HTLoadExtensionsConfigFile(buffer); |
129 | } |
130 | } |
131 | Index: src/LYUtils.c |
132 | --- 2.8.6rel.2/src/LYUtils.c Mon Oct 2 12:56:53 2006 |
133 | +++ 2.8.6rel.3/src/LYUtils.c Mon Nov 6 17:27:15 2006 |
134 | @@ -5789,28 +5789,20 @@ |
135 | } |
136 | #endif |
137 | |
138 | -/* |
139 | - * Default, for single-user systems such as Cygwin and OS/2 EMX: |
140 | - */ |
141 | -#define IsOurFile(name) TRUE |
142 | -#define OpenHiddenFile(name, mode) fopen(name, mode) |
143 | - |
144 | #if defined(MULTI_USER_UNIX) |
145 | - |
146 | -#undef IsOurFile |
147 | -#undef OpenHiddenFile |
148 | - |
149 | /* |
150 | * Verify if this is really a file, not accessed by a link, except for the |
151 | * special case of its directory being pointed to by a link from a directory |
152 | * owned by root and not writable by other users. |
153 | */ |
154 | -static BOOL IsOurFile(const char *name) |
155 | +BOOL IsOurFile(const char *name) |
156 | { |
157 | + BOOL result = FALSE; |
158 | struct stat data; |
159 | |
160 | if (lstat(name, &data) == 0 |
161 | && S_ISREG(data.st_mode) |
162 | + && (data.st_mode & (S_IWOTH | S_IWGRP)) == 0 |
163 | && data.st_nlink == 1 |
164 | && data.st_uid == getuid()) { |
165 | int linked = FALSE; |
166 | @@ -5860,9 +5852,10 @@ |
167 | } while (leaf != path); |
168 | FREE(path); |
169 | #endif |
170 | - return !linked; |
171 | + result = !linked; |
172 | } |
173 | - return FALSE; |
174 | + CTRACE2(TRACE_CFG, (tfp, "IsOurFile(%s) %d\n", name, result)); |
175 | + return result; |
176 | } |
177 | |
178 | /* |
179 | @@ -5922,6 +5915,8 @@ |
180 | } |
181 | return fp; |
182 | } |
183 | +#else |
184 | +#define OpenHiddenFile(name, mode) fopen(name, mode) |
185 | #endif /* MULTI_USER_UNIX */ |
186 | |
187 | FILE *LYNewBinFile(const char *name) |
188 | Index: src/LYUtils.h |
189 | --- 2.8.6rel.2/src/LYUtils.h Sun Oct 16 17:17:20 2005 |
190 | +++ 2.8.6rel.3/src/LYUtils.h Mon Nov 6 17:27:15 2006 |
191 | @@ -196,6 +196,12 @@ |
192 | extern void statusline(const char *text); |
193 | extern void toggle_novice_line(void); |
194 | |
195 | +#if defined(MULTI_USER_UNIX) |
196 | + extern BOOL IsOurFile(const char *name); |
197 | +#else |
198 | +#define IsOurFile(name) TRUE |
199 | +#endif |
200 | + |
201 | #ifdef EXP_ASCII_CTYPES |
202 | extern int ascii_tolower(int i); |
203 | extern int ascii_toupper(int i); |
204 | Index: userdefs.h |
205 | --- 2.8.6rel.2/userdefs.h Thu Dec 30 04:11:59 2004 |
206 | +++ 2.8.6rel.3/userdefs.h Thu Dec 30 04:11:59 2004 |
207 | @@ -1360,11 +1360,11 @@ |
208 | * the version definition with the Project Version on checkout. Just |
209 | * ignore it. - kw */ |
210 | /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ |
211 | -#define LYNX_VERSION "2.8.6rel.2" |
212 | +#define LYNX_VERSION "2.8.6rel.3" |
213 | #define LYNX_WWW_HOME "http://lynx.isc.org/" |
214 | #define LYNX_WWW_DIST "http://lynx.isc.org/current/" |
215 | /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ |
216 | -#define LYNX_DATE "Thu, 12 Oct 2006 16:00:01 -0700" |
217 | +#define LYNX_DATE "Mon, 06 Nov 2006 17:27:15 -0800" |
218 | #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ |
219 | #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |
220 |