From nobody Sat Oct 4 14:02:42 2025 X-Original-To: dev-commits-src-main@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 4cf6g66nQ5z68xZ6; Sat, 04 Oct 2025 14:02:42 +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 4cf6g663Dzz3wqw; Sat, 04 Oct 2025 14:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759586562; 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=PEr4arZEny4hIVkpDqYwZyqih18YItf3N0EexBn4LRI=; b=bL+YL0L2IK6kQBceOXubMJKvfRZ1dBYRhmphQ6n6wMYIBQep6ki+PTk2JgjkABF2LIpovc /WvtgbzxfLQYF+nqRtdSleOxFwb4mQ1xSfwxCpK5INBb922EPLBYlhYtqX3iGfP+YQb2Vf XzOIhfTAoolU5KJKYMBsSP3BNfdZd8hIG5yw61PLTnleC3bjlMm3fuEyGQy3D83F4edo9j 1i8+4i9CGq/HFD6zE8xVF3XWneBIWFRQF8xT9MoxcqZy/FKte9CkcU5AbzEpv5f0lBO+eB EJR0y6Fe2U8qzhfKTCYRDBuWYgxETjDDfNTC6XZfe9bfGAGtf5ImbxZq4sjJkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759586562; 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=PEr4arZEny4hIVkpDqYwZyqih18YItf3N0EexBn4LRI=; b=alpU0kouIHNsD1O7xzHI0B21Ady7Lc4q3djoMK3x0H5jIWEEWTapqpggbRg3B2uM+yrmSZ gdbW76+TCaCso5FuQAR9Rw7YepoAb9aUcF74qc/78Hz7+Jl/6/56Do02MzwFt3OowLC0k9 9fQq67yjUq+GQWEC4bQGCUEjLu2YcrAVN4Jc/WDFoYnCCCyQ5JpAUqQ6CZyGrc9cIa94W1 CzXKuADJ9AHLGuEzgvOkgj7JL0JOTrLAsT8Kbcz7iTeJEfRT4NJn/s0FliyfHUAv+NGXc5 PFDH2A2V7+rvUl37zmfwu9r4A3Wg4mPV2vrFrRm5DKRQIlnX5sPpRCWQQF650g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759586562; a=rsa-sha256; cv=none; b=nnPWkBuuYWvl21WdxFQdleBPI5KfBp1WUl7nC+HeIvS4L/s1yUAZYXlaopxmOX/iYZCAnT hqB5NMi+PY6WQqqsjDkpy5qUolUv9VxLmEW9OmD6DPJtV/epmnBRW7M/jQrgDhMih6Rxtu D5xgTojpUjsE2lEo+SxRAyNnDSfegkzTaVoWKldWYwGRSt4Bk74iXmrZBNPeG7YEiC3RIy 8H63eQiPXgJj23RJpK6YfdDVQEQHLokTI9xC0Zh6WSQvW8OsxiyiE+F5KFYy9YwOEurVi6 n1y58jJ7YR8uDF0uW/RMSTPVNajlif/ilCrpQfn+EDREfqxXOqDiAyo+Xl6dUQ== 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 4cf6g65PLgzlHV; Sat, 04 Oct 2025 14:02:42 +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 594E2gdq056610; Sat, 4 Oct 2025 14:02:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 594E2gRs056607; Sat, 4 Oct 2025 14:02:42 GMT (envelope-from git) Date: Sat, 4 Oct 2025 14:02:42 GMT Message-Id: <202510041402.594E2gRs056607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 9c7db0931d48 - main - flua: move lposix back into flua for now List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c7db0931d486ce800aa71d9f41abfad9f7f691f Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9c7db0931d486ce800aa71d9f41abfad9f7f691f commit 9c7db0931d486ce800aa71d9f41abfad9f7f691f Author: Kyle Evans AuthorDate: 2025-10-04 13:57:59 +0000 Commit: Kyle Evans CommitDate: 2025-10-04 13:57:59 +0000 flua: move lposix back into flua for now The real luaposix is structured differently, and our builtin version tends to model that in its own special way. Build it back in until we get the shlib model just right to unbreak nuageinit, among other things. This is a partial revert of the below-referenced commit; the other two modules are simple, though, and were accurately split out. Reported by: markj Fixes: b11a5709ec2b6 ("flua: kick out the remaining builtin modules") --- libexec/flua/Makefile | 2 +- libexec/flua/linit_flua.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index cc750e30525f..23de404710d0 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -16,7 +16,6 @@ FLUA_MODULES+= libjail .endif FLUA_MODULES+= libucl FLUA_MODULES+= liblyaml -FLUA_MODULES+= lposix .ifdef BOOTSTRAPPING # libfreebsd is generally omitted from the bootstrap flua because its @@ -55,6 +54,7 @@ SRCS+= lua.c # FreeBSD Extensions .PATH: ${.CURDIR}/modules SRCS+= linit_flua.c +SRCS+= lposix.c CFLAGS+= -I${SRCTOP}/lib/liblua -I${.CURDIR}/modules -I${LUASRC} CFLAGS+= -DLUA_PROGNAME="\"${PROG}\"" diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c index bb3748daefb4..65356c938671 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -33,6 +33,7 @@ #include "lualib.h" #include "lauxlib.h" +#include "lposix.h" #include "bootstrap.h" @@ -54,6 +55,8 @@ static const luaL_Reg loadedlibs[] = { #if defined(LUA_COMPAT_BITLIB) {LUA_BITLIBNAME, luaopen_bit32}, #endif + /* FreeBSD Extensions */ + {"posix", luaopen_posix}, {NULL, NULL} };