diff --git a/lua-5.3.4-tests.tar.gz b/lua-5.3.4-tests.tar.gz deleted file mode 100644 index ffb79b6c84f740b14f35de9ae07ccc47cf7ea140..0000000000000000000000000000000000000000 Binary files a/lua-5.3.4-tests.tar.gz and /dev/null differ diff --git a/lua-5.3.5.tar.gz b/lua-5.3.5.tar.gz deleted file mode 100644 index 90c0027299091a075ce9cebe48093475fbb95b05..0000000000000000000000000000000000000000 Binary files a/lua-5.3.5.tar.gz and /dev/null differ diff --git a/lua-5.3.0-autotoolize.patch b/lua-5.4.0-beta-autotoolize.patch similarity index 70% rename from lua-5.3.0-autotoolize.patch rename to lua-5.4.0-beta-autotoolize.patch index 3e4723a57b537cb6f9d11291cb8195022f9d97cf..2ff70f8a0a3944d96ba1d77612597c46031fa694 100644 --- a/lua-5.3.0-autotoolize.patch +++ b/lua-5.4.0-beta-autotoolize.patch @@ -1,10 +1,10 @@ -diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac ---- lua-5.3.0/configure.ac.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/configure.ac 2015-01-15 10:20:03.826889574 -0500 +diff -up lua-5.4.0-beta/configure.ac.autoxxx lua-5.4.0-beta/configure.ac +--- lua-5.4.0-beta/configure.ac.autoxxx 2019-10-23 15:03:13.296916443 -0400 ++++ lua-5.4.0-beta/configure.ac 2019-10-23 15:03:13.296916443 -0400 @@ -0,0 +1,69 @@ +AC_PREREQ(2.59) -+AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org]) -+AC_SUBST([MAJOR_VERSION], [5.3]) ++AC_INIT([lua], [5.4.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org]) ++AC_SUBST([MAJOR_VERSION], [5.4]) + +AC_CONFIG_HEADERS([config.h]) +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 +]) +AC_OUTPUT -diff -up lua-5.3.0/doc/Makefile.am.autoxxx lua-5.3.0/doc/Makefile.am ---- lua-5.3.0/doc/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/doc/Makefile.am 2015-01-15 10:20:03.826889574 -0500 +diff -up lua-5.4.0-beta/doc/Makefile.am.autoxxx lua-5.4.0-beta/doc/Makefile.am +--- lua-5.4.0-beta/doc/Makefile.am.autoxxx 2019-10-23 15:03:13.296916443 -0400 ++++ lua-5.4.0-beta/doc/Makefile.am 2019-10-23 15:03:13.296916443 -0400 @@ -0,0 +1,4 @@ +man1_MANS = lua.1 luac.1 + +EXTRA_DIST = \ + 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 ---- lua-5.3.0/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/Makefile.am 2015-01-15 10:20:03.826889574 -0500 +diff -up lua-5.4.0-beta/Makefile.am.autoxxx lua-5.4.0-beta/Makefile.am +--- lua-5.4.0-beta/Makefile.am.autoxxx 2019-10-23 15:03:13.296916443 -0400 ++++ lua-5.4.0-beta/Makefile.am 2019-10-23 15:03:13.296916443 -0400 @@ -0,0 +1,3 @@ +SUBDIRS = src doc + +EXTRA_DIST = README -diff -up lua-5.3.0/src/.gitignore.autoxxx lua-5.3.0/src/.gitignore ---- lua-5.3.0/src/.gitignore.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/src/.gitignore 2015-01-15 10:20:03.826889574 -0500 +diff -up lua-5.4.0-beta/src/.gitignore.autoxxx lua-5.4.0-beta/src/.gitignore +--- lua-5.4.0-beta/src/.gitignore.autoxxx 2019-10-23 15:03:13.297916423 -0400 ++++ lua-5.4.0-beta/src/.gitignore 2019-10-23 15:03:13.296916443 -0400 @@ -0,0 +1,5 @@ +lua +lua.pc +luac +luaconf.h +luaconf.h.template -diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/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.3.0/src/luaconf.h.template.in 2015-01-15 10:22:37.420027778 -0500 +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.4.0-beta/src/luaconf.h.template.in.autoxxx 2019-09-30 19:52:16.000000000 -0400 ++++ lua-5.4.0-beta/src/luaconf.h.template.in 2019-10-23 15:05:45.139817627 -0400 @@ -11,6 +11,11 @@ #include #include @@ -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 /* }{ */ @@ -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_LDIR "@pkgdatadir@/lua/" LUA_VDIR "/" +#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/" + + #if !defined(LUA_PATH_DEFAULT) #define LUA_PATH_DEFAULT \ - LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ - LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ -diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in ---- 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 +diff -up lua-5.4.0-beta/src/lua.pc.in.autoxxx lua-5.4.0-beta/src/lua.pc.in +--- lua-5.4.0-beta/src/lua.pc.in.autoxxx 2019-10-23 15:03:13.297916423 -0400 ++++ lua-5.4.0-beta/src/lua.pc.in 2019-10-23 15:03:13.297916423 -0400 @@ -0,0 +1,13 @@ +V= @MAJOR_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: +Libs: -llua @LUA_LIBS@ +Cflags: -I${includedir} -diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am ---- lua-5.3.0/src/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/src/Makefile.am 2015-01-15 10:20:03.826889574 -0500 +diff -up lua-5.4.0-beta/src/Makefile.am.autoxxx lua-5.4.0-beta/src/Makefile.am +--- lua-5.4.0-beta/src/Makefile.am.autoxxx 2019-10-23 15:03:13.297916423 -0400 ++++ lua-5.4.0-beta/src/Makefile.am 2019-10-23 15:03:13.297916423 -0400 @@ -0,0 +1,46 @@ +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 +liblua_la_LDFLAGS = -release @MAJOR_VERSION@ +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 \ + 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 \ diff --git a/lua-5.4.3-tests.tar.gz b/lua-5.4.3-tests.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d7817dc9a2e963679bf3202b4816f7887c80da32 Binary files /dev/null and b/lua-5.4.3-tests.tar.gz differ diff --git a/lua-5.4.3.tar.gz b/lua-5.4.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1e7b11aa77b2cd92c66b1a185a2e844dc5da7c31 Binary files /dev/null and b/lua-5.4.3.tar.gz differ diff --git a/lua-CVE-2019-6706.patch b/lua-CVE-2019-6706.patch deleted file mode 100644 index cce9c733c702aeff57e6c4460ee417ac881cc5a4..0000000000000000000000000000000000000000 --- a/lua-CVE-2019-6706.patch +++ /dev/null @@ -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); - } - - diff --git a/lua.spec b/lua.spec index e426eee3bd7a5395496c55048a2c290627c2979f..155eff170018e69fafd2a5ecb38fc1fd06e4a68c 100644 --- a/lua.spec +++ b/lua.spec @@ -1,12 +1,12 @@ -%global major_version 5.3 -# test version is still 5.3.4 -%global test_version 5.3.4 +%global major_version 5.4 +# test version is still 5.4.3 +%global test_version 5.4.3 # Place rpm-macros into proper location. %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: lua -Version: 5.3.5 -Release: 6 +Version: 5.4.3 +Release: 1 Summary: A powerful, efficient, lightweight, embeddable scripting language License: MIT URL: http://www.lua.org/ @@ -19,14 +19,11 @@ Source2: luaconf.h Source3: mit.txt # rpm-macro 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 Patch2: lua-5.2.2-configure-linux.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 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 autoreconf -ifv -%patch6000 -p1 - %build %configure --with-readline --with-compat-module %disable_rpath @@ -133,6 +128,9 @@ LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir}/lua -e"_U= %{_mandir}/man1/lua*.1* %changelog +* Wed Dec 29 2021 liudabo - 5.4.3-1 +- update version to 5.4.3 + * Sat Aug 8 2020 shenyangyang - 5.3.5-6 - delete unneeded provides