From nobody Fri Apr 12 21:36:25 2024 X-Original-To: dev-commits-src-main@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 4VGVHs4mN0z5G9dS; Fri, 12 Apr 2024 21:36:25 +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 4VGVHs2mlwz4knK; Fri, 12 Apr 2024 21:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712957785; 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=mkpFV6mprXMaM9TNNIt4Q3FxflgS2lAeTfSz4CYspjQ=; b=nhuEsAfS+KNDsKcsG2pCP5TiVfMF2LBg7nb69MH0vluVaZddTNPL+jb1vP3izA9y4kAs+a x2jluaXJxuVF2wCvNSCl0EKC10mw5IFWi7L1G9Pq8ufSHRwaDKgMgQW8gEiGiNE8+9s71g vAEaxERR4ciBUT37eUcgagbPbYZy5FGTaAZJ3CF1+MJcARwTbIG10yKgfcjRo24wrakUv7 AVayWgKjXg764PH83vu18tutdspRr7C9WDgxKveRqeXjA7cdJNx+sD5RdFovK5JhqCx9xO SOokfKqttWoyZdZWbC29EXqj692ug3U2EBYxtrWwdiFXAqADw1t/S5JFRUMwLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712957785; a=rsa-sha256; cv=none; b=majFq/alJ5blbH05BWavEylVOERiwniTkyRaOs9oinGdyML22IXMEGJijFPAEBn9u3eNOO O/0H+kUCsvDzRXFGpDVKY6YaaA104L4rcuxmB/L64Mwd4Dv5AHzOjXJb8Tn2Nob61BZfE7 yMIJ2/SW9Uv7kE6UxAAIZLGos80Snv2DJFYnTkpYIG/P3vZn8gJ1JxLN3nT7vfGIgJLr+A gy7T4LjoRSIVUwDqc4GWFccYFGR4qz+gauGdpQNuz9FufFldNXOX8fqTNrWZ+y9pWpZ/oB GAEA5bDNx3VMKPzUZ6lmS65NNrQE7ajKWmcJxWZKujp+GLe0OKJE51M2Bq+HqQ== 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=1712957785; 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=mkpFV6mprXMaM9TNNIt4Q3FxflgS2lAeTfSz4CYspjQ=; b=HrQ58VPWSk4XztfvsjdimCHgALi8uTe8TUBDvx1W7IMVrZMHfutZrG/FnASTpHB2rB/fzX S+dczW7sPPjVF2BrWuYSNmTzrhcZu2KLFyf4WD1Cg6L2iGsU6J6upSqOXVIAAL48ctZNHF w1Z451Us8fXZJOyDIVvBFhMXQoR6WHWGoX7QLNLj3fqpH+kTaXsZB2m7Uh2DiVQkdmBFfX F6zJX9zbrjH8HvE0Fa76+o7QE8UwxunwKQixhhXWB0pZ6P6a2mjlSqqft5dqiIiA/0PPIv wFbQmqFukoqtZzNRUSqaoMPh2e0DdCXLrJc+b8PhiyyYsGj7++QnUt2Kier3VA== 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 4VGVHs2JtNz15bF; Fri, 12 Apr 2024 21:36:25 +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 43CLaPMk016271; Fri, 12 Apr 2024 21:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43CLaPYl016268; Fri, 12 Apr 2024 21:36:25 GMT (envelope-from git) Date: Fri, 12 Apr 2024 21:36:25 GMT Message-Id: <202404122136.43CLaPYl016268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4bf5db113f76 - main - defaults/rc.conf: Remove /usr/lib32 from ldconfig32_paths List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4bf5db113f760619bf754c22864b1d7e2acdeabd Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4bf5db113f760619bf754c22864b1d7e2acdeabd commit 4bf5db113f760619bf754c22864b1d7e2acdeabd Author: John Baldwin AuthorDate: 2024-04-12 21:35:23 +0000 Commit: John Baldwin CommitDate: 2024-04-12 21:35:23 +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 --- 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 2fa3b676cb38..96dd0c534dc2 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -674,7 +674,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.