Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lua54 for openSUSE:Factory checked in at 2023-06-01 17:18:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua54 (Old) and /work/SRC/openSUSE:Factory/.lua54.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lua54" Thu Jun 1 17:18:41 2023 rev:25 rq:1089611 version:5.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/lua54/lua54.changes 2023-04-06 15:55:17.620076197 +0200 +++ /work/SRC/openSUSE:Factory/.lua54.new.2531/lua54.changes 2023-06-01 17:18:45.001886387 +0200 @@ -1,0 +2,37 @@ +Mon May 29 16:23:16 UTC 2023 - Callum Farmer <gmbr3@opensuse.org> + +- Library is always liblua5_4-5: due to SOVERSION leading digit + being 5 + +------------------------------------------------------------------- +Mon May 22 09:39:52 UTC 2023 - Matej Cepl <mcepl@suse.com> + +- Final release of 5.4.6. No change in the changelog. + +------------------------------------------------------------------- +Tue May 9 12:43:31 UTC 2023 - Matej Cepl <mcepl@suse.com> + +- Experimenting with lua 5.4.6-rc1 (release 5.4.5 has been + effectively withdrawn). + +------------------------------------------------------------------- +Sun Apr 30 12:22:03 UTC 2023 - Matej Cepl <mcepl@suse.com> + +- Update to 5.4.5: + - this is a bug-fix release. + - Lua 5.4.5 also contains several internal improvements and + includes a revised reference manual +- Remove upstreamed patches: + - luabugs1.patch + - luabugs10.patch + - luabugs11.patch + - luabugs2.patch + - luabugs3.patch + - luabugs4.patch + - luabugs5.patch + - luabugs6.patch + - luabugs7.patch + - luabugs8.patch + - luabugs9.patch + +------------------------------------------------------------------- Old: ---- lua-5.4.4-tests.tar.gz lua-5.4.4.tar.gz luabugs1.patch luabugs10.patch luabugs11.patch luabugs2.patch luabugs3.patch luabugs4.patch luabugs5.patch luabugs6.patch luabugs7.patch luabugs8.patch luabugs9.patch New: ---- lua-5.4.6-tests.tar.gz lua-5.4.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua54.spec ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:45.773890963 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:45.781891011 +0200 @@ -1,5 +1,5 @@ # -# spec file for package lua54 +# spec file # # Copyright (c) 2023 SUSE LLC # @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define name_ext -test @@ -24,16 +25,15 @@ %endif %define major_version 5.4 %define libname liblua5_4-5 - Name: lua54%{name_ext} -Version: 5.4.4 +Version: 5.4.6 Release: 0 Summary: Small Embeddable Language with Procedural Syntax License: GPL-3.0-or-later Group: Development/Languages/Other URL: https://www.lua.org -Source: http://www.lua.org/ftp/lua-%{version}.tar.gz -Source1: http://www.lua.org/tests/lua-%{version}-tests.tar.gz +Source: https://www.lua.org/ftp/lua-%{version}.tar.gz +Source1: https://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 @@ -43,19 +43,11 @@ Patch2: files_test.patch Patch3: main_test.patch Patch6: shared_link.patch -# PATCH-FIX-UPSTREAM luabugsX.patch https://www.lua.org/bugs.html#5.4.4-X -Patch7: luabugs1.patch -Patch8: luabugs2.patch -Patch9: luabugs3.patch -Patch10: luabugs4.patch -Patch11: luabugs5.patch -Patch12: luabugs6.patch -Patch13: luabugs7.patch -Patch14: luabugs8.patch -Patch15: luabugs9.patch -Patch16: luabugs10.patch -Patch17: luabugs11.patch -# +Requires(post): update-alternatives +Requires(postun):update-alternatives +Provides: lua = %{version} +Obsoletes: lua < %{version} +Provides: Lua(API) = %{major_version} %if "%{flavor}" == "test" BuildRequires: lua54 %else @@ -64,11 +56,6 @@ BuildRequires: pkgconfig BuildRequires: readline-devel %endif -Requires(post): update-alternatives -Requires(postun): update-alternatives -Provides: lua = %{version} -Obsoletes: lua < %{version} -Provides: Lua(API) = %{major_version} %description Lua is a programming language originally designed for extending @@ -90,7 +77,7 @@ Requires: %{name} = %{version} Requires: lua-macros Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Provides: lua-devel = %{version} Provides: Lua(devel) = %{major_version} Provides: pkgconfig(lua) = %{version} @@ -107,16 +94,16 @@ Summary: The Lua integration library License: MIT Group: System/Libraries +Provides: liblua5_4 = %{version}-%{release} +Obsoletes: liblua5_4 < %{version}-%{release} +Provides: %{name}-libs = %{version} +Obsoletes: %{name}-libs < %{version} # Compat as libtool changes the soname %ifarch aarch64 x86_64 ppc64 ppc64le s390x riscv64 Provides: liblua.so.5.4()(64bit) %else Provides: liblua.so.5.4 %endif -Provides: liblua5_4 = %{version}-%{release} -Obsoletes: liblua5_4 < %{version}-%{release} -Provides: %{name}-libs = %{version} -Obsoletes: %{name}-libs < %{version} %description -n %{libname} Lua is a programming language originally designed for extending @@ -163,8 +150,8 @@ %build sed -i -e "s@lib/lua/@%{_lib}/lua/@g" src/luaconf.h -make linux-readline %{_smp_mflags} VERBOSE=1 -C src \ - CC="cc" \ +%make_build linux-readline -C src \ + CC="cc" LIBDIR="%{_libdir}" \ MYCFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE -fPIC -DLUA_COMPAT_MODULE" \ V=%{major_version} \ LIBTOOL="libtool --quiet" @@ -173,7 +160,8 @@ %make_install \ LIBTOOL="libtool --quiet" \ INSTALL_TOP="%{buildroot}%{_prefix}" \ - INSTALL_LIB="%{buildroot}%{_libdir}" + INSTALL_LIB="%{buildroot}%{_libdir}" \ + INSTALL_MAN="%{buildroot}%{_mandir}/man1" find %{buildroot} -type f -name "*.la" -delete -print @@ -192,6 +180,7 @@ Libs: -llua%{major_version} -lm Cflags: -I\${includedir} EOF + install -D -m 644 lua%{major_version}.pc %{buildroot}%{_libdir}/pkgconfig/lua%{major_version}.pc # update-alternatives @@ -213,6 +202,7 @@ touch %{buildroot}%{_sysconfdir}/alternatives/lua.pc ln -sf %{_sysconfdir}/alternatives/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc %else + %check cd testes LD_LIBRARY_PATH=%{_libdir} %{_bindir}/lua%{major_version} all.lua @@ -286,4 +276,5 @@ %doc doc/* %endif + %changelog ++++++ attrib_test.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:45.821891248 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:45.825891272 +0200 @@ -1,3 +1,7 @@ +--- + testes/attrib.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- a/testes/attrib.lua +++ b/testes/attrib.lua @@ -269,7 +269,7 @@ local p = "" -- On Mac OS X, redefine ++++++ files_test.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:45.849891414 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:45.853891438 +0200 @@ -1,7 +1,9 @@ -Index: lua/files.lua -=================================================================== ---- lua.orig/testes/files.lua -+++ lua/testes/files.lua +--- + testes/files.lua | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +--- a/testes/files.lua ++++ b/testes/files.lua @@ -81,7 +81,7 @@ assert(io.output() ~= io.stdout) if not _port then -- invalid seek @@ -11,7 +13,7 @@ end assert(io.output():seek() == 0) -@@ -744,7 +744,7 @@ if not _port then +@@ -746,7 +746,7 @@ if not _port then {"exit 129", "exit", 129}, {"kill -s HUP $$", "signal", 1}, {"kill -s KILL $$", "signal", 9}, @@ -20,7 +22,7 @@ {progname .. ' -e " "', "ok"}, {progname .. ' -e "os.exit(0, true)"', "ok"}, {progname .. ' -e "os.exit(20, true)"', "exit", 20}, -@@ -757,6 +757,9 @@ if not _port then +@@ -759,6 +759,9 @@ if not _port then if v[2] == "ok" then assert(x and y == 'exit' and z == 0) else @@ -30,7 +32,7 @@ assert(not x and y == v[2]) -- correct status and 'what' -- correct code if known (but always different from 0) assert((v[3] == nil and z > 0) or v[3] == z) -@@ -791,6 +791,7 @@ assert(os.date(string.rep("%d", 1000), t +@@ -793,6 +796,7 @@ assert(os.date(string.rep("%d", 1000), t assert(os.date(string.rep("%", 200)) == string.rep("%", 100)) local function checkDateTable (t) @@ -38,7 +40,7 @@ _G.D = os.date("*t", t) assert(os.time(D) == t) load(os.date([[assert(D.year==%Y and D.month==%m and D.day==%d and -@@ -806,7 +806,9 @@ if not _port then +@@ -808,7 +812,9 @@ if not _port then checkDateTable(1) checkDateTable(1000) checkDateTable(0x7fffffff) ++++++ lua-5.4.4-tests.tar.gz -> lua-5.4.6-tests.tar.gz ++++++ ++++ 2686 lines of diff (skipped) ++++++ lua-5.4.4-tests.tar.gz -> lua-5.4.6.tar.gz ++++++ ++++ 62781 lines of diff (skipped) ++++++ lua-build-system.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:46.161893263 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:46.177893358 +0200 @@ -2,9 +2,15 @@ Date: Wed, 06 May 2020 10:31:53 +0300 Subject: build system +--- + Makefile | 22 +++++++++++----------- + src/Makefile | 43 +++++++++++++++++++++++++------------------ + src/luaconf.h | 2 +- + 3 files changed, 37 insertions(+), 30 deletions(-) + --- a/Makefile +++ b/Makefile -@@ -10,19 +12,19 @@ +@@ -10,18 +10,18 @@ PLAT= guess # so take care if INSTALL_TOP is not an absolute path. See the local target. # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. @@ -20,7 +26,7 @@ INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V -INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V +INSTALL_CMOD= $(INSTALL_LIB)/lua/$V - + # How to install. If your install program does not support "-p", then # you may have to run ranlib on the installed liblua.a. INSTALL= install -p @@ -29,10 +35,9 @@ INSTALL_DATA= $(INSTALL) -m 0644 # # If you don't have "install" you can use "cp" instead. - # INSTALL= cp -p -@@ -39,10 +42,10 @@ - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris - +@@ -39,10 +39,10 @@ RM= rm -f + PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris + # What to install. -TO_BIN= lua luac +TO_BIN= lua$(V) luac$(V) @@ -41,16 +46,16 @@ -TO_MAN= lua.1 luac.1 +TO_LIB= liblua$(V).la +TO_MAN= lua$(V).1 luac$(V).1 - + # Lua version and release. V= 5.4 -@@ -52,13 +55,13 @@ +@@ -52,13 +52,13 @@ R= $V.6 all: $(PLAT) - + $(PLATS) help test clean: - @cd src && $(MAKE) $@ + @cd src && $(MAKE) $@ V=$(V) - + install: dummy cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) + cd src && $(INSTALL_EXEC) $(TO_LIB) $(INSTALL_LIB) @@ -58,31 +63,34 @@ cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) - + uninstall: - --- a/src/Makefile +++ b/src/Makefile @@ -7,7 +7,7 @@ PLAT= guess - + CC= gcc -std=gnu99 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) +CFLAGS= -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) LIBS= -lm $(SYSLIBS) $(MYLIBS) - -@@ -22,25 +22,40 @@ - + +@@ -19,28 +19,44 @@ UNAME= uname + SYSCFLAGS= + SYSLDFLAGS= + SYSLIBS= ++LIBDIR=/usr/lib + MYCFLAGS= MYLDFLAGS= -MYLIBS= +MYLIBS=-ldl MYOBJS= - + # Special flags for compiler modules; -Os reduces code size. CMCFLAGS= - + +%.o : %.c + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -c $< -o $@ + @@ -99,49 +107,49 @@ + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -Os -c $< -o $@ + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris - + + PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris + -LUA_A= liblua.a +LUA_A= liblua$(V).la CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) - + -LUA_T= lua +LUA_T= lua$(V) LUA_O= lua.o - + -LUAC_T= luac +LUAC_T= luac$(V) LUAC_O= luac.o - + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) -@@ -57,17 +72,16 @@ +@@ -57,17 +73,16 @@ o: $(ALL_O) a: $(ALL_A) - + $(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -lm -ldl $(BASE_O:.o=.lo) -shared -rpath /usr/lib -version-info 9:0:4 -o $(LUA_A) - ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -lm -ldl $(BASE_O:.o=.lo) -shared -rpath $(LIBDIR) -version-info 9:0:4 -o $(LUA_A) + $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(LIBS) $(LUA_A) -Wl,-E lua.lo -o $@ - + $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(LUA_A) luac.lo -o $@ - + test: - ./$(LUA_T) -v + $(LIBTOOL) --mode=execute -dlopen ./$(LUA_A) ./$(LUA_T) -v - + clean: - $(RM) $(ALL_T) $(ALL_O) -@@ -144,14 +159,6 @@ + $(RM) $(ALL_T) $(ALL_O) +@@ -147,14 +162,6 @@ SunOS solaris: .PHONY: all $(PLATS) help test clean default o a depend echo - + # Compiler modules may use special flags. -llex.o: - $(CC) $(CFLAGS) $(CMCFLAGS) -c llex.c @@ -151,19 +159,18 @@ - -lcode.o: - $(CC) $(CFLAGS) $(CMCFLAGS) -c lcode.c - + # DO NOT DELETE - - + --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -217,7 +217,7 @@ - +@@ -223,7 +223,7 @@ + #else /* }{ */ - + -#define LUA_ROOT "/usr/local/" +#define LUA_ROOT "/usr/" #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" - + ++++++ main_test.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:46.209893548 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:46.213893571 +0200 @@ -1,6 +1,10 @@ +--- + testes/main.lua | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + --- a/testes/main.lua +++ b/testes/main.lua -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ local function checkprogout (s) assert(string.sub(s, -1) == "\n") local t = getoutput() for line in string.gmatch(s, ".-\n") do @@ -8,8 +12,8 @@ + -- assert(string.find(t, line, 1, true)) end end - -@@ -307,11 +307,11 @@ + +@@ -367,11 +367,11 @@ a = 2 ]] RUN([[lua -e "%s" -i < %s > %s]], prompt, prog, out) local t = getoutput() @@ -23,7 +27,7 @@ +-- 2a = 2 +-- 3 +-- ]], 1, true)) - - + + -- test for error objects ++++++ shared_link.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:46.229893666 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:46.233893690 +0200 @@ -1,28 +1,23 @@ +--- + src/ldebug.h | 2 +- + src/lmem.h | 2 +- + src/lundump.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + --- a/src/ldebug.h +++ b/src/ldebug.h @@ -36,7 +36,7 @@ #endif - - + + -LUAI_FUNC int luaG_getfuncline (const Proto *f, int pc); +LUA_API int luaG_getfuncline (const Proto *f, int pc); LUAI_FUNC const char *luaG_findlocal (lua_State *L, CallInfo *ci, int n, StkId *pos); LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o, ---- a/src/lundump.h -+++ b/src/lundump.h -@@ -30,7 +30,7 @@ - LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name); - - /* dump one chunk; from ldump.c */ --LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, -+LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, - void* data, int strip); - - #endif --- a/src/lmem.h +++ b/src/lmem.h -@@ -81,7 +81,7 @@ +@@ -81,7 +81,7 @@ LUAI_FUNC void *luaM_realloc_ (lua_State size_t size); LUAI_FUNC void *luaM_saferealloc_ (lua_State *L, void *block, size_t oldsize, size_t size); @@ -31,4 +26,15 @@ LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int nelems, int *size, int size_elem, int limit, const char *what); +--- a/src/lundump.h ++++ b/src/lundump.h +@@ -30,7 +30,7 @@ + LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name); + + /* dump one chunk; from ldump.c */ +-LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, ++LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, + void* data, int strip); + + #endif