From nobody Mon Nov 20 11:27:10 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 4SYlbL5Xxvz518CT; Mon, 20 Nov 2023 11:27:10 +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 4SYlbL4jJNz3VX1; Mon, 20 Nov 2023 11:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700479630; 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=0J+mJtmhIyhNhB7oGb5m8IpGGJkBxJo3aLGtKPFlDTY=; b=NH6MmqcWEf8agB0PS+mF/YgIKfdh9DRhWlxmqtS+eawbK84h1e53alGlsUU72RM587OYT0 xkrGe8Vlr2M/L5KfFJr0ciozFjUMMb0AlQOyYZLH/EK+j8erlCNNhTIHdgBseQiaI2e+fS XvKQzebf93xjPd3r8YrtWeixaiMjBCMyquZiHdcSf789ihHACLrS8lWcD33nlZPM9eefJk HMmcpc+rTZ+HJKpLZoBnKUrhI9J9bRXriCw/QQngwo+VPhpNxl/dmXYT5+Mhrds77vQEyf ic0rhdO1J3UfKm0WupvqBVBGWqU1uL2A7rUV6W3TtD+Hkgn/rhXmKGTdiRVhlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700479630; 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=0J+mJtmhIyhNhB7oGb5m8IpGGJkBxJo3aLGtKPFlDTY=; b=aqa8kP4DfXsaiA+Y9Cd9qJbod9hy8qWYn7VOYh6d3u9jbe9LA5eaNOu6Fgvxj/PnT8idqL ZrLMQ7MnhSLJuqjEHYo8TkHaUmdsVMhhRkorQ4ZZkv0eJt4aXG5rpevsZOQOoCaa8VtAwj Es0wBcD+Xili4idsYCo1d3VmLX2GtMoKIVGbZ6Aks17KXaBuEn1fWTU4QRf3llV3tdrKHd cSPwR1uV+PaePHTauciNeQefXhTqx3xZvC8M8192zHxDee8nkes+bJCoiRA8i03d1/p1L0 qMM0kHAn0TA4JRXSkcYIEX6X1uFZG2fV2wxH26yvcZ5R8shE9Y899minBNZeFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700479630; a=rsa-sha256; cv=none; b=GFiIDIKFB5B1ILlQwK0/YxYuw8h1VexwE79ViyFPL6G0yBnOmkklQF/0KwfbcIFWZxEYw0 QrbNKPHAXs+ASgGxx1W5Aut2JiTlnK3yAHzoH3dZl1hvH+d6gDG/s6ruu4mdOdTzJeK08S AWmYd4aEecXsF84YnHlO06Z9WQAg0AzyMwwrNho3mXOz5y6MMdpzsu2UFhPSq2ixrOWxMT 7zcsTNZjeUmhCQPF0wesL/qXlXQxLRN/VBYr8gDMXF0pO8besk6h5+u5p3RviVDIJPENoH hGrsM3F3oUxCPQlkCyJsYW8QQfSm3OcgQad/HWMJ4oJBchOUlpW5IcSeYQUMeA== 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 4SYlbL3m1rzqBS; Mon, 20 Nov 2023 11:27:10 +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 3AKBRAiU022354; Mon, 20 Nov 2023 11:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AKBRAHv022351; Mon, 20 Nov 2023 11:27:10 GMT (envelope-from git) Date: Mon, 20 Nov 2023 11:27:10 GMT Message-Id: <202311201127.3AKBRAHv022351@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: 806e4e3273be - main - 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/main X-Git-Reftype: branch X-Git-Commit: 806e4e3273bee2e3a12ffc2e74db5c912fbd7aa9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=806e4e3273bee2e3a12ffc2e74db5c912fbd7aa9 commit 806e4e3273bee2e3a12ffc2e74db5c912fbd7aa9 Author: Konstantin Belousov AuthorDate: 2023-11-16 05:38:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-20 11:26:00 +0000 ldconfig: filter out non-existing directories from default path This is done only for ld-elf32.so.1, where /lib32 is kept in the path due to the way STANDARD_LIBRARY_PATH is defined in rtld_paths.h. This change fixes innocent warning appearing after 99132daf6f70cb0cc969c555d3612547fa3cf1db Reviewed by: dim, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42626 --- 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