From nobody Tue Nov 28 11:40:51 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 4SfgWR41KKz531Jh; Tue, 28 Nov 2023 11:40:51 +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 4SfgWR2xLpz3Lfg; Tue, 28 Nov 2023 11:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171651; 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=mybpOyrnx8MQjyk4tY5Bu4cwgHIzzTXY4ht7jVJfuD4=; b=N0QIPsCHbGUYdKdKqibGZojjKRDSoFDB84Gz671NeN01/zxJKz/8AEH9kqVe1L3Ez7HiC1 eNfib9kZD8zXLiuTTuSW4yL+MW16Q6NgnulVRJyj4qhp4c72F/mDHR6e2AbS/QyQ9y7cNN XZrUOhOeASd5lM46JQPlRjr4KI+r43OR3FocBlbgYsXz4esIhp5Df2z+Fj7DMI+sCmBSY2 go/MnQy/bmFjPxnOYDf6qK+sOg5AKZuTA8WnEmdXdyf0a8GDTJ0SADQ6k3S/IuRjirjekn /PVQh2sGAD5CMwOh0+xOwv5GFg71h5MoXOEfwF6ilDpkNXOwUHuFZ5tP00uudQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171651; 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=mybpOyrnx8MQjyk4tY5Bu4cwgHIzzTXY4ht7jVJfuD4=; b=JQbe0GAP4ZF22KDvhBgP6ZVvDZ0KeEM9dF/GRxD+VRrGyxMslFrxQpWgulX1lAEriN5rtK bdTVUqTLw4CqvEKmY9yNMSBv/g2uaFQOIEXPAVKHjlRdCvXbtZqXXWbbFEWFjY2z36IE1v ntL4dFkUd5+XV8NIqE6uEvNEDqPiEBh/rZAiZbWjp/8Aet5bf90unKb4qftFm8w9Os+i0g FIQz6f1pJLWZxVRuhsYzBaXoUxPsKbujSRy+YXfGilCCrquTVYXUfCzDp5AMfamPqTu07p G2NEoIra+X7akeSRUvFhxpnSQCDEnKNrmr1kVnpDgGXeLenR7ha2NGsMncPF8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171651; a=rsa-sha256; cv=none; b=BjSEuIpDhGsT6RpQ3CP2bkPIXUzXLNJ3mxhD1fslmaWs+AxtRtYjPBxMgdbMB+ytp1HCAe PpZp9WM5kmCPJDvscGEDHxrRIM7ywBivnJHeJ70I0L8jsy8SogAxCTsz6QRV5eyq7OX8gc XQJGgEl5pHGRJrv58qzj+Ze4YXB1M4c35GGpgLqM7HjZ2g8hHfcgzj8wZ/QyXSZlzueIvu qM5y9bpDuHW72K+8mi2Sd1/c7oIZuWYDl7r/3ENGt994FfuUIUcqFvdAxedS6WyVsYupcq TYIeggC9VNnKFyaR4Ty2GWNJRHF6LmhrsuSHCOdYKlb1huw5VQrTz7f0j+8+dQ== 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 4SfgWR1z4Vz56y; Tue, 28 Nov 2023 11:40:51 +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 3ASBepdZ033167; Tue, 28 Nov 2023 11:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBepuD033164; Tue, 28 Nov 2023 11:40:51 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:51 GMT Message-Id: <202311281140.3ASBepuD033164@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: 5dba91f557f0 - stable/14 - rc.d/ldconfig: Prepend rtld stdlib paths to ldconfig(32)_paths 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5dba91f557f0fb295977a07b2837b0351723b9c8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5dba91f557f0fb295977a07b2837b0351723b9c8 commit 5dba91f557f0fb295977a07b2837b0351723b9c8 Author: John W. O'Brien AuthorDate: 2023-11-12 22:45:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:39 +0000 rc.d/ldconfig: Prepend rtld stdlib paths to ldconfig(32)_paths PR: 275031 (cherry picked from commit 99132daf6f70cb0cc969c555d3612547fa3cf1db) --- libexec/rc/rc.d/ldconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index 178a8a987be4..ecbbca210ea0 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -22,7 +22,7 @@ ldconfig_start() ldconfig=${ldconfig_command} checkyesno ldconfig_insecure && _ins="-i" if [ -x "${ldconfig_command}" ]; then - _LDC="/lib /usr/lib" + _LDC=$(/libexec/ld-elf.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' ') for i in ${ldconfig_local_dirs}; do if [ -d "${i}" ]; then _files=`find ${i} -type f` @@ -52,6 +52,9 @@ ldconfig_start() fi done _LDC="" + if [ -x /libexec/ld-elf32.so.1 ]; then + _LDC=$(/libexec/ld-elf32.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' ') + fi for i in ${ldconfig32_paths}; do if [ -r "${i}" ]; then _LDC="${_LDC} ${i}"