From patchwork Sat Nov 11 10:58:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7339 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4SSCNy72dgz3wvm for ; Sat, 11 Nov 2023 10:58:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4SSCNw6xVxzkM; Sat, 11 Nov 2023 10:58:56 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4SSCNw4NLBz303X; Sat, 11 Nov 2023 10:58:56 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4SSCNv26JMz2x9l for ; Sat, 11 Nov 2023 10:58:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4SSCNt2zBMzMS; Sat, 11 Nov 2023 10:58:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1699700334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=QVS07u0sP69aquHWL9QObHizLTElZ1JrMIiDY1puACc=; b=1jY8btIE2E1tI09OpMp7eryZw7aAV0r1k5Kswh3RxCio+nQKiprEfb32c0DvsVjWhk8R0I mxjPu03vvFg+hQCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1699700334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=QVS07u0sP69aquHWL9QObHizLTElZ1JrMIiDY1puACc=; b=oJ6iaqFM3B2FGVmmytVykclz50nNCzSDcWEDPAg3ntu2v8rgMGy91G93AIx2V8YlN5TUkR 1zfsrCGS6wquBdtWZZlQmx8NLUVeGhJjt/1kVxLyQiAinwdWstoQAjo7gIKkABCbS9+Lw8 mBlT1N0XQ3wUnJSmM4zlDPs8J9UMXSbK+zZ2Iu+1W8aus3qOpmtb9RTwm4BOCJAtaQbgJh 6x0+zaaispskWbEGXo7R2gWuq/+xM2BewcDLvl8+A3Xu+upjfNICp6w8UVCs1ROMdaPCE/ qrB1KHl+Hh28W3tBnJBEvHHtgMLhfsFRA03AbRXFzxKWzzulX/ulc3kdj6BSwA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] lua: Update to version 5.4.6 Date: Sat, 11 Nov 2023 11:58:43 +0100 Message-ID: <20231111105850.717840-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: INXO6TFEJ5UEEGBR35C5UJD77DKKU4PZ X-Message-ID-Hash: INXO6TFEJ5UEEGBR35C5UJD77DKKU4PZ X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - 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 ac844ac03..6b69167ef 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 b61936c49..96be2090a 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