diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-devtools/lua/lua')
2 files changed, 59 insertions, 32 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch b/external/meta-openembedded/meta-oe/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch new file mode 100644 index 00000000..e7679008 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch @@ -0,0 +1,59 @@ +From 601ef636fc4dfb2af3e7fda88d8ea1c1d92affe4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 2 Oct 2019 17:54:15 +0200 +Subject: [PATCH] Allow building lua without readline on Linux + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile | 2 +- + src/Makefile | 3 +++ + src/luaconf.h | 5 +++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 119110d..9f6df45 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,7 +36,7 @@ RM= rm -f + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + + # Convenience platforms targets. +-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris ++PLATS= aix bsd c89 freebsd generic linux linux-no-readline macosx mingw posix solaris + + # What to install. + TO_BIN= lua luac +diff --git a/src/Makefile b/src/Makefile +index 64c78f7..5c0428a 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -109,6 +109,9 @@ generic: $(ALL) + linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" + ++linux-no-readline: ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX_NO_READLINE" SYSLIBS="-Wl,-E -ldl" ++ + macosx: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" + +diff --git a/src/luaconf.h b/src/luaconf.h +index 9eeeea6..d71ca25 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -64,6 +64,11 @@ + #define LUA_USE_READLINE /* needs some extra libraries */ + #endif + ++#if defined(LUA_USE_LINUX_NO_READLINE) ++#define LUA_USE_POSIX ++#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ ++#endif ++ + + #if defined(LUA_USE_MACOSX) + #define LUA_USE_POSIX +-- +2.17.1 + diff --git a/external/meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2019-6706.patch b/external/meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2019-6706.patch deleted file mode 100644 index cfe48af5..00000000 --- a/external/meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2019-6706.patch +++ /dev/null @@ -1,32 +0,0 @@ -CVE-2019-6706: use-after-free in lua_upvaluejoin function - -Upstream-Status: Backport -http://lua.2524044.n2.nabble.com/CVE-2019-6706-use-after-free-in-lua-upvaluejoin-function-tc7685575.html -CVE: CVE-2019-6706 -Affects < 5.3.5 -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: lua-5.3.4/src/lapi.c -=================================================================== ---- lua-5.3.4.orig/src/lapi.c -+++ lua-5.3.4/src/lapi.c -@@ -1285,14 +1285,14 @@ LUA_API void *lua_upvalueid (lua_State * - - LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1, - int fidx2, int n2) { -- LClosure *f1; -- UpVal **up1 = getupvalref(L, fidx1, n1, &f1); -+ UpVal **up1 = getupvalref(L, fidx1, n1, NULL); /* the last parameter not needed */ - UpVal **up2 = getupvalref(L, fidx2, n2, NULL); -+ if (*up1 == *up2) return; /* Already joined */ -+ (*up2)->refcount++; -+ if (upisopen(*up2)) (*up2)->u.open.touched = 1; -+ luaC_upvalbarrier(L, *up2); - luaC_upvdeccount(L, *up1); - *up1 = *up2; -- (*up1)->refcount++; -- if (upisopen(*up1)) (*up1)->u.open.touched = 1; -- luaC_upvalbarrier(L, *up1); - } - - |