packages/lua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update version to 5.4.3

Browse Source
This commit is contained in:
weiwei_tiantian 2021-12-29 16:39:04 +08:00
parent 1ee619a017
commit 962ab58fe5
7 changed files with 36 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lua-5.3.4-tests.tar.gz
View File

Binary file not shown.

BIN
lua-5.3.5.tar.gz
View File

Binary file not shown.

54
lua-5.3.0-autotoolize.patch → lua-5.4.0-beta-autotoolize.patch
View File

@ -1,10 +1,10 @@
diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac diff -up lua-5.4.0-beta/configure.ac.autoxxx lua-5.4.0-beta/configure.ac
--- lua-5.3.0/configure.ac.autoxxx 2015-01-15 10:20:03.826889574 -0500 --- lua-5.4.0-beta/configure.ac.autoxxx 2019-10-23 15:03:13.296916443 -0400
+++ lua-5.3.0/configure.ac 2015-01-15 10:20:03.826889574 -0500 +++ lua-5.4.0-beta/configure.ac 2019-10-23 15:03:13.296916443 -0400
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+AC_PREREQ(2.59) +AC_PREREQ(2.59)
+AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org]) +AC_INIT([lua], [5.4.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
+AC_SUBST([MAJOR_VERSION], [5.3]) +AC_SUBST([MAJOR_VERSION], [5.4])
+ +
+AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([src/lapi.c]) +AC_CONFIG_SRCDIR([src/lapi.c])
@ -71,33 +71,33 @@ diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac
+ doc/Makefile + doc/Makefile
+]) +])
+AC_OUTPUT +AC_OUTPUT
diff -up lua-5.3.0/doc/Makefile.am.autoxxx lua-5.3.0/doc/Makefile.am diff -up lua-5.4.0-beta/doc/Makefile.am.autoxxx lua-5.4.0-beta/doc/Makefile.am
--- lua-5.3.0/doc/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500 --- lua-5.4.0-beta/doc/Makefile.am.autoxxx 2019-10-23 15:03:13.296916443 -0400
+++ lua-5.3.0/doc/Makefile.am 2015-01-15 10:20:03.826889574 -0500 +++ lua-5.4.0-beta/doc/Makefile.am 2019-10-23 15:03:13.296916443 -0400
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+man1_MANS = lua.1 luac.1 +man1_MANS = lua.1 luac.1
+ +
+EXTRA_DIST = \ +EXTRA_DIST = \
+ contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html + contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
diff -up lua-5.3.0/Makefile.am.autoxxx lua-5.3.0/Makefile.am diff -up lua-5.4.0-beta/Makefile.am.autoxxx lua-5.4.0-beta/Makefile.am
--- lua-5.3.0/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500 --- lua-5.4.0-beta/Makefile.am.autoxxx 2019-10-23 15:03:13.296916443 -0400
+++ lua-5.3.0/Makefile.am 2015-01-15 10:20:03.826889574 -0500 +++ lua-5.4.0-beta/Makefile.am 2019-10-23 15:03:13.296916443 -0400
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+SUBDIRS = src doc +SUBDIRS = src doc
+ +
+EXTRA_DIST = README +EXTRA_DIST = README
diff -up lua-5.3.0/src/.gitignore.autoxxx lua-5.3.0/src/.gitignore diff -up lua-5.4.0-beta/src/.gitignore.autoxxx lua-5.4.0-beta/src/.gitignore
--- lua-5.3.0/src/.gitignore.autoxxx 2015-01-15 10:20:03.826889574 -0500 --- lua-5.4.0-beta/src/.gitignore.autoxxx 2019-10-23 15:03:13.297916423 -0400
+++ lua-5.3.0/src/.gitignore 2015-01-15 10:20:03.826889574 -0500 +++ lua-5.4.0-beta/src/.gitignore 2019-10-23 15:03:13.296916443 -0400
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+lua +lua
+lua.pc +lua.pc
+luac +luac
+luaconf.h +luaconf.h
+luaconf.h.template +luaconf.h.template
diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.template.in diff -up lua-5.4.0-beta/src/luaconf.h.template.in.autoxxx lua-5.4.0-beta/src/luaconf.h.template.in
--- lua-5.3.0/src/luaconf.h.template.in.autoxxx 2015-01-15 10:20:03.828889562 -0500 --- lua-5.4.0-beta/src/luaconf.h.template.in.autoxxx 2019-09-30 19:52:16.000000000 -0400
+++ lua-5.3.0/src/luaconf.h.template.in 2015-01-15 10:22:37.420027778 -0500 +++ lua-5.4.0-beta/src/luaconf.h.template.in 2019-10-23 15:05:45.139817627 -0400
@@ -11,6 +11,11 @@ @@ -11,6 +11,11 @@
#include <limits.h> #include <limits.h>
#include <stddef.h> #include <stddef.h>
@ -110,7 +110,7 @@ diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.tem
/* /*
** =================================================================== ** ===================================================================
@@ -175,9 +180,9 @@ @@ -227,9 +232,9 @@
#else /* }{ */ #else /* }{ */
@ -120,12 +120,12 @@ diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.tem
+#define LUA_ROOT "@prefix@/" +#define LUA_ROOT "@prefix@/"
+#define LUA_LDIR "@pkgdatadir@/lua/" LUA_VDIR "/" +#define LUA_LDIR "@pkgdatadir@/lua/" LUA_VDIR "/"
+#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/" +#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/"
#if !defined(LUA_PATH_DEFAULT)
#define LUA_PATH_DEFAULT \ #define LUA_PATH_DEFAULT \
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ diff -up lua-5.4.0-beta/src/lua.pc.in.autoxxx lua-5.4.0-beta/src/lua.pc.in
LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ --- lua-5.4.0-beta/src/lua.pc.in.autoxxx 2019-10-23 15:03:13.297916423 -0400
diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in +++ lua-5.4.0-beta/src/lua.pc.in 2019-10-23 15:03:13.297916423 -0400
--- lua-5.3.0/src/lua.pc.in.autoxxx 2015-01-15 10:20:03.827889568 -0500
+++ lua-5.3.0/src/lua.pc.in 2015-01-15 10:20:03.827889568 -0500
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+V= @MAJOR_VERSION@ +V= @MAJOR_VERSION@
+R= @VERSION@ +R= @VERSION@
@ -140,9 +140,9 @@ diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in
+Requires: +Requires:
+Libs: -llua @LUA_LIBS@ +Libs: -llua @LUA_LIBS@
+Cflags: -I${includedir} +Cflags: -I${includedir}
diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am diff -up lua-5.4.0-beta/src/Makefile.am.autoxxx lua-5.4.0-beta/src/Makefile.am
--- lua-5.3.0/src/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500 --- lua-5.4.0-beta/src/Makefile.am.autoxxx 2019-10-23 15:03:13.297916423 -0400
+++ lua-5.3.0/src/Makefile.am 2015-01-15 10:20:03.826889574 -0500 +++ lua-5.4.0-beta/src/Makefile.am 2019-10-23 15:03:13.297916423 -0400
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
+AM_CFLAGS = -Wall +AM_CFLAGS = -Wall
+ +
@ -153,7 +153,7 @@ diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am
+lib_LTLIBRARIES = liblua.la +lib_LTLIBRARIES = liblua.la
+liblua_la_LDFLAGS = -release @MAJOR_VERSION@ +liblua_la_LDFLAGS = -release @MAJOR_VERSION@
+liblua_la_SOURCES = \ +liblua_la_SOURCES = \
+ lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \ + lapi.c lauxlib.c lbaselib.c lcode.c lcorolib.c lctype.c ldblib.c \
+ ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \ + ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
+ loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \ + loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
+ ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \ + ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \

