From nobody Mon Feb 28 14:05:52 2022 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 67D6119D7553; Mon, 28 Feb 2022 14:05:52 +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 4K6hxD2YR3z4d1y; Mon, 28 Feb 2022 14:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646057152; 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=l3wPe4N08ta9nH6jIt8yMpUcCNb6Juj5pWWjdUaOjE0=; b=eibJzsb0fMbBWkYvqGuIWO7STmGOolcL1MU29u81ODSM1rOz2qYhq4uxpEC+caCoPpEa6d SEPRN52qYUZoXzRSSnFUllGLgM5DAFYKKTKH9Re5Q+wkGk6/zw1IRMoMELPEkLUsznyLVu fwZ3e6cAFksbhkPVbhAQKnwGLvMM7c8fzrZCskzMiB2cCJAuBo2txVLA11BxJwJPPDMRuj 3vlQduOLuMckAPyi16i7PPbyJvBW6VO7lfHiojDLnIydDcnmWPz0YLaYo2iHOUC8GlB555 i03wzOx72y/K9b6jrVtORpGUlJ3Pr3zkIPKg9DvP1rCiQsDv8LadFi+Z748d1w== 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 33F3B1CD58; Mon, 28 Feb 2022 14:05:52 +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 21SE5q8M064050; Mon, 28 Feb 2022 14:05:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SE5qdR064049; Mon, 28 Feb 2022 14:05:52 GMT (envelope-from git) Date: Mon, 28 Feb 2022 14:05:52 GMT Message-Id: <202202281405.21SE5qdR064049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 19624b4c6b67 - stable/13 - rtld.1: Fix misplaced text 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 19624b4c6b67881812e2bec0808a9d831cc61bb5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646057152; 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=l3wPe4N08ta9nH6jIt8yMpUcCNb6Juj5pWWjdUaOjE0=; b=LecsME7XHhAzuMIdaq+n2c0U+3UpYJK659K3H/++uRM0QEbx2bYfI2zAFUgTdHm8gAfJPq EV8YeUbpkjZkaEme+CaMGF/lbRaoAP2HNXTK7XH5wZXIz0gMj8DXXtUgdKDg7sZlGfAmUQ 5+HOB30Zi6XXxURq33TqfNsJulZRhCjxjPKbC1fjq0hPBS9fCblXcPK4oyshOH1m9uL5aX j+3V6OYftgg+ky0YXkt238fNjlHxKZFJefVMJiSgtTIws6vCrHt+sYr9E92bC77ZwShQRa 3MnEl09E/jArhkk1KUPgc6qfcCmCRwKc1N+Ag0rplkwz/StmCcnObmxvvKEemg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646057152; a=rsa-sha256; cv=none; b=NcGKirItwae2I+lbKJxo4pcd7ZpZ3QCoUsUbfeeyEpUrAMii672aXIB3GNzEHHpHPFO3p3 +afuRgfJmHSZMG2rGI8oko3xQE639k0090diBA7w4U3sPhPG9mIirTA98np35EgSU759xt uAhQXummNSQ0GTNcSZ1vxu9bD3ovyQuQcrLkZ++rV1fvht8RIjnsadfxjK4oRy0oBEjjQo SzDryHwBDZ/DjZKRZRdxJWrlfdIK8/1CkTDWGqsQBnQHKYelEZDJG0z9nb43UwidfBnoBY 0johszrnTxfCGWn45OM8fRkjwbqnyZEGhIaMLmG67FAqK5Z3a7OsAAoByEazkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=19624b4c6b67881812e2bec0808a9d831cc61bb5 commit 19624b4c6b67881812e2bec0808a9d831cc61bb5 Author: John F. Carr AuthorDate: 2022-02-25 16:09:03 +0000 Commit: Mark Johnston CommitDate: 2022-02-28 14:05:30 +0000 rtld.1: Fix misplaced text PR: 262194 Fixes: f90218886fc8 ("rtld: introduce PRELOAD_FDS") (cherry picked from commit 6c799530d8dc91d4e5c390274b8a27231f369a56) --- libexec/rtld-elf/rtld.1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 66aa2bdabd17..c29d1fb1f90c 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -208,6 +208,10 @@ to be linked in before any other shared libraries. If the directory is not specified then the directories specified by +.Ev LD_LIBRARY_PATH +will be searched first +followed by the set of built-in standard directories. +This variable is unset for set-user-ID and set-group-ID programs. .It Ev LD_PRELOAD_FDS A colon separated list of file descriptor numbers for libraries. This is intended for preloading libraries in which we already have a file @@ -216,10 +220,6 @@ This may optimize the process of loading libraries because we do not have to look for them in directories. It may also be useful in a capability base system where we do not have access to global namespaces such as the filesystem. -.Ev LD_LIBRARY_PATH -will be searched first -followed by the set of built-in standard directories. -This variable is unset for set-user-ID and set-group-ID programs. .It Ev LD_LIBRARY_PATH_FDS A colon separated list of file descriptor numbers for library directories. This is intended for use within