Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/lua/dist/src adjust the Lua configuration to ou...



details:   https://anonhg.NetBSD.org/src/rev/5152a64da8a3
branches:  trunk
changeset: 758287:5152a64da8a3
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Sun Oct 31 11:19:42 2010 +0000

description:
adjust the Lua configuration to our needs

diffstat:

 external/mit/lua/dist/src/luaconf.h |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 63e9c0f2d7a7 -r 5152a64da8a3 external/mit/lua/dist/src/luaconf.h
--- a/external/mit/lua/dist/src/luaconf.h       Sun Oct 31 11:18:20 2010 +0000
+++ b/external/mit/lua/dist/src/luaconf.h       Sun Oct 31 11:19:42 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: luaconf.h,v 1.1.1.1 2010/10/31 11:16:54 mbalmer Exp $ */
+/*     $NetBSD: luaconf.h,v 1.2 2010/10/31 11:19:42 mbalmer Exp $ */
 
 /*
 ** Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $
@@ -96,14 +96,21 @@
        ".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
 
 #else
-#define LUA_ROOT       "/usr/local/"
+#define LUA_ROOT       "/usr/"
 #define LUA_LDIR       LUA_ROOT "share/lua/5.1/"
 #define LUA_CDIR       LUA_ROOT "lib/lua/5.1/"
+
+/*
+ * The original Lua distribution contain "./?.lua" at the beginning
+ * of LUA_PATH_DEFAULT and "./?.so" at the beginning of LUA_CPATH_DEFAULT.
+ * These path elements have been removed for the NetBSD version of Lua
+ * to avoid potential security problems.
+ */
 #define LUA_PATH_DEFAULT  \
-               "./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
-                           LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
+       LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+       LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
 #define LUA_CPATH_DEFAULT \
-       "./?.so;"  LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
+       LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
 #endif
 
 



Home | Main Index | Thread Index | Old Index