From nobody Fri Mar 29 06:50:09 2024 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 4V5WHk1Tf7z5Fbyg; Fri, 29 Mar 2024 06:50: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 4V5WHk0bGRz4Wbd; Fri, 29 Mar 2024 06:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711695010; 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=1JoQSa7jrKZi5MCln7ZXYRPra4RicDOu3f/UpoyFI6s=; b=u7p5yzzdX/BP/bYp75Fu1dNtEcxtA9MiBZsA1lbBxUot04TXYI7RZ3phooUQKAKH60Th7o fXiAEd7XsZITNZtNbVHUT/qQVWRrx5s/Sx6nUXXzM2nQsFHKw74QCmLJxiUxPTqDYpBHTf 6aC2ZGT9ph9SRflDj69ekALXkgIUj9Hv/uWfw163ZZ4SIfjWG7C/TmTglQElvV/VB8ayr3 d/B4ll0BbvbdoBXCZCa15JWQJYvCwd7Ghb1DE2bw/8NCbShQUAigHbym38i8QG6DP8Pw8o IZvR78WlvcSyc/9RfXhc8nD4Ibg8yFYjrWfDWWUpcnrwnurzHYrUVmiFU2+2+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711695010; a=rsa-sha256; cv=none; b=LTElEkGsgaJ6ILaE7bjLEUftx/nYGGK3kyV15d125gai9+DBQAwGAeb/kJLLzoZ8659RJY FXsMUF+c2WqYJ2XSXqJp+gX268WpbaAx3U02U2TZd5qOA7GksylnSOSfDne2JIz+1SP2Eb g3piDBqiPviZquyre5J+uDlgsEBtaVXEOhmvyc5X1kISUcJBeYh2mYDvVixmF4cedepQkE qJ+LCC2gWGw0b4fU+AfXfTgdCRDFneGWPRb0I3mDlrcp2QYvAsbNBYTSkzbwd7StwRrVtf t1hPNqLYTfYzRcubJgiHCZ7B2dMA1Um+8pgAJ7WaNzaWAD5pCpaszxPg5oK+gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711695010; 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=1JoQSa7jrKZi5MCln7ZXYRPra4RicDOu3f/UpoyFI6s=; b=Wk4vpSlGN84Z/03ZLPKdYiNcXovIPIhdGoUYpJesHf7HzFgaGLBDEreCzWU47INZfuaHux Ok2l1AFdt63xXxtkyW94Wm5ZcFqWiJAWSV2riN73Bn2ow6doLup/DFIJCitWM9UR1ELGv0 UG52wYXdkaVRMSasKP2ZmZDVHG/qNDA5BdmE2uMU6xPt1Z0u1ofk/uC9uweBgmHRZKDogV C1XSc0zbjsLhhlxEd9hH8d8x+03t1EEseQI5K/ICmndBkIjcjCEWKkUjZGBFA+hgfLVE40 ibp935yekeKFN6i3PRT4D5uabzKDuS9+Xd+YzvddPv7biS5sUlkZpur/jIRf3Q== 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 4V5WHk0C88z10lB; Fri, 29 Mar 2024 06:50: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 42T6o9Zm014261; Fri, 29 Mar 2024 06:50:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42T6o9CQ014256; Fri, 29 Mar 2024 06:50:09 GMT (envelope-from git) Date: Fri, 29 Mar 2024 06:50:09 GMT Message-Id: <202403290650.42T6o9CQ014256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 10f08c01deaa - stable/14 - ldconfig: remove ignored -v (verbose) option 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: se X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10f08c01deaa5a9f07e853995a4d8f7d62c3d33e Auto-Submitted: auto-generated The branch stable/14 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=10f08c01deaa5a9f07e853995a4d8f7d62c3d33e commit 10f08c01deaa5a9f07e853995a4d8f7d62c3d33e Author: Stefan Eßer AuthorDate: 2024-03-01 15:29:31 +0000 Commit: Stefan Eßer CommitDate: 2024-03-29 06:49:25 +0000 ldconfig: remove ignored -v (verbose) option The -v option used to print useful information when operating on a.out format libraries. After the removal of a.out support, it was accepted but did not have any effect. Remove the option and update the man-page. While here mention the set of historic options that are accepted but ignored: "-elf", "-s", and "-v". The FILES section contained outdated information and did not mention the way library directories of optional ports and packages are included in the library search path recorded in the hints file. The description of the "-B" option was incorrect (described a planned change) for big-endian platforms (powerpc64). These do still default to big-endian hints files, since the current version of the "pkg" program expects the hints file to be in native byte-order. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44139 (cherry picked from commit 484de86fbe4cf0b77e9cc15e8a6a656603b9174a) --- sbin/ldconfig/ldconfig.8 | 31 +++++++++++++++++++------------ sbin/ldconfig/ldconfig.c | 8 ++++---- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8 index 88d99567912e..f3ced2220e9a 100644 --- a/sbin/ldconfig/ldconfig.8 +++ b/sbin/ldconfig/ldconfig.8 @@ -41,7 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl 32 -.Op Fl BRimrv +.Op Fl BRimr .Op Fl f Ar hints_file .Op Ar directory | Ar .Sh DESCRIPTION @@ -106,8 +106,8 @@ on 64-bit systems that support running 32-bit binaries. .It Fl elf Ignored for backwards compatibility. .It Fl B -Force writing big-endian binary data´to the hints file. -The default is to create little-endian hints files on all architectures. +Force writing big-endian binary data to the hints file. +The default is to create hints files in the native byte-order of the host. Reading of and merging into hints files preserves the endianness of the existing hints file. .It Fl R @@ -131,9 +131,14 @@ on the standard output. The hints file is not modified. .Pp Scan and print all libraries found on the directories list. -.It Fl v -Switch on verbose mode. .El +.Pp +The historic options +.Fl elf , +.Fl s , +and +.Fl v +are accepted but ignored. .Sh SECURITY Special care must be taken when loading shared libraries into the address space of @@ -150,17 +155,19 @@ Thus, serves to specify the trusted collection of directories from which shared objects can be safely loaded. .Sh FILES -.Bl -tag -width /var/run/ld-elf.so.hintsxxx -compact +.Bl -tag -width /usr/local/libdata/ldconfig/* -compact .It Pa /var/run/ld-elf.so.hints Standard hints file for the ELF dynamic linker. -.It Pa /etc/ld-elf.so.conf -Conventional configuration file containing directory names for -invocations with -.Fl elf . .It Pa /var/run/ld-elf32.so.hints -Conventional configuration files containing directory names for -invocations with +Hints file for 32 bit libraries on 64 bit architectures, processed by +ldconfig when invoked with .Fl 32 . +.It Pa /etc/ld-elf.so.conf +Optional file with names of directories to be included in the standard +hints file when booting to multi-user mode. +.It Pa /usr/local/libdata/ldconfig/* +Additional files with names of directories provided by optional ports +or packages. .El .Sh SEE ALSO .Xr ld 1 , diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 0eb9cb801ac2..7700fd1f4574 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -57,9 +57,9 @@ main(int argc, char **argv) { const char *hints_file; int c; - bool is_32, justread, merge, rescan, force_be, verbose; + bool is_32, justread, merge, rescan, force_be; - force_be = is_32 = justread = merge = rescan = verbose = false; + force_be = is_32 = justread = merge = rescan = false; while (argc > 1) { if (strcmp(argv[1], "-aout") == 0) { @@ -104,7 +104,7 @@ main(int argc, char **argv) /* was nostd */ break; case 'v': - verbose = true; + /* was verbose */ break; default: usage(); @@ -127,7 +127,7 @@ static void usage(void) { fprintf(stderr, - "usage: ldconfig [-32] [-elf] [-BRimrv] [-f hints_file]" + "usage: ldconfig [-32] [-BRimr] [-f hints_file]" "[directory | file ...]\n"); exit(1); }