From nobody Tue Nov 28 11:43:05 2023 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 4SfgZ20DyJz532TS; Tue, 28 Nov 2023 11:43:06 +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 4SfgZ13rGTz3Phn; Tue, 28 Nov 2023 11:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171785; 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=y+RNjsfnUBFviEAxZMjZ8BGFZ94rjYRw5/4W4OlKZX4=; b=rTGBG1DBe+9zTvx+EI47PQeJBZN7x304HkoOFE3kbJPM2SJJxnY8yMakAQ0hUoFHQ1N/Y1 2rCbH9+4hS9+4bTULLkPkFxTyG5H8N66PAijaxdJ4ASyvgfZOlOXYEpO8sOd57Kaiijt55 0XGB589oQk5fgVTC+D7KF6YqnB9ibnORpYBuhxSJEi+lmrw9KaHQjCzr1kh1CZqByLVcRg tavZ4/Q30ulmhtpDIR2q2dljBPfBeJlgRFwwY/DvT6knHYsIHUUR8qtNdKfrMtvi4Lhiv6 bjNacZzuParlfifh4bGoxIUJWauB5WxoNRZz6+nlVNIiw3D4O1i0bBZ7aSd0BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171785; 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=y+RNjsfnUBFviEAxZMjZ8BGFZ94rjYRw5/4W4OlKZX4=; b=xqjLQvZBAYKOQu9ANjU44ycytkKxpSAvnAMFSTDVX/kOut3gj64tHRj8bAzfoFnc7ACef8 qsICDbFlGOOXdh5SjH+wg1eTjb2eF6b68fbIT2bWTEqK3eqMx+GuI4kItxMsN7ThGSpKTW if7kJ4NB0V3cEo2wyRBVbC2kcW40pKFOfD9JQr7Qr6+k+9ud/BenvIX/ULkp4m11Lui8KF hMNa3Fd2cUYG0wJPzjRTFbrHgF0dPL/NQVVJPwo4T0kZuHIhhIIHNp2RPeBJKmnCAjB52B vqBiem2Kwn7Yr+0NZS4kR+6IQw3XtOGOv+E7Yb8j+Bthy0iy7IvhNugrjfuweQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171785; a=rsa-sha256; cv=none; b=wji5+vtcMpvcxPG1FXLMC8lEORTxwL2LXVAjkCatGSb6WcjpdcO8cBPqwn7il05uvJTlU/ Xem3N+xjGnwtgDmGNSPTTP78Wmslx/mnQ6OxNHLJMuHmU8IAtWzyvFRZTKgrjunI0e4eO8 rHvAOMbrcGlIJ1JQXn6r98cbXPAdtYPcUoegJ+UC7jXMhNCpg8sCY4e3P87DECWwGZaCMJ rUD2s6Mlsiyb3NujBCKTN4qlz0B5LsTojWJeepgNBRta868uz6xAgOrkbMnDo7aD/l3NlM cBvp/ckt4nE/lnpflYfbiklBQe7/9ZeITdVnLgRBTkdSRi1Fc+pP5dXlCgjwnA== 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 4SfgZ12vdWz4qx; Tue, 28 Nov 2023 11:43:05 +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 3ASBh5B5039215; Tue, 28 Nov 2023 11:43:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBh5e2039212; Tue, 28 Nov 2023 11:43:05 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:43:05 GMT Message-Id: <202311281143.3ASBh5e2039212@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: 481273492bbb - stable/13 - rc.d/ldconfig: Prepend rtld stdlib paths to ldconfig(32)_paths 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: 481273492bbbab5ee1978a24e55b13c1f39bc560 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=481273492bbbab5ee1978a24e55b13c1f39bc560 commit 481273492bbbab5ee1978a24e55b13c1f39bc560 Author: John W. O'Brien AuthorDate: 2023-11-12 22:45:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:42:22 +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 92e3441b008f..ae25d59ad4ae 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}"