From nobody Tue Nov 28 11:40:52 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 4SfgWS4pwRz531T9; Tue, 28 Nov 2023 11:40: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 4SfgWS3zDqz3Lm8; Tue, 28 Nov 2023 11:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171652; 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=QrY1jAx6J9ydollBDIbGPsY5DGkGQ5CCd86TI7aZl8o=; b=NsA/vgbSxeQn44zY52t5CRgF+F5w4O5yZDNVSybQAPNSCNBbXeUbPg8h2dE5szVFMTUXWr QGmjq0/xDY87y3eLYfWoXA7yXaRt1bVpdF268B2pNsMTuVeqEsrhSlLVDAh6iS4aH+nV+u luAMLD8nbRVyJn9u1s+n2PPil1pvHM1lUBRbtyezGuDK4eU+I91QGUPlmQTViXzfA5eYWI 0YAlpBh2xu0aTuT+E6PVBXX5FGj9w0dLq30RB0R4r5a0f0B4LX3N2+qaD34Q1QVhN0JgMi YIGA9rCWcG6tu/epJMDF9svnJbptghaPnuPl/kgzerboDECMMK2AG3auKauJ1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171652; 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=QrY1jAx6J9ydollBDIbGPsY5DGkGQ5CCd86TI7aZl8o=; b=D6nOXS8sBLXj4PQgcdyXQsSTXi8+ON7c78sG6iaHkw5s0FuqbRCko1gpOgYmGkh1XIv9H8 upbztIyVx2Sy2AwYECbpU0fVHXZWvkmKI/RLG2c5LOOamZ0rtRXLqzaEi/Um/2DhD+loBg SFPMHPDDFV3U8blpcYHCH/J2ImOj2+QBQ7jk8XFoSbpm0MEWVOKdzkQurlPrFbtaZteq6+ gdUQKaUmw/FIb/cKGCGtaHic9YwmAWS+Axh+49DYff1dRVmkQq347mpSejq61vrHIzKov7 wtJ/4Pq6rX6bfu9xvQgSYmJP/BEh215CaSl0maqJxhSowkFd+V+wW5KK82oPIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171652; a=rsa-sha256; cv=none; b=gxfbmF7rjduwZUcm6QEVJvneO64//Ug/XzvhxYQmZJwPno09BkVWDzqLUYTA6tYS+mlc/l qv88mX4j2idd3kHCNt5jpfvGY1Xr7RLWgHdk9rWLthTM6jPVGgIgjB0s4C5jKhHeeqzRwa VfmMg5/oEdnE20zEI1WtOESTtlU6lJgY45m5tYkT98STXeg7FHyztyKJQthtzQcQqr3A48 N/wEdLzyv1vwK89zce1+VpapdoOcUHTTv0T5+8B9rnbaR0E5ZyynEEVzN1k7I3cDNf6QyA XeLXRTqobHFk+lbFkv9/tBKOyGyEVWplNR9Z7YjgzDWpGrbThOnYu1eQdpAHzw== 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 4SfgWS321Jz52Q; Tue, 28 Nov 2023 11:40:52 +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 3ASBeqVn033218; Tue, 28 Nov 2023 11:40:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBeqfv033215; Tue, 28 Nov 2023 11:40:52 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:52 GMT Message-Id: <202311281140.3ASBeqfv033215@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: 81a5b2389dcf - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 81a5b2389dcfeef12115e28a24ea68f71e5cc1f3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=81a5b2389dcfeef12115e28a24ea68f71e5cc1f3 commit 81a5b2389dcfeef12115e28a24ea68f71e5cc1f3 Author: Konstantin Belousov AuthorDate: 2023-11-16 05:38:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:39 +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 ecbbca210ea0..ed3484017d84 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