From nobody Wed Dec 01 01:08:24 2021 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 6670718AE588; Wed, 1 Dec 2021 01:08:27 +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 4J3gvF5VRcz3swx; Wed, 1 Dec 2021 01:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1FC542073A; Wed, 1 Dec 2021 01:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B118OwU035747; Wed, 1 Dec 2021 01:08:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B118OI8035746; Wed, 1 Dec 2021 01:08:24 GMT (envelope-from git) Date: Wed, 1 Dec 2021 01:08:24 GMT Message-Id: <202112010108.1B118OI8035746@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: a2a905f4d02b - stable/13 - ldconfig: use libexec/rtld-elf/rtld_paths.h 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: a2a905f4d02b9592a8126c73f2eb4d3949265659 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638320906; 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=QCq+d2tk+VGkpVndWiMpB9MU06eIRQI/Z0EPITdhjO8=; b=IOis8IdXSdZhYWy4UcEXMc4vkVMZaDvSJC01Zeb48yhV+s7DuQHYuRxn2HjFIVJ00HRu9d tPV1krfH1gXGhxo2AXk154TeTdbjuThMed8mWj0pKNWbEnHPQ7sAxSsTC6eCn51vEg+SxH 7KcEdSfvsnYr4rw3HDlMlH7LkKvTt7boqMt1en215PsExVK0e9kcTTkFsudr6DewNV6rYP EnEwHg2gZ1u6KfVyi8GvTTXxMTWt7UX/nEToWzhUUOYTvIe/Delcp/PtVvlW9tRpGqyofu RgOVwBx4tasAkC0VCIYlSsKkBnq/U9B4BD+h9RGHmypwX3NRnwiVUsKIhJ7qdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638320906; a=rsa-sha256; cv=none; b=Fxin9rwx5jRjox1OAOm0yvgEUM7KC9zGpZaEnMF8et3WijZxW0baC1WBj43sentEQ+bZGc RTI/JR1Etf6OJ8TF4wv/LJlG6j6hBnuKCDihV4LnIaQFtx9ZiQAcfb9/62keklscay5Cvn 4Gb/QMrqJq4Xf59Q3qFUIfAPy7PS/vWfyQHu5TCpzUT9GlJEJvnVJ+g88+xsrLfABxNdiD 2Lr3PUqWN3g6Gv6dsBRWFlHC7r8jECTgMNAd95H/FFR1p+kBksWnlIRCyUw68mlT0od7xt o30O5PmwtUZYvywHoCQj5e39ftZq1t1hXl+IaInXmNwKavkn7JPNzNfNN6uNbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a2a905f4d02b9592a8126c73f2eb4d3949265659 commit a2a905f4d02b9592a8126c73f2eb4d3949265659 Author: Konstantin Belousov AuthorDate: 2021-11-19 03:45:31 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-01 01:07:19 +0000 ldconfig: use libexec/rtld-elf/rtld_paths.h (cherry picked from commit af9115870670f508c11b3d173bcff5116d8ef320) --- sbin/ldconfig/Makefile | 1 + sbin/ldconfig/ldconfig.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile index 2ead668578f6..070c2c3d6901 100644 --- a/sbin/ldconfig/Makefile +++ b/sbin/ldconfig/Makefile @@ -3,6 +3,7 @@ PACKAGE=runtime PROG= ldconfig SRCS= elfhints.c ldconfig.c +CFLAGS+= -I${SRCTOP}/libexec/rtld-elf MAN= ldconfig.8 .include diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 777895936834..288c22813121 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -48,6 +48,7 @@ #include #include "ldconfig.h" +#include "rtld_paths.h" #define _PATH_LD32_HINTS "/var/run/ld32.so.hints" #define _PATH_ELF32_HINTS "/var/run/ld-elf32.so.hints" @@ -84,7 +85,7 @@ main(int argc, char **argv) } if (is_soft) - hints_file = _PATH_ELFSOFT_HINTS; + hints_file = _PATH_SOFT_ELF_HINTS; else if (is_32) hints_file = _PATH_ELF32_HINTS; else