From nobody Fri Feb 18 02:01:31 2022 X-Original-To: dev-commits-src-branches@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 A830719C41EC; Fri, 18 Feb 2022 02:01:31 +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 4K0FL335xFz4dt7; Fri, 18 Feb 2022 02:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645149691; 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=1f1jCOqZt3xYjsRWBa7tRngKXyTsNVUkPuVTZv45ULc=; b=LJuRyF4qojyPz8ojYKE/Jc46QV7keKQLA5DORTGkg9QakJW9aHtDvUuZ7hPAP2AotSLmBW yLPdN1RYf5/0AJXjYhZvSqn6x8FfGHxMVPamcHkaK/JqkZDjsXM9swHm4f97YIWRm0pFRl mfWowMZCv9xiuvpJ/pnme82fZhOstnnDFJ67HpjEHkp6UobbRXgue+vddaiEMlKqr7QXlo JDwlkHrV7Ozqb961mZIOnriHvcN4YE1mUvpsx9wdQZJH5WldtmqSOR6ck3lbO2PEzemXln Mpl4hha1e2JDBr7UeuPpzgyRjqr7qNcPMn+GaxtQe96QvbgvaSxNsIruc+gWJg== 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 3649314D4F; Fri, 18 Feb 2022 02:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21I21VK1039420; Fri, 18 Feb 2022 02:01:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21I21VkI039419; Fri, 18 Feb 2022 02:01:31 GMT (envelope-from git) Date: Fri, 18 Feb 2022 02:01:31 GMT Message-Id: <202202180201.21I21VkI039419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6914c8ff5df1 - stable/13 - rtld: Add ${TOKEN} aliases to $TOKEN List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6914c8ff5df1c192e801f209bb520d923a8b3794 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645149691; 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=1f1jCOqZt3xYjsRWBa7tRngKXyTsNVUkPuVTZv45ULc=; b=HjMcwt3BA3AeqZKOcqW8sqjlVDKVQXSK67Sxkakkv7vt3AYb3IoRnqwZTgkPb5c8m4LV1O EZ1eqBAGu2gLAs0noNgqG+FVmp6NwyDKnfRwVsLphtUOij1WsV2jK1+pIQadzoFqQPLNcD ierMyuJJMph5PpB9jPtI8kwAu4hNpH4OBbOeGR90gmIf6TSQiD7tLgDW2PYZHfNBXfrI9i RxCFpGGs5mW5dWe2iT2lIbRgAej+QdmKbqGryyJ07djSLNkESB3TURF1sHvZpJim5oBVuq 9JmxwL6w8yID0rF7iw3dtKWhJ7Ge5P2wzlzAiTsCurCKP2ZUQ1TZlV+URTx5Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645149691; a=rsa-sha256; cv=none; b=Uqd7WOpfsmMNlEaFvQdDOZ0S9pFPhe6lVasJSfktsdHngrYkICAiII9FffF1DpYkBygU+F dXLWNx56fQrFL6Q5fEXj1niqW5911/uh9XvD3Bjw/HR5XwYwLkhlddDr1jsealSWoKzx8p rJVE6fFXtvpLGdf71/7eiibqLQAyd3Oofkm/ocdvjSTgizgFeGqv/FL29/lknhcJ1Ap/Vj coEnUoxz/FgyhQABeSD/bbtGlR2gIjWa6J7mBJ71FbP0oezA12OsvgCt8uio2CcSQlNmeB +6X3+kmmKI+RbwmSJG5rNyZBxqH73JAlOkynxcnhwTmbfYWtLsrQOI86PyDOeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6914c8ff5df1c192e801f209bb520d923a8b3794 commit 6914c8ff5df1c192e801f209bb520d923a8b3794 Author: Konstantin Belousov AuthorDate: 2022-02-11 13:46:05 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-18 02:01:24 +0000 rtld: Add ${TOKEN} aliases to $TOKEN (cherry picked from commit b1b517412342f336a8e6d153130b2f4110e0285b) --- libexec/rtld-elf/rtld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index c2fa85a27224..b495c5f5d8a8 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1185,9 +1185,13 @@ static const struct { const char *subst; } tokens[] = { { .kw = "$ORIGIN", .pass_obj = true, .subst = NULL }, + { .kw = "${ORIGIN}", .pass_obj = true, .subst = NULL }, { .kw = "$OSNAME", .pass_obj = false, .subst = uts.sysname }, + { .kw = "${OSNAME}", .pass_obj = false, .subst = uts.sysname }, { .kw = "$OSREL", .pass_obj = false, .subst = uts.release }, + { .kw = "${OSREL}", .pass_obj = false, .subst = uts.release }, { .kw = "$PLATFORM", .pass_obj = false, .subst = uts.machine }, + { .kw = "${PLATFORM}", .pass_obj = false, .subst = uts.machine }, }; static char *