update lua to v5.4.1

SynoCommunity · Nov 5, 2020 · f45fbfa · f45fbfa
1 parent fdfee16
commit f45fbfa
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 32 deletions.
diff --git a/cross/lua/Makefile b/cross/lua/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = lua
-PKG_VERS = 5.3.6
+PKG_VERS = 5.4.1
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.lua.org/ftp/
@@ -19,7 +19,7 @@ include ../../mk/spksrc.cross-cc.mk
 
 .PHONY: lua_compile
 lua_compile:
-	@$(RUN) $(MAKE) linux \
+	@$(RUN) $(MAKE) linux-readline \
 		CC="$(TC_PATH)$(TC_PREFIX)gcc -fPIC \$$(ALLFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/readline" \
 		CXX="$(TC_PATH)$(TC_PREFIX)g++ \$$(ALLFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/readline" \
 		AR="$(TC_PATH)$(TC_PREFIX)ar rcu \$$(ALLFLAGS)" \

diff --git a/cross/lua/PLIST b/cross/lua/PLIST
@@ -1,6 +1,6 @@
 bin:bin/lua
 bin:bin/luac
 lib:lib/liblua.so
-lnk:lib/liblua.so.5.3
-lnk:lib/liblua.so.5.3.6
+lnk:lib/liblua.so.5.4
+lnk:lib/liblua.so.5.4.1
 
diff --git a/cross/lua/digests b/cross/lua/digests
@@ -1,3 +1,3 @@
-lua-5.3.6.tar.gz SHA1 f27d20d6c81292149bc4308525a9d6733c224fa5
-lua-5.3.6.tar.gz SHA256 fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60
-lua-5.3.6.tar.gz MD5 83f23dbd5230140a3770d5f54076948d
+lua-5.4.1.tar.gz SHA1 88961e7d4fda58ca2c6163938fd48db8880e803d
+lua-5.4.1.tar.gz SHA256 4ba786c3705eb9db6567af29c91a01b81f1c0ac3124fdbf6cd94bdd9e53cca7d
+lua-5.4.1.tar.gz MD5 1d575faef1c907292edd79e7a2784d30
diff --git a/cross/lua/patches/001_Makefile_add_shared_library.patch b/cross/lua/patches/001_Makefile_add_shared_library.patch
@@ -1,7 +1,7 @@
-By default the Lua makefile will only create a static library (liblua.a).
-This patch will modify the makefile so it will create a dynamic library.
---- Makefile	2017-04-26 18:12:27.442079208 +0200
-+++ Makefile	2017-04-26 20:32:34.818881639 +0200
+### By default the Lua makefile will only create a static library (liblua.a).
+### This patch modifies the makefile to create the dynamic library too.
+--- Makefile.orig	2020-09-30 09:41:43.000000000 +0000
++++ Makefile	2020-11-04 19:54:49.508675324 +0000
 @@ -42,6 +42,9 @@
  TO_BIN= lua luac
  TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
@@ -12,16 +12,15 @@ This patch will modify the makefile so it will create a dynamic library.
  TO_MAN= lua.1 luac.1
 
  # Lua version and release.
-@@ -52,7 +55,7 @@
+@@ -52,19 +55,22 @@
  all:	$(PLAT)
 
- $(PLATS) clean:
--	cd src && $(MAKE) $@
+ $(PLATS) help test clean:
+-	@cd src && $(MAKE) $@
 +	cd src && $(MAKE) $@ V=$(V) R=$(R)
 
- test:	dummy
- 	src/lua -v
-@@ -62,12 +65,15 @@
+ install: dummy
+ 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
  	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
  	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
  	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
@@ -37,7 +36,7 @@ This patch will modify the makefile so it will create a dynamic library.
  	cd doc && cd $(INSTALL_MAN) && $(RM) $(TO_MAN)
 
  local:
-@@ -90,6 +96,7 @@
+@@ -82,6 +88,7 @@
  	@echo "TO_BIN= $(TO_BIN)"
  	@echo "TO_INC= $(TO_INC)"
  	@echo "TO_LIB= $(TO_LIB)"

diff --git a/cross/lua/patches/002_src_Makefile_add_shared_library.patch b/cross/lua/patches/002_src_Makefile_add_shared_library.patch
@@ -1,16 +1,16 @@
-By default the Lua makefile will only create a static library (liblua.a).
-This patch will modify the makefile so it will create a dynamic library.
---- src/Makefile	2017-04-26 18:39:24.655503489 +0200
-+++ src/Makefile	2017-04-26 18:40:59.715893871 +0200
-@@ -29,6 +29,7 @@
- PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
+### By default the Lua makefile will only create a static library (liblua.a).
+### This patch modifies the makefile to create the dynamic library too.
+--- src/Makefile.orig	2020-04-15 13:00:29.000000000 +0000
++++ src/Makefile	2020-11-04 20:01:04.381951610 +0000
+@@ -33,6 +33,7 @@
+ PLATS= guess aix bsd c89 freebsd generic linux linux-readline 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 @@
+ 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)
+@@ -44,7 +45,7 @@
  LUAC_O=	luac.o
 
  ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
@@ -19,7 +19,7 @@ This patch will modify the makefile so it will create a dynamic library.
  ALL_A= $(LUA_A)
 
  # Targets start here.
-@@ -59,6 +60,11 @@
+@@ -60,6 +61,11 @@
  	$(AR) $@ $(BASE_O)
  	$(RANLIB) $@
 

diff --git a/spk/lua/Makefile b/spk/lua/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = lua
-SPK_VERS = 5.3.6
+SPK_VERS = 5.4.1
 SPK_REV = 2
 SPK_ICON = src/lua.png
 
@@ -13,7 +13,7 @@ DESCRIPTION = Lua is a powerful, efficient, lightweight, embeddable scripting la
 RELOAD_UI = no
 DISPLAY_NAME = Lua
 STARTABLE = no
-CHANGELOG = "Update to version 5.3.6"
+CHANGELOG = "Update lua to v5.4.1"
 
 HOMEPAGE = https://www.lua.org
 LICENSE = MIT

diff --git a/spk/ntopng/Makefile b/spk/ntopng/Makefile
@@ -12,7 +12,7 @@ UNSUPPORTED_ARCHS = powerpc ppc824x ppc853x ppc854x
 
 MAINTAINER = hgy59
 DESCRIPTION = ntopng is the next generation version of the original ntop, a network traffic probe that monitors network usage. ntopng is based on libpcap and it has been written in a portable way in order to virtually run on every Unix platform, MacOSX and on Windows as well.
-CHANGELOG = "1. Update to version 4.2<br/>2. Update nDPI to version nDPI"
+CHANGELOG = "1. Update to version 4.2<br/>2. Update nDPI to version 3.4"
 RELOAD_UI = yes
 DISPLAY_NAME = ntopng