From nobody Sat Aug 23 17:44:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c8PZd5dsqz66CXf; Sat, 23 Aug 2025 17:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8PZd4lZPz3ZnD; Sat, 23 Aug 2025 17:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755971081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+1YXsiAJLymTmAAMRRulOSJ/IS7sbvqM2B58F6oO65s=; b=uNk1XNYF44ABkgmSs3dLSYh2PnPLdfXpPgPWytkzf7OjFMHW2IgvfEVvztU82XnKntF4I+ /m4x86arpc0O3uZwRg9Cxm8SwW9tfXQE4iLjvWcSoEy1TVv/cMNf2O9bG51UGh5w+QYfzl +FDhZoFqnKi9qtr5cd6pUNm39rYMwjbEhZE9r4HjXYWx+e/N6a4oriTbDwpkbATJ5Dhlob Hjy7meQirElrmz3yOtlO7IR2FCwd6U3wOiwhQzRI+HyV4cVF/Y13ndn9kgH0aLlZLiwjFG NyS15lslp4vE1wVgGMoSoxB82eGocQocML4AL830IrxJrszAoVbbLfSbe/MdjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755971081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+1YXsiAJLymTmAAMRRulOSJ/IS7sbvqM2B58F6oO65s=; b=G38UHojXel78FvK0WxZfzSBYtdeSY1Sl1fW9EK38Xo1+w1xBBbThHYVPm5GIwKXSseZG+6 LnxSuLbvJHtfoUVPuwp2R4tldqB1UbdiedJ/Z8oGDAjvR/xYAiRiG6PxnH2btv3Rupl22y 18GNN5ad9xZeusjJzUbQkv7f8BwlzaJ/vNJFgQmtOwaA3BLL9u8pov5RFnzhubW0TEFlD1 rzoapaI+yKdYe2Y2k29jAIHnDel3FmXQQEWEOIse1bBWSkPgxz3fIb31aAai7/qfHg1Xzo v8oCnds7hVu6pXeH8zqlyymb8+s9k8gvo5rqD+0LOq/tksob3wkU0hZR8yWgPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755971081; a=rsa-sha256; cv=none; b=xaVr4VrcicKaMS7VLxBX/0i4HOs+DR8PX7ijAj8/DTSbRjS4g2KgeeXrbgbmc0gm63zHQV yoEBVyBdXC390LU/W3BPlfLvzvGvV15F10eMpY8xWTT+suwiOofGSeyNq8crlwJlYeBFZZ 0WanWR3PpAZzD9r6gu/f0m+8nNh6WzXpiWs8XcD52Q3RDj3HgQ3HVJExbMVOVCvU74lkY1 dwwalqsQ9h61oWXDuP3cxnDtpfN3lm6GwyXPw2xU+YGjvKo2tDpGAdoKvpYfssG9z1VcDP CVlFHBiRKMQ9+HXs8plgt5JCXkeiTGeLg7QdIee61KhB69+/0cA7Vi24rkLlXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c8PZd4K6zzBGC; Sat, 23 Aug 2025 17:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57NHif6s082256; Sat, 23 Aug 2025 17:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NHiXEY082212; Sat, 23 Aug 2025 17:44:33 GMT (envelope-from git) Date: Sat, 23 Aug 2025 17:44:33 GMT Message-Id: <202508231744.57NHiXEY082212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3068d706eabe - main - lua: Merge lua 5.4.8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3068d706eabe99f930fb01d3cbfd74ff1f0eb5a2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3068d706eabe99f930fb01d3cbfd74ff1f0eb5a2 commit 3068d706eabe99f930fb01d3cbfd74ff1f0eb5a2 Merge: 6ea7e1f92882 4d63aec3c380 Author: Warner Losh AuthorDate: 2025-08-23 16:58:09 +0000 Commit: Warner Losh CommitDate: 2025-08-23 16:58:09 +0000 lua: Merge lua 5.4.8 Pick up a few bug fixes from lua 5.4.8: 267ef461 Bug: check for constructor overflow in [exp] fields d1ee2a4d Bug: Bad error message with fields of string _ENV 3fe7be95 Bug: message handler can be overwritten 983bc433 Bug: Use after free in 'luaV_finishset' 25da574f Bug: 'luaD_seterrorobj' should not raise errors f5e55be2 Bug: Missing error status in panic function 9f0c0fe0 Bug: Wrong limit for local variables in 16-bit systems 782ef85b Bug: wrong code gen. for indices with comparisons 30982bec Bug: Bad stack manipulation in 'multiline' (REPL) contrib/lua/Makefile | 2 +- contrib/lua/README | 2 +- contrib/lua/doc/contents.html | 14 +-- contrib/lua/doc/lua.1 | 6 +- contrib/lua/doc/lua.css | 1 + contrib/lua/doc/manual.html | 50 +++++---- contrib/lua/doc/readme.html | 48 ++++----- contrib/lua/src/lapi.c | 6 +- contrib/lua/src/lauxlib.c | 28 +++-- contrib/lua/src/lcode.c | 38 +++---- contrib/lua/src/lcode.h | 3 - contrib/lua/src/ldebug.c | 231 +++++++++++++++++++++++++----------------- contrib/lua/src/ldebug.h | 1 + contrib/lua/src/ldo.c | 27 +++-- contrib/lua/src/ldo.h | 2 +- contrib/lua/src/lgc.c | 20 ++-- contrib/lua/src/liolib.c | 27 +++-- contrib/lua/src/lmathlib.c | 31 ++++-- contrib/lua/src/loadlib.c | 9 -- contrib/lua/src/lobject.c | 2 +- contrib/lua/src/lobject.h | 18 ++-- contrib/lua/src/lopcodes.h | 8 +- contrib/lua/src/loslib.c | 2 + contrib/lua/src/lparser.c | 19 ++-- contrib/lua/src/lstate.c | 11 +- contrib/lua/src/lstate.h | 3 +- contrib/lua/src/lstring.c | 13 +-- contrib/lua/src/ltable.c | 39 ++++--- contrib/lua/src/ltable.h | 2 - contrib/lua/src/ltm.h | 5 +- contrib/lua/src/lua.c | 28 +++-- contrib/lua/src/lua.h | 8 +- contrib/lua/src/luaconf.h | 9 ++ contrib/lua/src/lundump.c | 4 +- contrib/lua/src/lundump.h | 3 +- contrib/lua/src/lvm.c | 81 +++++++-------- 36 files changed, 474 insertions(+), 327 deletions(-) diff --cc contrib/lua/Makefile index 8efa2eb3fdd6,000000000000..6e21588476df mode 100644,000000..100644 --- a/contrib/lua/Makefile +++ b/contrib/lua/Makefile @@@ -1,106 -1,0 +1,106 @@@ +# Makefile for installing Lua +# See doc/readme.html for installation and customization instructions. + +# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= + +# Your platform. See PLATS for possible values. +PLAT= guess + +# Where to install. The installation starts in the src and doc directories, +# so take care if INSTALL_TOP is not an absolute path. See the local target. +# You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with +# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. +INSTALL_TOP= /usr/local +INSTALL_BIN= $(INSTALL_TOP)/bin +INSTALL_INC= $(INSTALL_TOP)/include +INSTALL_LIB= $(INSTALL_TOP)/lib +INSTALL_MAN= $(INSTALL_TOP)/man/man1 +INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V +INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + +# How to install. If your install program does not support "-p", then +# you may have to run ranlib on the installed liblua.a. +INSTALL= install -p +INSTALL_EXEC= $(INSTALL) -m 0755 +INSTALL_DATA= $(INSTALL) -m 0644 +# +# If you don't have "install" you can use "cp" instead. +# INSTALL= cp -p +# INSTALL_EXEC= $(INSTALL) +# INSTALL_DATA= $(INSTALL) + +# Other utilities. +MKDIR= mkdir -p +RM= rm -f + +# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + +# Convenience platforms targets. +PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris + +# What to install. +TO_BIN= lua luac +TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +TO_LIB= liblua.a +TO_MAN= lua.1 luac.1 + +# Lua version and release. +V= 5.4 - R= $V.6 ++R= $V.8 + +# Targets start here. +all: $(PLAT) + +$(PLATS) help test clean: + @cd src && $(MAKE) $@ + +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) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + +uninstall: + cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) + cd src && cd $(INSTALL_INC) && $(RM) $(TO_INC) + cd src && cd $(INSTALL_LIB) && $(RM) $(TO_LIB) + cd doc && cd $(INSTALL_MAN) && $(RM) $(TO_MAN) + +local: + $(MAKE) install INSTALL_TOP=../install + +# make may get confused with install/ if it does not support .PHONY. +dummy: + +# Echo config parameters. +echo: + @cd src && $(MAKE) -s echo + @echo "PLAT= $(PLAT)" + @echo "V= $V" + @echo "R= $R" + @echo "TO_BIN= $(TO_BIN)" + @echo "TO_INC= $(TO_INC)" + @echo "TO_LIB= $(TO_LIB)" + @echo "TO_MAN= $(TO_MAN)" + @echo "INSTALL_TOP= $(INSTALL_TOP)" + @echo "INSTALL_BIN= $(INSTALL_BIN)" + @echo "INSTALL_INC= $(INSTALL_INC)" + @echo "INSTALL_LIB= $(INSTALL_LIB)" + @echo "INSTALL_MAN= $(INSTALL_MAN)" + @echo "INSTALL_LMOD= $(INSTALL_LMOD)" + @echo "INSTALL_CMOD= $(INSTALL_CMOD)" + @echo "INSTALL_EXEC= $(INSTALL_EXEC)" + @echo "INSTALL_DATA= $(INSTALL_DATA)" + +# Echo pkg-config data. +pc: + @echo "version=$R" + @echo "prefix=$(INSTALL_TOP)" + @echo "libdir=$(INSTALL_LIB)" + @echo "includedir=$(INSTALL_INC)" + +# Targets that do not create files (not all makes understand .PHONY). +.PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc + +# (end of Makefile)