Re: [PATCH] lua: Update to 5.3.5

Merged :)

On 24 Mar 2019, at 17:34, Matthias Fischer matthias.fischer@ipfire.org wrote:

For details see:

http://www.lua.org/bugs.html

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org

lfs/lua | 11 ++-- .../lua-5.3.5-autotoolize.patch} | 2 +- .../lua/lua-5.3.5-shared_library-1.patch | 61 +++++++++++++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) rename src/patches/{lua-5.3.0-autotoolize.patch => lua/lua-5.3.5-autotoolize.patch} (99%) create mode 100644 src/patches/lua/lua-5.3.5-shared_library-1.patch

diff --git a/lfs/lua b/lfs/lua index 9217e8bac..e70b9cd00 100644 --- a/lfs/lua +++ b/lfs/lua @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 5.3.0 +VER = 5.3.5

THISAPP = lua-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a1b0a7e92d0c85bbff7a8d27bf29f8af +$(DL_FILE)_MD5 = 4f4b4f323fd3514a68e0ab3da8ce3455

install : $(TARGET)

@@ -71,7 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cp -v src/luaconf.h src/luaconf.h.template.in

• cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.3.0-autotoolize.patch

• cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua/lua-5.3.5-autotoolize.patch
• cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua/lua-5.3.5-shared_library-1.patch
• cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/src/patches/lua-5.3.0-autotoolize.patch b/src/patches/lua/lua-5.3.5-autotoolize.patch similarity index 99% rename from src/patches/lua-5.3.0-autotoolize.patch rename to src/patches/lua/lua-5.3.5-autotoolize.patch index 3e4723a57..76747923a 100644 --- a/src/patches/lua-5.3.0-autotoolize.patch +++ b/src/patches/lua/lua-5.3.5-autotoolize.patch @@ -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 @@ +@@ -200,9 +205,9 @@

#else /* }{ */

diff --git a/src/patches/lua/lua-5.3.5-shared_library-1.patch b/src/patches/lua/lua-5.3.5-shared_library-1.patch new file mode 100644 index 000000000..857fddc6c --- /dev/null +++ b/src/patches/lua/lua-5.3.5-shared_library-1.patch @@ -0,0 +1,61 @@ +Submitted By: Igor Živković contact@igor-zivkovic.from.hr +Date: 2013-06-19 +Initial Package Version: 5.2.2 +Upstream Status: Rejected +Origin: Arch Linux packages repository +Description: Adds the compilation of a shared library.

+diff -Naur lua-5.3.0.orig/Makefile lua-5.3.0/Makefile +--- lua-5.3.0.orig/Makefile 2014-10-30 00:14:41.000000000 +0100 ++++ lua-5.3.0/Makefile 2015-01-19 22:14:09.822290828 +0100 +@@ -52,7 +52,7 @@

• all: $(PLAT)
• $(PLATS) clean:

+- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R)

• test: dummy
• src/lua -v

+diff -Naur lua-5.3.0.orig/src/Makefile lua-5.3.0/src/Makefile +--- lua-5.3.0.orig/src/Makefile 2015-01-05 17:04:52.000000000 +0100 ++++ lua-5.3.0/src/Makefile 2015-01-19 22:14:52.559378543 +0100 +@@ -7,7 +7,7 @@

• PLAT= none
• CC= gcc -std=gnu99

+-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)

• LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
• LIBS= -lm $(SYSLIBS) $(MYLIBS)

+@@ -29,6 +29,7 @@

• PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
• LUA_A= liblua.a

++LUA_SO= liblua.so

• 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

+@@ -43,7 +44,7 @@

• LUAC_O= luac.o
• ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)

+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)

• ALL_A= $(LUA_A)
• # Targets start here.

+@@ -59,6 +60,12 @@

• $(AR) $@ $(BASE_O)
• $(RANLIB) $@

++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++

• $(LUA_T): $(LUA_O) $(LUA_A)
• $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)

-- 2.18.0