[PATCH] lua: Update to version 5.4.8

[Adolf Belka <adolf.belka@ipfire.org>]

- Update from version 5.4.7 to 5.4.8
- Update of rootfile
- No obvious changelog is provided. Detailos of commits can be found at
   https://github.com/lua/lua/commits/v5.4.8 back to and including July 5th 2024

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/lua                   |  2 +-
 lfs/lua                                       | 10 +++++-----
 ...patch => lua-5.4.8-shared_library-1.patch} | 19 ++++++++++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)
 rename src/patches/{lua-5.4.7-shared_library-1.patch => lua-5.4.8-shared_library-1.patch} (82%)

diff --git a/config/rootfiles/common/lua b/config/rootfiles/common/lua
index 799148912..dfcfd5c58 100644
--- a/config/rootfiles/common/lua
+++ b/config/rootfiles/common/lua
@@ -7,7 +7,7 @@ usr/bin/luac
 #usr/include/lualib.h
 #usr/lib/liblua.so
 usr/lib/liblua.so.5.4
-usr/lib/liblua.so.5.4.7
+usr/lib/liblua.so.5.4.8
 #usr/lib/lua
 #usr/lib/lua/5.4
 #usr/lib/pkgconfig/lua.pc
diff --git a/lfs/lua b/lfs/lua
index e0cfc43d4..0a5b28b60 100644
--- a/lfs/lua
+++ b/lfs/lua
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2026  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.4.7
+VER        = 5.4.8
 
 THISAPP    = lua-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 151baed5c40ed117a26a4fb8d0b02f247eacacd98c3270c308a19e453eb647f6c3d5a6a5811fac7ec95db9866c2f06847d5c2be97c83b1e14e561ac8f7482d30
+$(DL_FILE)_BLAKE2 = 472431e5dac4f6d0baf5b4a4720d094079cef8089df40200715ba5e2d7db4e486eaa270d1dd5f14c874f89b36871467572a32ebd319c5f7a7eeffcc529cdcee0
 
 install : $(TARGET)
 
@@ -70,7 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.4.7-shared_library-1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.4.8-shared_library-1.patch
 	# install lua pkgconfig file
 	install -v -m 644 ${DIR_SRC}/config/lua/lua.pc \
 			/usr/lib/pkgconfig/lua.pc
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make INSTALL_TOP=/usr                			\
 			      INSTALL_DATA="cp -d"            			\
 			      INSTALL_MAN=/usr/share/man/man1 			\
-			      TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.7"  \
+			      TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.8"  \
 			 install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/patches/lua-5.4.7-shared_library-1.patch b/src/patches/lua-5.4.8-shared_library-1.patch
similarity index 82%
rename from src/patches/lua-5.4.7-shared_library-1.patch
rename to src/patches/lua-5.4.8-shared_library-1.patch
index f1dfad9ca..7e956fbfd 100644
--- a/src/patches/lua-5.4.7-shared_library-1.patch
+++ b/src/patches/lua-5.4.8-shared_library-1.patch
@@ -1,14 +1,20 @@
-Submitted By:            Douglas R. Reno <renodr at linuxfromscratch dot org>
-Date:                    2020-06-30
-Initial Package Version: 5.4.0
+Submitted By:            Xi Ruoyao <xry111 at xry111 dot site>
+Date:                    2022-09-16
+Initial Package Version: 5.4.4
 Upstream Status:         Rejected
 Origin:                  Arch Linux, with some modifications
-Description:             Creates a shared liblua library, as well as
+Description:             2020-06-30 renodr:
+                         Creates a shared liblua library, as well as
                          removes optimization since it causes SIGBUS errors,
                          and sets the search path to /usr from /usr/local.
                          The initial version of this patch was created by
                          Igor Zivkovic, before being rediffed for 5.4.0 by
                          myself with some modifications made.
+                         2022-09-16 xry111:
+                         Remove an extra newline before $(MYLDFLAGS).
+                         MYLDFLAGS is empty by default so it does not break
+                         BLFS build, but it may break a custom build with
+                         tuning or hardening.
 
 diff -Naurp lua-5.4.0.orig/Makefile lua-5.4.0/Makefile
 --- lua-5.4.0.orig/Makefile	2020-04-15 07:55:07.000000000 -0500
@@ -63,13 +69,12 @@ diff -Naurp lua-5.4.0.orig/src/Makefile lua-5.4.0/src/Makefile
  ALL_A= $(LUA_A)
  
  # Targets start here.
-@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O)
+@@ -60,6 +61,11 @@ $(LUA_A): $(BASE_O)
  	$(AR) $@ $(BASE_O)
  	$(RANLIB) $@
  
 +$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -ldl -Wl,--soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm
-+	$(MYLDFLAGS)
++	$(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)
 +
-- 
2.53.0