From nobody Tue Aug 27 21:26:38 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 4WtgbL431hz5MR4N; Tue, 27 Aug 2024 21:26:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WtgbL2xCTz4yQB; Tue, 27 Aug 2024 21:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724793998; 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=I3oBA8cGEg5pOqJd6TlM0ETayoPUh/tYJjsWgqAJQEQ=; b=cH7nQ2cTb1CN8UdSP0EwEA0k7iBme4o4fWd7C5G8BKWe1JPDvOZuB7loal0dWdqOKCaeWI F4CW+BOKwpxN5DOSAhwtzy9PTRMMXuRS4j77OaVYC8vZIXskNDgWUW/vgkdV4R5K1yWJ9t OzRV8wvCqF+nDj4IbjUZTYj9ow3mFwDbBrm1TSVtTpVvPZ3uzRbMjd+RL+ouf5VWR+E4nt 9p/u1N0hYnk5Nf/mlBmlp+l1UrW5dhGI6odFgQ0l5rT38xfMPC6jrxfz9DkgDbFUi0MHuB yeRToYnZk3bt9rlO20zUNAAQEpc+Hnpq44NAqvNlhBjZkaBiy4M5MFOkZyHRTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724793998; a=rsa-sha256; cv=none; b=SNDgT60daATllSg35HrZbAXUjd81CONG8V/GIt99FNvQFvneUpx+qyxC3OuwMXA+D/B8wK 5FZ0jXzp5qMSLJ3ep5CetTwP2gMomD2Xb6rvlj1tQ346U9CkHlxZxsDlAaNSJd0pGXDE/8 /1mvCbyHM22ZvNyadkOzH0EECaO6RM9Olh+8sJDnSjOMbum+Kson5CLpkGiWM0NrQ8RxNv srrSejmhzldKzuAPPBuut604REAqhsTibwbWMVL9lPdQwTcLcy6OcHJdEd4xQ6ENbMGPH3 ojkgnuYA3paaeBT6q4T3sRHwdgC62f4JQFqPa+lzFLPz8G18KypogDdgYVsNAQ== 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=1724793998; 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=I3oBA8cGEg5pOqJd6TlM0ETayoPUh/tYJjsWgqAJQEQ=; b=AYmKtU+iBxQe9zMkG9TC6Rxx7eVxr5nkMXpQ1Qzg7gZ35qMGcQ26YIKzY4NyngQxRxomIq oJ+k2wmC84xQBfR9k48txCReSwgDN6tuGNnOxbqEDt5iSvNREVYIniRyER8uTkQwqtZyBv oEUfnBkGzBSxXE1Z05fdwBmQaJ5J41HwmGdFDmHB4t7Nt1bkbY8u/lES9XX7U8OzBNAZcl qcSZsfv2mUAp6x6T6BRlcPThNVnOfyJPMZMKeyoc/DZU7OFu25QenQIxs+JKPM10Umpy0o GBmCCyIxxcy1WpR8CLp6d0Zifz2RjwTJFmQRst+OEaS33ryloiQFOW4NoBK/fQ== 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 4WtgbL2YPbz15c1; Tue, 27 Aug 2024 21:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47RLQc3m034433; Tue, 27 Aug 2024 21:26:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47RLQc4H034430; Tue, 27 Aug 2024 21:26:38 GMT (envelope-from git) Date: Tue, 27 Aug 2024 21:26:38 GMT Message-Id: <202408272126.47RLQc4H034430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7b9327d6b2df - stable/14 - defaults/rc.conf: Remove /usr/lib32 from ldconfig32_paths 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b9327d6b2df22004d64406e51a9568e4245fb93 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7b9327d6b2df22004d64406e51a9568e4245fb93 commit 7b9327d6b2df22004d64406e51a9568e4245fb93 Author: John Baldwin AuthorDate: 2024-04-12 21:35:23 +0000 Commit: John Baldwin CommitDate: 2024-08-27 18:15:55 +0000 defaults/rc.conf: Remove /usr/lib32 from ldconfig32_paths Commit 99132daf6f70cb0cc969c555d3612547fa3cf1db prepends /usr/lib32 to the list of paths in ldconfig32_paths since it is a standard library path in ld-elf32.so.1. Remove /usr/lib32 from the value in rc.conf so that it is not listed twice. Reviewed by: olce, kib Sponsored by: University of Cambridge, Google, Inc. Differential Revision: https://reviews.freebsd.org/D44752 (cherry picked from commit 4bf5db113f760619bf754c22864b1d7e2acdeabd) --- libexec/rc/rc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 8b56a490b5ec..eb971a76ecf2 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -675,7 +675,7 @@ clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks ldconfig_paths="/usr/lib/compat ${_localbase}/lib ${_localbase}/lib/compat/pkg" # shared library search paths -ldconfig32_paths="/usr/lib32 /usr/lib32/compat" +ldconfig32_paths="/usr/lib32/compat" # 32-bit compatibility shared library search paths ldconfig_local_dirs="${_localbase}/libdata/ldconfig" # Local directories with ldconfig configuration files.