From c91a6c2af69f2702cf4c1db946948e9bd6c8ca8c9b4870016dafa40e2bbd52fb Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Sat, 10 Oct 2020 13:13:01 +0000 Subject: [PATCH] Accepting request 840775 from home:gmbr3:Lua - Update to version 5.4.1: * Fixes bugs found in Lua 5.4.0 - Removed upstream-bugs.patch: new release (no bugs found yet) OBS-URL: https://build.opensuse.org/request/show/840775 OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=15 --- attrib_test.patch | 4 +- files_test.patch | 6 +- lua-5.4.0-tests.tar.gz | 3 - lua-5.4.0.tar.gz | 3 - lua-5.4.1-tests.tar.gz | 3 + lua-5.4.1.tar.gz | 3 + lua54.changes | 7 + lua54.spec | 10 +- upstream-bugs.patch | 392 ----------------------------------------- 9 files changed, 23 insertions(+), 408 deletions(-) delete mode 100644 lua-5.4.0-tests.tar.gz delete mode 100644 lua-5.4.0.tar.gz create mode 100644 lua-5.4.1-tests.tar.gz create mode 100644 lua-5.4.1.tar.gz delete mode 100644 upstream-bugs.patch diff --git a/attrib_test.patch b/attrib_test.patch index 71fd6ec..b7997c2 100644 --- a/attrib_test.patch +++ b/attrib_test.patch @@ -1,5 +1,5 @@ ---- a/lua-5.4.0-tests/attrib.lua -+++ b/lua-5.4.0-tests/attrib.lua +--- a/lua-5.4.1-tests/attrib.lua ++++ b/lua-5.4.1-tests/attrib.lua @@ -269,7 +269,7 @@ local p = "" -- On Mac OS X, redefine local st, err, when = package.loadlib(DC"lib1", "*") if not st then diff --git a/files_test.patch b/files_test.patch index 739c58b..980b7ad 100644 --- a/files_test.patch +++ b/files_test.patch @@ -1,7 +1,7 @@ -Index: lua-5.4.0/lua-5.4.0-tests/files.lua +Index: lua-5.4.1/lua-5.4.1-tests/files.lua =================================================================== ---- lua-5.4.0.orig/lua-5.4.0-tests/files.lua -+++ lua-5.4.0/lua-5.4.0-tests/files.lua +--- lua-5.4.1.orig/lua-5.4.1-tests/files.lua ++++ lua-5.4.1/lua-5.4.1-tests/files.lua @@ -81,7 +81,7 @@ assert(io.output() ~= io.stdout) if not _port then -- invalid seek diff --git a/lua-5.4.0-tests.tar.gz b/lua-5.4.0-tests.tar.gz deleted file mode 100644 index 0193474..0000000 --- a/lua-5.4.0-tests.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f611d324ff71578d760b96f3199baaa67a806acbf90568d5d37cc99b0df938b7 -size 126357 diff --git a/lua-5.4.0.tar.gz b/lua-5.4.0.tar.gz deleted file mode 100644 index ea45663..0000000 --- a/lua-5.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eac0836eb7219e421a96b7ee3692b93f0629e4cdb0c788432e3d10ce9ed47e28 -size 349308 diff --git a/lua-5.4.1-tests.tar.gz b/lua-5.4.1-tests.tar.gz new file mode 100644 index 0000000..d09228c --- /dev/null +++ b/lua-5.4.1-tests.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b3792d083ea36396927b223903e364a91cb017ed3cc16f14add380353751161 +size 128646 diff --git a/lua-5.4.1.tar.gz b/lua-5.4.1.tar.gz new file mode 100644 index 0000000..cf5e68e --- /dev/null +++ b/lua-5.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ba786c3705eb9db6567af29c91a01b81f1c0ac3124fdbf6cd94bdd9e53cca7d +size 353965 diff --git a/lua54.changes b/lua54.changes index 7001c4c..dcc4af2 100644 --- a/lua54.changes +++ b/lua54.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Oct 10 13:10:50 UTC 2020 - Callum Farmer + +- Update to version 5.4.1: + * Fixes bugs found in Lua 5.4.0 +- Removed upstream-bugs.patch: new release (no bugs found yet) + ------------------------------------------------------------------- Fri Aug 21 18:24:02 UTC 2020 - Callum Farmer diff --git a/lua54.spec b/lua54.spec index 512a12c..6f96e05 100644 --- a/lua54.spec +++ b/lua54.spec @@ -19,14 +19,14 @@ %define major_version 5.4 %define libname liblua5_4-5 Name: lua54 -Version: 5.4.0 +Version: 5.4.1 Release: 0 Summary: Small Embeddable Language with Procedural Syntax License: MIT Group: Development/Languages/Other URL: http://www.lua.org -Source: http://www.lua.org/ftp/lua-5.4.0.tar.gz -Source1: http://www.lua.org/tests/lua-5.4.0-tests.tar.gz +Source: http://www.lua.org/ftp/lua-%{version}.tar.gz +Source1: http://www.lua.org/tests/lua-%{version}-tests.tar.gz Source99: baselibs.conf # PATCH-FIX-SUSE tweak the buildsystem to produce what is needed for SUSE Patch0: lua-build-system.patch @@ -34,8 +34,8 @@ Patch0: lua-build-system.patch # Fix failing test Patch1: attrib_test.patch Patch2: files_test.patch -# PATCH-FIX-UPSTREAM https://www.lua.org/bugs.html -Patch3: upstream-bugs.patch +# PATCH-FIX-UPSTREAM https://www.lua.org/bugs.html#5.4.1 +#Patch3: upstream-bugs.patch BuildRequires: libtool BuildRequires: lua-macros BuildRequires: pkgconfig diff --git a/upstream-bugs.patch b/upstream-bugs.patch deleted file mode 100644 index 0848357..0000000 --- a/upstream-bugs.patch +++ /dev/null @@ -1,392 +0,0 @@ ---- a/src/lgc.c -+++ b/src/lgc.c -@@ -202,7 +205,8 @@ void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) { - } - else { /* sweep phase */ - lua_assert(issweepphase(g)); -- makewhite(g, o); /* mark main obj. as white to avoid other barriers */ -+ if (g->gckind == KGC_INC) /* incremental mode? */ -+ makewhite(g, o); /* mark 'o' as white to avoid other barriers */ - } - } - -@@ -340,9 +349,11 @@ static int remarkupvals (global_State *g) { - p = &thread->twups; /* keep marked thread with upvalues in the list */ - else { /* thread is not marked or without upvalues */ - UpVal *uv; -+ lua_assert(!isold(thread) || thread->openupval == NULL); - *p = thread->twups; /* remove thread from the list */ - thread->twups = thread; /* mark that it is out of list */ - for (uv = thread->openupval; uv != NULL; uv = uv->u.open.next) { -+ lua_assert(getage(uv) <= getage(thread)); - work++; - if (!iswhite(uv)) /* upvalue already visited? */ - markvalue(g, uv->v); /* mark its value */ -@@ -856,6 +856,8 @@ static void GCTM (lua_State *L) { - if (unlikely(status != LUA_OK)) { /* error while running __gc? */ - luaE_warnerror(L, "__gc metamethod"); - L->top--; /* pops error object */ -+ if (isLua(L->ci)) -+ L->oldpc = L->ci->u.l.savedpc; /* update 'oldpc' */ - } - } - } -@@ -1140,7 +1140,7 @@ static void finishgencycle (lua_State *L, global_State *g) { - static void youngcollection (lua_State *L, global_State *g) { - GCObject **psurvival; /* to point to first non-dead survival object */ - lua_assert(g->gcstate == GCSpropagate); -- markold(g, g->survival, g->reallyold); -+ markold(g, g->allgc, g->reallyold); - markold(g, g->finobj, g->finobjrold); - atomic(L); - -@@ -1143,6 +1157,7 @@ static void youngcollection (lua_State *L, global_State *g) { - atomic(L); - - /* sweep nursery and get a pointer to its last live element */ -+ g->gcstate = GCSswpallgc; - psurvival = sweepgen(L, g, &g->allgc, g->survival); - /* sweep 'survival' and 'old' */ - sweepgen(L, g, psurvival, g->reallyold); -@@ -1166,6 +1181,7 @@ static void youngcollection (lua_State *L, global_State *g) { - - static void atomic2gen (lua_State *L, global_State *g) { - /* sweep all elements making them old */ -+ g->gcstate = GCSswpallgc; - sweep2old(L, &g->allgc); - /* everything alive now is old */ - g->reallyold = g->old = g->survival = g->allgc; ---- a/src/ldo.c -+++ b/src/ldo.c -@@ -327,7 +327,7 @@ static StkId rethook (lua_State *L, CallInfo *ci, StkId firstres, int nres) { - ptrdiff_t oldtop = savestack(L, L->top); /* hook may change top */ - int delta = 0; - if (isLuacode(ci)) { -- Proto *p = clLvalue(s2v(ci->func))->p; -+ Proto *p = ci_func(ci)->p; - if (p->is_vararg) - delta = ci->u.l.nextraargs + p->numparams + 1; - if (L->top < ci->top) -@@ -340,8 +340,8 @@ static StkId rethook (lua_State *L, CallInfo *ci, StkId firstres, int nres) { - luaD_hook(L, LUA_HOOKRET, -1, ftransfer, nres); /* call it */ - ci->func -= delta; - } -- if (isLua(ci->previous)) -- L->oldpc = ci->previous->u.l.savedpc; /* update 'oldpc' */ -+ if (isLua(ci = ci->previous)) -+ L->oldpc = pcRel(ci->u.l.savedpc, ci_func(ci)->p); /* update 'oldpc' */ - return restorestack(L, oldtop); - } - -@@ -466,13 +466,13 @@ void luaD_call (lua_State *L, StkId func, int nresults) { - f = fvalue(s2v(func)); - Cfunc: { - int n; /* number of returns */ -- CallInfo *ci = next_ci(L); -+ CallInfo *ci; - checkstackp(L, LUA_MINSTACK, func); /* ensure minimum stack size */ -+ L->ci = ci = next_ci(L); - ci->nresults = nresults; - ci->callstatus = CIST_C; - ci->top = L->top + LUA_MINSTACK; - ci->func = func; -- L->ci = ci; - lua_assert(ci->top <= L->stack_last); - if (L->hookmask & LUA_MASKCALL) { - int narg = cast_int(L->top - func) - 1; -@@ -486,18 +486,18 @@ void luaD_call (lua_State *L, StkId func, int nresults) { - break; - } - case LUA_VLCL: { /* Lua function */ -- CallInfo *ci = next_ci(L); -+ CallInfo *ci; - Proto *p = clLvalue(s2v(func))->p; - int narg = cast_int(L->top - func) - 1; /* number of real arguments */ - int nfixparams = p->numparams; - int fsize = p->maxstacksize; /* frame size */ - checkstackp(L, fsize, func); -+ L->ci = ci = next_ci(L); - ci->nresults = nresults; - ci->u.l.savedpc = p->code; /* starting point */ - ci->callstatus = 0; - ci->top = func + 1 + fsize; - ci->func = func; -- L->ci = ci; - for (; narg < nfixparams; narg++) - setnilvalue(s2v(L->top++)); /* complete missing arguments */ - lua_assert(ci->top <= L->stack_last); -@@ -515,14 +515,13 @@ void luaD_call (lua_State *L, StkId func, int nresults) { - - /* - ** Similar to 'luaD_call', but does not allow yields during the call. --** If there is a stack overflow, freeing all CI structures will --** force the subsequent call to invoke 'luaE_extendCI', which then --** will raise any errors. - */ - void luaD_callnoyield (lua_State *L, StkId func, int nResults) { - incXCcalls(L); -- if (getCcalls(L) <= CSTACKERR) /* possible stack overflow? */ -- luaE_freeCI(L); -+ if (getCcalls(L) <= CSTACKERR) { /* possible C stack overflow? */ -+ luaE_exitCcall(L); /* to compensate decrement in next call */ -+ luaE_enterCcall(L); /* check properly */ -+ } - luaD_call(L, func, nResults); - decXCcalls(L); - } -@@ -674,7 +674,7 @@ LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs, - if (from == NULL) - L->nCcalls = CSTACKTHREAD; - else /* correct 'nCcalls' for this thread */ -- L->nCcalls = getCcalls(from) + from->nci - L->nci - CSTACKCF; -+ L->nCcalls = getCcalls(from) - L->nci - CSTACKCF; - if (L->nCcalls <= CSTACKERR) - return resume_error(L, "C stack overflow", nargs); - luai_userstateresume(L, nargs); ---- a/src/lundump.c -+++ b/src/lundump.c -@@ -120,7 +120,10 @@ static TString *loadStringN (LoadState *S, Proto *p) { - } - else { /* long string */ - ts = luaS_createlngstrobj(L, size); /* create string */ -+ setsvalue2s(L, L->top, ts); /* anchor it ('loadVector' can GC) */ -+ luaD_inctop(L); - loadVector(S, getstr(ts), size); /* load directly in final place */ -+ L->top--; /* pop string */ - } - luaC_objbarrier(L, p, ts); - return ts; -@@ -205,8 +205,9 @@ static void loadUpvalues (LoadState *S, Proto *f) { - n = loadInt(S); - f->upvalues = luaM_newvectorchecked(S->L, n, Upvaldesc); - f->sizeupvalues = n; -- for (i = 0; i < n; i++) { -+ for (i = 0; i < n; i++) - f->upvalues[i].name = NULL; -+ for (i = 0; i < n; i++) { - f->upvalues[i].instack = loadByte(S); - f->upvalues[i].idx = loadByte(S); - f->upvalues[i].kind = loadByte(S); ---- a/src/liolib.c -+++ b/src/liolib.c -@@ -279,6 +279,8 @@ static int io_popen (lua_State *L) { - const char *filename = luaL_checkstring(L, 1); - const char *mode = luaL_optstring(L, 2, "r"); - LStream *p = newprefile(L); -+ luaL_argcheck(L, ((mode[0] == 'r' || mode[0] == 'w') && mode[1] == '\0'), -+ 2, "invalid mode"); - p->f = l_popen(L, filename, mode); - p->closef = &io_pclose; - return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1; - ---- a/src/ldebug.c -+++ b/src/ldebug.c -@@ -33,10 +33,8 @@ - - #define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_VCCL) - -- --/* Active Lua function (given call info) */ --#define ci_func(ci) (clLvalue(s2v((ci)->func))) -- -+/* inverse of 'pcRel' */ -+#define invpcRel(pc, p) ((p)->code + (pc) + 1) - - static const char *funcnamefromcode (lua_State *L, CallInfo *ci, - const char **name); -@@ -127,20 +125,18 @@ static void settraps (CallInfo *ci) { - /* - ** This function can be called during a signal, under "reasonable" - ** assumptions. --** Fields 'oldpc', 'basehookcount', and 'hookcount' (set by --** 'resethookcount') are for debug only, and it is no problem if they --** get arbitrary values (causes at most one wrong hook call). 'hookmask' --** is an atomic value. We assume that pointers are atomic too (e.g., gcc --** ensures that for all platforms where it runs). Moreover, 'hook' is --** always checked before being called (see 'luaD_hook'). -+** Fields 'basehookcount' and 'hookcount' (set by 'resethookcount') -+** are for debug only, and it is no problem if they get arbitrary -+** values (causes at most one wrong hook call). 'hookmask' is an atomic -+** value. We assume that pointers are atomic too (e.g., gcc ensures that -+** for all platforms where it runs). Moreover, 'hook' is always checked -+** before being called (see 'luaD_hook'). - */ - LUA_API void lua_sethook (lua_State *L, lua_Hook func, int mask, int count) { - if (func == NULL || mask == 0) { /* turn off hooks? */ - mask = 0; - func = NULL; - } -- if (isLua(L->ci)) -- L->oldpc = L->ci->u.l.savedpc; - L->hook = func; - L->basehookcount = count; - resethookcount(L); -@@ -188,8 +188,8 @@ static const char *upvalname (const Proto *p, int uv) { - static const char *findvararg (CallInfo *ci, int n, StkId *pos) { - if (clLvalue(s2v(ci->func))->p->is_vararg) { - int nextra = ci->u.l.nextraargs; -- if (n <= nextra) { -- *pos = ci->func - nextra + (n - 1); -+ if (n >= -nextra) { /* 'n' is negative */ -+ *pos = ci->func - nextra - (n + 1); - return "(vararg)"; /* generic name for any vararg */ - } - } -@@ -202,7 +202,7 @@ const char *luaG_findlocal (lua_State *L, CallInfo *ci, int n, StkId *pos) { - const char *name = NULL; - if (isLua(ci)) { - if (n < 0) /* access to vararg values? */ -- return findvararg(ci, -n, pos); -+ return findvararg(ci, n, pos); - else - name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci)); - } -@@ -783,11 +783,13 @@ l_noret luaG_runerror (lua_State *L, const char *fmt, ...) { - ** previous instruction 'oldpc'. - */ - static int changedline (const Proto *p, int oldpc, int newpc) { -+ if (p->lineinfo == NULL) /* no debug information? */ -+ return 0; - while (oldpc++ < newpc) { - if (p->lineinfo[oldpc] != 0) - return (luaG_getfuncline(p, oldpc - 1) != luaG_getfuncline(p, newpc)); - } -- return 0; /* no line changes in the way */ -+ return 0; /* no line changes between positions */ - } - - -@@ -795,10 +791,24 @@ static int changedline (const Proto *p, int oldpc, int newpc) { - } - - -+/* -+** Traces the execution of a Lua function. Called before the execution -+** of each opcode, when debug is on. 'L->oldpc' stores the last -+** instruction traced, to detect line changes. When entering a new -+** function, 'npci' will be zero and will test as a new line without -+** the need for 'oldpc'; so, 'oldpc' does not need to be initialized -+** before. Some exceptional conditions may return to a function without -+** updating 'oldpc'. In that case, 'oldpc' may be invalid; if so, it is -+** reset to zero. (A wrong but valid 'oldpc' at most causes an extra -+** call to a line hook.) -+*/ - int luaG_traceexec (lua_State *L, const Instruction *pc) { - CallInfo *ci = L->ci; - lu_byte mask = L->hookmask; -+ const Proto *p = ci_func(ci)->p; - int counthook; -+ /* 'L->oldpc' may be invalid; reset it in this case */ -+ int oldpc = (L->oldpc < p->sizecode) ? L->oldpc : 0; - if (!(mask & (LUA_MASKLINE | LUA_MASKCOUNT))) { /* no hooks? */ - ci->u.l.trap = 0; /* don't need to stop again */ - return 0; /* turn off 'trap' */ -@@ -819,15 +829,14 @@ int luaG_traceexec (lua_State *L, const Instruction *pc) { - if (counthook) - luaD_hook(L, LUA_HOOKCOUNT, -1, 0, 0); /* call count hook */ - if (mask & LUA_MASKLINE) { -- const Proto *p = ci_func(ci)->p; - int npci = pcRel(pc, p); - if (npci == 0 || /* call linehook when enter a new function, */ -- pc <= L->oldpc || /* when jump back (loop), or when */ -- changedline(p, pcRel(L->oldpc, p), npci)) { /* enter new line */ -+ pc <= invpcRel(oldpc, p) || /* when jump back (loop), or when */ -+ changedline(p, oldpc, npci)) { /* enter new line */ - int newline = luaG_getfuncline(p, npci); - luaD_hook(L, LUA_HOOKLINE, newline, 0, 0); /* call line hook */ - } -- L->oldpc = pc; /* 'pc' of last call to line hook */ -+ L->oldpc = npci; /* 'pc' of last call to line hook */ - } - if (L->status == LUA_YIELD) { /* did hook yield? */ - if (counthook) ---- a/src/ldebug.h -+++ b/src/ldebug.h -@@ -13,6 +13,11 @@ - - #define pcRel(pc, p) (cast_int((pc) - (p)->code) - 1) - -+ -+/* Active Lua function (given call info) */ -+#define ci_func(ci) (clLvalue(s2v((ci)->func))) -+ -+ - #define resethookcount(L) (L->hookcount = L->basehookcount) - - /* ---- a/src/lstate.c -+++ b/src/lstate.c -@@ -301,6 +301,7 @@ static void preinit_thread (lua_State *L, global_State *g) { - L->openupval = NULL; - L->status = LUA_OK; - L->errfunc = 0; -+ L->oldpc = 0; - } - - ---- a/src/lstate.h -+++ b/src/lstate.h -@@ -286,7 +286,6 @@ struct lua_State { - StkId top; /* first free slot in the stack */ - global_State *l_G; - CallInfo *ci; /* call info for current function */ -- const Instruction *oldpc; /* last pc traced */ - StkId stack_last; /* last free slot in the stack */ - StkId stack; /* stack base */ - UpVal *openupval; /* list of open upvalues in this stack */ -@@ -297,6 +296,7 @@ struct lua_State { - volatile lua_Hook hook; - ptrdiff_t errfunc; /* current error handling function (stack index) */ - l_uint32 nCcalls; /* number of allowed nested C calls - 'nci' */ -+ int oldpc; /* last pc traced */ - int stacksize; - int basehookcount; - int hookcount; ---- a/src/ldo.h -+++ b/src/ldo.h -@@ -44,7 +44,7 @@ - - /* macro to check stack size and GC */ - #define checkstackGC(L,fsize) \ -- luaD_checkstackaux(L, (fsize), (void)0, luaC_checkGC(L)) -+ luaD_checkstackaux(L, (fsize), luaC_checkGC(L), (void)0) - - - /* type of protected functions, to be ran by 'runprotected' */ - ---- a/src/lvm.c -+++ b/src/lvm.c -@@ -1104,7 +1104,7 @@ void luaV_finishOp (lua_State *L) { - - - #define checkGC(L,c) \ -- { luaC_condGC(L, L->top = (c), /* limit of live values */ \ -+ { luaC_condGC(L, (savepc(L), L->top = (c)), \ - updatetrap(ci)); \ - luai_threadyield(L); } - -@@ -1792,11 +1792,10 @@ - vmbreak; - } - vmcase(OP_VARARGPREP) { -- luaT_adjustvarargs(L, GETARG_A(i), ci, cl->p); -- updatetrap(ci); -+ ProtectNT(luaT_adjustvarargs(L, GETARG_A(i), ci, cl->p)); - if (trap) { - luaD_hookcall(L, ci); -- L->oldpc = pc + 1; /* next opcode will be seen as a "new" line */ -+ L->oldpc = 1; /* next opcode will be seen as a "new" line */ - } - updatebase(ci); /* function has new base after adjustment */ - vmbreak; ---- a/src/ltm.c -+++ b/src/ltm.c -@@ -240,7 +240,7 @@ void luaT_adjustvarargs (lua_State *L, int nfixparams, CallInfo *ci, - int actual = cast_int(L->top - ci->func) - 1; /* number of arguments */ - int nextra = actual - nfixparams; /* number of extra arguments */ - ci->u.l.nextraargs = nextra; -- checkstackGC(L, p->maxstacksize + 1); -+ luaD_checkstack(L, p->maxstacksize + 1); - /* copy function to the top of the stack */ - setobjs2s(L, L->top++, ci->func); - /* move fixed parameters to the top of the stack */