Djam/lua
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/lua.git synced 2025-02-23 13:52:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 5.3.4

Browse source
This commit is contained in:
Alzim 2017-04-21 14:14:50 +03:00
parent 8c8c068c3a
commit 9af4767810
4 changed files with 3 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources: sources:
lua-5.3.3.tar.gz: a0341bc3d1415b814cc738b2ec01ae56045d64ef lua-5.3.4.tar.gz: 79790cfd40e09ba796b01a571d4d63b52b1cd950

25
lua-5.3.3-upstream-bug-1.patch
View file

@ -1,25 +0,0 @@
diff -up lua-5.3.3/src/lparser.c.crashfix lua-5.3.3/src/lparser.c
--- lua-5.3.3/src/lparser.c.crashfix 2016-07-25 16:00:14.206121141 -0400
+++ lua-5.3.3/src/lparser.c 2016-07-25 16:00:51.910865872 -0400
@@ -323,6 +323,8 @@ static void adjust_assign (LexState *ls,
luaK_nil(fs, reg, extra);
}
}
+ if (nexps > nvars)
+ ls->fs->freereg -= nexps - nvars; /* remove extra values */
}
@@ -1160,11 +1162,8 @@ static void assignment (LexState *ls, st
int nexps;
checknext(ls, '=');
nexps = explist(ls, &e);
- if (nexps != nvars) {
+ if (nexps != nvars)
adjust_assign(ls, nvars, nexps, &e);
- if (nexps > nvars)
- ls->fs->freereg -= nexps - nvars; /* remove extra values */
- }
else {
luaK_setoneret(ls->fs, &e); /* close last expression */
luaK_storevar(ls->fs, &lh->v, &e);

13
lua-5.3.3-upstream-bug-2.patch
View file

@ -1,13 +0,0 @@
diff -up lua-5.3.3/src/loslib.c.readpast lua-5.3.3/src/loslib.c
--- lua-5.3.3/src/loslib.c.readpast 2016-07-25 16:04:13.916465061 -0400
+++ lua-5.3.3/src/loslib.c 2016-07-25 16:04:19.756423878 -0400
@@ -260,7 +260,8 @@ static int getfield (lua_State *L, const
static const char *checkoption (lua_State *L, const char *conv, char *buff) {
const char *option;
int oplen = 1;
- for (option = LUA_STRFTIMEOPTIONS; *option != '\0'; option += oplen) {
+ int convlen = (int)strlen(conv);
+ for (option = LUA_STRFTIMEOPTIONS; *option != '\0' && oplen <= convlen; option += oplen) {
if (*option == '|') /* next block? */
oplen++; /* next length */
else if (memcmp(conv, option, oplen) == 0) { /* match? */

7
lua.spec
View file

@ -6,8 +6,8 @@
Summary: Powerful, light-weight programming language Summary: Powerful, light-weight programming language
Name: lua Name: lua
Version: 5.3.3 Version: 5.3.4
Release: 3 Release: 1
License: MIT License: MIT
Group: Development/Other Group: Development/Other
Url: http://www.lua.org/ Url: http://www.lua.org/
@ -16,8 +16,6 @@ Source1: lua.pc
Patch0: lua-5.3.3-dynlib.patch Patch0: lua-5.3.3-dynlib.patch
Patch1: lua-5.3.3-modules_path.patch Patch1: lua-5.3.3-modules_path.patch
Patch2: lua53-compat-old-versions.patch Patch2: lua53-compat-old-versions.patch
Patch3: lua-5.3.3-upstream-bug-1.patch
Patch4: lua-5.3.3-upstream-bug-2.patch
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(ncurses)
Provides: lua%{major} = %{EVRD} Provides: lua%{major} = %{EVRD}
@ -133,4 +131,3 @@ install -m 644 etc/lua.pc %{buildroot}%{_libdir}/pkgconfig/
# for update-alternatives # for update-alternatives
mv %{buildroot}%{_bindir}/lua %{buildroot}%{_bindir}/lua%{major} mv %{buildroot}%{_bindir}/lua %{buildroot}%{_bindir}/lua%{major}
mv %{buildroot}%{_bindir}/luac %{buildroot}%{_bindir}/luac%{major} mv %{buildroot}%{_bindir}/luac %{buildroot}%{_bindir}/luac%{major}