From nobody Tue Nov 28 11:43:06 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 4SfgZ274dZz532RZ; 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 4SfgZ24hXqz3Pl3; Tue, 28 Nov 2023 11:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171786; 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=SYLdLZ3TUIXR8G3iPy2j9XbZGWVhzt5x+gaZJWWJBGA=; b=kZTylJrYH/2lDljgdH5UuZQ23vTAKbEgXxSj+TB/1kjKBcyJMWZyzd31q9PeGsCz91JHGP du+1O9QHYScN3ve25lsPq9w1u06raeOy65Avc9nbeJbl0qa2Oz9vDs35vhCTn5h7cUZyoX E5qcgWxTHPZTG4mHydFwc3YNGmtTkapw/Wqifm3FOeKj4MFPhAjRWNN3CTZtBlXQoNTnK1 mgZH/9nzCvhltQDMWJZ0y7RdNs8Jt4ZO3ub0AlSWf5Cd0wQVAyeYubf0CazjDM8HxQ91aG ne1u4Vp26Gof2MMIXFQYdfKzh22JqkKKp2426c04X1w4gEjJMxSSJsItTJS5FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171786; 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=SYLdLZ3TUIXR8G3iPy2j9XbZGWVhzt5x+gaZJWWJBGA=; b=eiqUOgY6kDaBEiikKk3lezvhKjzif7olbiilNZdwjW7k6Ptd4rwXtJQ23SIyc3GCulQzb2 tVykoqltgIPX7sXuX6nyoLthyu5Z49ML5Za0wD87Vh7eXZt+JvVcTiMnK7YUtUBZWZ9byi Cmg4k1YLn5rQ+IE8MoMjVuAxQxuBgKKeSiWwiK4r3VuOTWioTOdDYZvl9NAFi/sPVDaYrP nKkMukXHtEX24+XaiPrGaiIe9ruQdM2t5PJj2Wq8yXMypVo+SA9fUZKt6q95RgNVWabmSi hFyNfWopUEejkXeoilxe/it3optS7wc8WJRkzqS/pxHNzK3I9g5cCuhLO5+eEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171786; a=rsa-sha256; cv=none; b=d5IYAZJIPljDuzQ2AkX22JmvavDfVqMvdFr0R8cYjzmjpIQO2f9+LL/BHtk0T1l1hy+oEC qsf+qohAkpQ9qt+VLa+JWoMNfya09WjT3qMv3sXsfEwW6bs6tbqvt+mxUKIZiTFewENPr7 Q7tuRuCmMugQ6NwFdUslLhu3l9rsE/asNIRefauiW9GQiPA9V+bAVrXhNqWhp3tkCymErN V+RQbPUc3S9aVy5LTPzg99h71ipMw1eHI6TbH2yyeBjjdMlS/EMDUcpDN+2ksylAv6HiBJ wWHnB7E7FlgY2EDYLvI2LBRU5XMZEjIRYzMov19AQLGNzLQqlBhv5WSjnPEykw== 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 4SfgZ23mQ1z4qy; Tue, 28 Nov 2023 11:43:06 +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 3ASBh6U2039266; Tue, 28 Nov 2023 11:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBh6ux039263; Tue, 28 Nov 2023 11:43:06 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:43:06 GMT Message-Id: <202311281143.3ASBh6ux039263@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: 9026d9e6138a - stable/13 - ldconfig: filter out non-existing directories from default path 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/13 X-Git-Reftype: branch X-Git-Commit: 9026d9e6138ad6ea3b8b52f2d555d48aebd7f8fc Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9026d9e6138ad6ea3b8b52f2d555d48aebd7f8fc commit 9026d9e6138ad6ea3b8b52f2d555d48aebd7f8fc Author: Konstantin Belousov AuthorDate: 2023-11-16 05:38:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:42:22 +0000 ldconfig: filter out non-existing directories from default path (cherry picked from commit 806e4e3273bee2e3a12ffc2e74db5c912fbd7aa9) --- libexec/rc/rc.d/ldconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index ae25d59ad4ae..388d4cd276a1 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -53,7 +53,11 @@ ldconfig_start() 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 : ' ') + for x in $(/libexec/ld-elf32.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' '); do + if [ -d "${x}" ]; then + _LDC="${_LDC} ${x}" + fi + done fi for i in ${ldconfig32_paths}; do if [ -r "${i}" ]; then