From nobody Tue Sep 12 01:49:24 2023 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 4Rl62X47l9z4sWMd; Tue, 12 Sep 2023 01:49:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl62X3dTPz3S8S; Tue, 12 Sep 2023 01:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694483364; 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=CVagzX9bI3u+9+h/KiefxtQO+q6xdsbXIZHhSiE2VQY=; b=wxqNlgwxbFo8/ShT5Pt56Emqnt90Ab3tV/Ve1jc2KU7UN56KW0tpCOUiTkH0f/NO5ZDUl0 tuw78A1uIUyr+tVXsTtxrUYmm6qd1Q1HpUKTT7MMvKI5ENkm5AyQFWCSmMyid/Ag8bs54B i6nv+jDGHOpDYCJv6j00ue0vCIV2jZG0uyLoMruquibtf6Og8trsYJ6OePfQAofuC1TDfs WYBwxherTRfYapVUfREeAKkGLTPCkPB5MdxA6yK+qjGCGeC+V24FoGEPzpZ8E4/jpdt9GA q8MTfj9q0DGBzWXAxOy8cmN2OTRswnashrx08UeD5rO0dczB6150nxGWZKLG5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694483364; a=rsa-sha256; cv=none; b=s2gClYaZxew10JRtv24BN+xsAs9o2le9VxDiOlMXh4/SyKjpjIPfeQplJpDyK6cKYqDOBj KIH9BFkx/4LdaUyj22u2JbtV1qlTwKE+zXTVK/jX4MpTduH/a8+IyWg5XJL+EVAwCVXEe+ VS1wUC4rIuQ9YxBp1/enroQqotTxkR1SAwMMeROoWtw/Go7Bhw06HY/9/irUSycPpwszkb vlz3KucjmfOkqOglgBMD0TZ+o1lw/lZHHNkf1bO4VrAvLA2JM9HDXJQxdTMyqz28YM/5Lv ozDuDvbNG5wl4nOpIldtQl8aw07GTZG6NGR26uAUvLQtNv2y/yRU4xsisNaHJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694483364; 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=CVagzX9bI3u+9+h/KiefxtQO+q6xdsbXIZHhSiE2VQY=; b=qUaolr1Cx54q/z9LrTPXZTFNIfDLfeyjN6cO8eEJxDGvkmsK+0qWKQs0uQhCLKxE9ewGXF 8mc2ZikxXyfAuN0lBjHHsNVBWw/vMmPdf2q/v+ClU2+jFug3KLXtI98Trh0MxMNf28XzBI J2kc2ilP9hVb64S34UerNugKF2lAh20QLiH8KKzdCDpp4bpBCsHEQ5XkrDWNPHmPSe4amW juoToZbizLLUs1lv00gwT7fXUDk8wp3O1e2l1S/Qe3DV7dyYp9LfYBAYFiUAREpyE07oht IrRd+uxkSIAp6PWMRqgjZwCAS7Z+DdG5xxqOuXoVkRxLa3tVZy7I6kevEwYuAg== 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 4Rl62X2kB5z1Bsn; Tue, 12 Sep 2023 01:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38C1nORx072563; Tue, 12 Sep 2023 01:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C1nO97072561; Tue, 12 Sep 2023 01:49:24 GMT (envelope-from git) Date: Tue, 12 Sep 2023 01:49:24 GMT Message-Id: <202309120149.38C1nO97072561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 380f42e2ed36 - releng/14.0 - stand: lua: module names should permit more 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 380f42e2ed3627d47696a1409a1a3ea07aebff17 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=380f42e2ed3627d47696a1409a1a3ea07aebff17 commit 380f42e2ed3627d47696a1409a1a3ea07aebff17 Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-12 01:48:51 +0000 stand: lua: module names should permit more The module entries should generally allow whatever is allowed as an env_var in the pattern table. Notably, we're missing periods which would allow proper entries for .dtb files in loader.conf that don't need to specify a module_name entry for it. %d in this expression is actually redundant as %w is actually "all alphanumerics," but I've included it for now to match the env_var entry. We should really remove it from both. Reported by: "aribi" on the forums via allanjude@ Approved by: re (gjb) (cherry picked from commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e) (cherry picked from commit 6b2f0a3c31dbf9268b49d64c859da136ca8dc201) --- stand/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 3f8fbc52cb40..8fdc805ee983 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -61,7 +61,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line" local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'" -local MODULEEXPR = '([-%w_]+)' +-- MODULEEXPR should more or less allow the exact same set of characters as the +-- env_var entries in the pattern table. This is perhaps a good target for a +-- little refactoring. +local MODULEEXPR = '([%w%d-_.]+)' local QVALEXPR = '"(.*)"' local QVALREPL = QVALEXPR:gsub('%%', '%%%%') local WORDEXPR = "([-%w%d][-%w%d_.]*)"