From nobody Fri Oct 20 19:52:28 2023 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 4SBwGj24qbz4y90K; Fri, 20 Oct 2023 19:52:29 +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 4SBwGj1Z37z4Mq4; Fri, 20 Oct 2023 19:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697831549; 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=X2JPns9YDUMyf1A0pghCsXOh79asuPf8h8UG/vjYUaw=; b=WTTamQsX3MgLOraWwXS2skiba/2cglztzvxVameGY1bawg7WbBMacK/hEHlTxo/xEb2CFo uuR0E3YQmT4STHgb+DC+ARU9GCPv3IyRuYCBIogF4hPnSdPIJFd9KxphJ9t/03wjVjvPJy eCHKqhN0fTQ8EOiHYMXW0bYPiZwvKggfQg73D55ESfcIobK9IzBj4l1wD+DJ2hhixqaGdE iVzsCux+OyTurkVs2LQZwJg/Yih/I5Mg7gQlDo99nPqMRpprkL4FprMCWQq6sqN2TW7Zrb AG1mLE1B3ES/R9ADTypTef33NvH/tEcqKqy8NXI550b0xDQTVVGzsJLs2KcMAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697831549; a=rsa-sha256; cv=none; b=Y2irR+Xm+t53Vm7g+2fEtWdbAj6hETcbCJ4Py7Y2kSXO5pA+3soHoyMXBVElVFRAOB2RMi RiVkWtg8tr414qAJteC24c7UkGN1lkqZM2XmXPbaJ3yr8XaiBIvTGyz+wBrMX+w1OxjFlu e26JJazoL3jaq51tAiszgeqaAONzhd/gkgBue128jQ9MYeSHurJ3vZvrp24VnqTldtakQx 2aIymjt7LcSQqFjK5pMTVHB2MG/LENkfUT48uw3dw+BqqgzsDbN5a53CWmIp8xAE6fe/g1 7dTfrRMiXwGfgHqojgGcSAni2suMz3KoTzq30QadDZcNhoVOT09rLV1MAs4krg== 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=1697831549; 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=X2JPns9YDUMyf1A0pghCsXOh79asuPf8h8UG/vjYUaw=; b=CZz9jZC6Sr0xLquD5tVQrNguD5FUdXnnSdcW3p/Qbbn9yDZQ/AuFLvi6qE28LbzcZAfvv+ jyjxAbYsNM5Hog3T7Dr+Ccx7ayKXj/uFH/9wCvWB9MC1Uz3ZBvCnAWRuFLItRrl38wFxsv e1Bi5QdGMagemsnWqRGQQGUhFSVVQoIPWtF7JXNHGExBW7Yw4qpWMhJMhoAOll9CymIrAG K1d3y+Hm7MPQrpgBHgerhw+mBef4Ru/WKJu8FmzLM6MVP2Gfa4wn5wvFR2G25J04bJIEP6 NDqv3u6erAGSL32WJJ4s7EIWrOdPfuzkxI8+EEjzdTRBfCLTkH6QMVGDHMK66g== 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 4SBwGj0gbCzmGW; Fri, 20 Oct 2023 19:52:29 +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 39KJqTdQ021475; Fri, 20 Oct 2023 19:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KJqSdD021472; Fri, 20 Oct 2023 19:52:28 GMT (envelope-from git) Date: Fri, 20 Oct 2023 19:52:28 GMT Message-Id: <202310201952.39KJqSdD021472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0e0c4f58370f - main - certctl: invoke with LOCALBASE set 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: Sender: owner-dev-commits-src-main@freebsd.org 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e0c4f58370f25cdd824df06f38865b0d455a183 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0c4f58370f25cdd824df06f38865b0d455a183 commit 0e0c4f58370f25cdd824df06f38865b0d455a183 Author: Brooks Davis AuthorDate: 2023-10-16 22:35:40 +0000 Commit: Brooks Davis CommitDate: 2023-10-20 19:52:10 +0000 certctl: invoke with LOCALBASE set When invoking certctl as part of installworld, set LOCALBASE in the environment to match the build environment. That ensures that LOCABASE is non-empty on systems without the user.localbase sysctl and avoids allowing a system configuration detail to leak into the build. Users who wish to build targeting a non-standard LOCALBASE should ensure it is set in src.conf or similar. Reviewed by: Mina Galić Differential Revision: https://reviews.freebsd.org/D40530 --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 68549d91598d..512c4049fd76 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1489,6 +1489,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .if !make(packageworld) && ${MK_CAROOT} != "no" @if which openssl>/dev/null; then \ PATH=${TMPPATH:Q}:${PATH:Q} \ + LOCALBASE=${LOCALBASE:Q} \ sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash; \ else \ echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \