From ed1c441faaf2fe6fa3ffceb0eb1f443c20f8b8cb Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Sat, 11 Nov 2023 11:58:43 +0100 Subject: [PATCH] lua: Update to version 5.4.6 - Update from version 5.4.4 to 5.4.6 - Update of rootfile - Updated version number in shared library patch - Changelog 5.4.6 read overflow in 'l_strcmp'. Reported by Xmilia Hermit on 09 Jun 2023. existed since 5.0 (at least). fixed in github. Call hook may be called twice when count hook yields. Reported by G.k Ray on 20 Jul 2023. existed since 5.4.0 (at least). fixed in github. Wrong line number for function calls. Reported by Thadeu de Paula on 20 Aug 2023. existed since 5.2. fixed in github. 5.4.5 Changing the signature of 'lua_resetthread' broke ABI. Reported by Andrew Gierth on 29 Apr 2023. fixed in 5.4.6. fixed in github Signed-off-by: Adolf Belka --- config/rootfiles/common/lua | 2 +- lfs/lua | 10 +++++----- ...ibrary-1.patch => lua-5.4.6-shared_library-1.patch} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename src/patches/{lua-5.4.3-shared_library-1.patch => lua-5.4.6-shared_library-1.patch} (100%) diff --git a/config/rootfiles/common/lua b/config/rootfiles/common/lua index ac844ac033..6b69167efd 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.4 +usr/lib/liblua.so.5.4.6 #usr/lib/lua #usr/lib/lua/5.4 #usr/lib/pkgconfig/lua.pc diff --git a/lfs/lua b/lfs/lua index b61936c499..96be2090aa 100644 --- a/lfs/lua +++ b/lfs/lua @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # 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.4 +VER = 5.4.6 THISAPP = lua-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8747ef5c83bd4c54b73eeaad6991ab5fccc54ee000973afd9cf3367b8945f03c54e843ec88c48043003cd9d3b42281c593cb485b7165add2744cfea06d8b7668 +$(DL_FILE)_BLAKE2 = b5d8dbc4b3ec1708b715be438c1a1f48d4f5f226885992af147c1aa6a8823bed318f77ef7cc92b265dadd26cf6088f0f39784fbfd2f9887c35de8e9def2c0558 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.3-shared_library-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.4.6-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.4" \ + TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.6" \ install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/lua-5.4.3-shared_library-1.patch b/src/patches/lua-5.4.6-shared_library-1.patch similarity index 100% rename from src/patches/lua-5.4.3-shared_library-1.patch rename to src/patches/lua-5.4.6-shared_library-1.patch -- 2.39.5