From nobody Mon Nov 13 23:39:35 2023 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 4STm9h39nQz50Bql; Mon, 13 Nov 2023 23:39:36 +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 4STm9h0Rm5z4FyQ; Mon, 13 Nov 2023 23:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699918776; 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=5bzA/eqIuYBJdkaFTSXhhKNIZX2PJk5hpDgALkXoogA=; b=ZMNX05ax08lTblNvtieGXbs1YAst0FIt1RuDMXMwQQzfgewAkpeoA3dQUKaXAbhyAJdD+V v05FnZHv8K7STilF4FJecAaAQnyvnN8SH5UXC55ThdIszM60JROIDnJGiZ34qsIE3tHtoY tpXnb7h6abJQPwkEcP4as4UPu/g7GAkdC1XP2JCbvbBbZ9Qea5ULrNRqGII8KXpgjaajD0 Pm86CnoZxysiSc3jKETmxJwUt6oRjzdOJN7FaF0njscn+qt/54EDlOzHXwiVTIZLDF6uWk vvbKtW3Bz+Zb5s5gMqKHi8S+NXabY0YO1jlbsN0zIiEsSf++PBCKi4FNZKF6Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699918776; 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=5bzA/eqIuYBJdkaFTSXhhKNIZX2PJk5hpDgALkXoogA=; b=CXD9RTs+Cjvdj9Bwzpwzosl4ZuVEI0d0Y65QuxuCgh1B11RnPNx6hx62VFs0re82mb+irT xjTin2K8BzWDg2PUoXiVLjTqsVSY6/MtLGk1GUCWhEMLKk2KLSRyT4Q9BIpfuaBs9kfw2/ 6L6AOHtcYEge1d5tTZvUoAW1mXJkZ3EwM4mAH6ICYdvkgqJA3bVcrjqFuoM+T9DetoZ1Zs YaTJGQC9TYK/h/tc5xr8uMB+2SfF6K3QlOdGCIX3Qs4hqgKhDVdNXk/qEwzhYgUkveyq9s F9bdJ3DQ0uNmhoKpZ/DR9blsQdzHHRBvct7Pxd0xFnIRdhApC+pRSHqOC2R3ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699918776; a=rsa-sha256; cv=none; b=AoX+htz+N/NLcEtvlQiOYXCythYnelpLR1vDAYEmw29jTtUqyO8vJTVykr9zztCP9QkwVZ mHS7cXbG+7aMBWqqlYKtPXUK3QMEFUCtz3ydd2jvjieiqmJu1oDFjnEZEyEYsQpYPdg05U Qbau4VBPWaA/NAG82K/DMBuolyLDplgcmIyUcLEcvAVb9BhDIwpe34YaFq8D1PZzaZ+6BP +15CP8D2NuySxNOuD9eLp9PI6AS9KeqJfaPQBkd/sWvm4UvxwvGlgp6/GdWsZFLXARgZoH blBom4x5rgHaZS5PZYzK8Px8Fvgyujp48yBj8WwhQwOQv7488W4vYftHrTLJwA== 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 4STm9g6dXFz9ZM; Mon, 13 Nov 2023 23:39:35 +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 3ADNdZ1M081022; Mon, 13 Nov 2023 23:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ADNdZKF081019; Mon, 13 Nov 2023 23:39:35 GMT (envelope-from git) Date: Mon, 13 Nov 2023 23:39:35 GMT Message-Id: <202311132339.3ADNdZKF081019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 99132daf6f70 - main - rc.d/ldconfig: Prepend rtld stdlib paths to ldconfig(32)_paths 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 99132daf6f70cb0cc969c555d3612547fa3cf1db Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=99132daf6f70cb0cc969c555d3612547fa3cf1db commit 99132daf6f70cb0cc969c555d3612547fa3cf1db Author: John W. O'Brien AuthorDate: 2023-11-12 22:45:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-13 23:39:17 +0000 rc.d/ldconfig: Prepend rtld stdlib paths to ldconfig(32)_paths Ensure that ldconfig-managed elf and elf32 hints always include the standard library paths that are known independently to rtld. PR: 275031 Reviewed by: kib MFC after: 2 weeks Sponsored by: Saltant Solutions LLC Differential Revision: https://reviews.freebsd.org/D42557 --- 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}"