BIN
lua-5.4.3-tests.tar.gz Normal file
View File

Binary file not shown.

BIN
lua-5.4.3.tar.gz Normal file
View File

Binary file not shown.

22
lua-CVE-2019-6706.patch
View File

@ -1,22 +0,0 @@
--- a/src/lapi.c 2017-12-06 13:35:12.000000000 -0500
+++ b/src/lapi_1.c 2019-06-24 07:48:06.289000000 -0400
@@ -1286,14 +1286,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);
}

20
lua.spec
View File

@ -1,12 +1,12 @@
%global major_version 5.3 %global major_version 5.4
# test version is still 5.3.4 # test version is still 5.4.3
%global test_version 5.3.4 %global test_version 5.4.3
# Place rpm-macros into proper location. # Place rpm-macros into proper location.
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: lua Name: lua
Version: 5.3.5 Version: 5.4.3
Release: 6 Release: 1
Summary: A powerful, efficient, lightweight, embeddable scripting language Summary: A powerful, efficient, lightweight, embeddable scripting language
License: MIT License: MIT
URL: http://www.lua.org/ URL: http://www.lua.org/
@ -19,14 +19,11 @@ Source2: luaconf.h
Source3: mit.txt Source3: mit.txt
# rpm-macro # rpm-macro
Source1000: macros.lua Source1000: macros.lua
Patch0: lua-5.3.0-autotoolize.patch Patch0: lua-5.4.0-beta-autotoolize.patch
Patch1: lua-5.3.0-idsize.patch Patch1: lua-5.3.0-idsize.patch
Patch2: lua-5.2.2-configure-linux.patch Patch2: lua-5.2.2-configure-linux.patch
Patch3: lua-5.3.0-configure-compat-module.patch Patch3: lua-5.3.0-configure-compat-module.patch
#Patch for cves
Patch6000: lua-CVE-2019-6706.patch
BuildRequires: automake autoconf libtool readline-devel ncurses-devel BuildRequires: automake autoconf libtool readline-devel ncurses-devel
Obsoletes: %{name}-libs < %{version}-%{release} Obsoletes: %{name}-libs < %{version}-%{release}
@ -62,8 +59,6 @@ mv src/luaconf.h src/luaconf.h.template.in
sed -i 's|5.3.0|%{version}|g' configure.ac sed -i 's|5.3.0|%{version}|g' configure.ac
autoreconf -ifv autoreconf -ifv
%patch6000 -p1
%build %build
%configure --with-readline --with-compat-module %configure --with-readline --with-compat-module
%disable_rpath %disable_rpath
@ -133,6 +128,9 @@ LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir}/lua -e"_U=
%{_mandir}/man1/lua*.1* %{_mandir}/man1/lua*.1*
%changelog %changelog
* Wed Dec 29 2021 liudabo <liudabo1@huawei.com> - 5.4.3-1
- update version to 5.4.3
* Sat Aug 8 2020 shenyangyang <shenyangyang4@huawei.com> - 5.3.5-6 * Sat Aug 8 2020 shenyangyang <shenyangyang4@huawei.com> - 5.3.5-6
- delete unneeded provides - delete unneeded provides