From nobody Wed Sep 3 16:15:01 2025 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 4cH7455SyZz66g7v; Wed, 03 Sep 2025 16:15:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cH7454Rsjz42tf; Wed, 03 Sep 2025 16:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756916101; 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=YMw/NLBSmGCSUby7yv3GlJd2QFomTUN4F+bMCMkzYFE=; b=PdK253KXu4rNBlzwjs/s+ss9X0L/LPyz6Ot07B7yuDpgbPordyljd3HF1h3gQTeYn7Kt+J wyz6xnKje26etalN1rH9NGI0lw7tjeXIUcIGkxC5O/G5iUsXe3Si8lOw561Mr8HKJ89xKJ aDU7swv5ol/ol/v7Jknlf4i3Qe+ZTcZhFkHB+TjEk31FbFykOGNZQClyc2+luaYIJIlUdV lFlxKNIH5XeZD/GK5aXLM4q/KpaOuUDJrFCQn0AycmeZ0hTrJs//Za2Sa5uQNQqzJPyBJX KsYSyUo0EGyRBKh3IWXTyA7bKHaxaRM1mpn4CdP9N6g6qN4GUCPwazQWJtMzOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756916101; 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=YMw/NLBSmGCSUby7yv3GlJd2QFomTUN4F+bMCMkzYFE=; b=NI4obJU7gif4swx7Jo6eP4JVTd8ef3+ot1bpjjFG9RTNr7G/iGTr918b9V9v7CvCqcAXrs sS2kvnZW9FPGXB489NkpnR0AhaVLY/mOUtCQQux8N0wvHXcpOKBe61qJuEWLmA6jYTZTKr MHNWHeSsMNPROw5ryXYOhSyrdJflLDB6VnhBJywUgbpScEyfUANOrscL2O8Ok+incDvcX0 I1MJzVTngV7YTDf7KBjcdNLmTTRM1QOxND+8LNi0mC3DJGN4wLurU6t1l+u2JbhSIl9Xny nTJmzNLLYRvwsFJbRL7Dk4pqU7Bq5hn9+grU4OpJHbtvnEgxOblWs22iONHvlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756916101; a=rsa-sha256; cv=none; b=CnXfAPodWuL67cUIoB4MNcdxG1DP1Wl28qIZ+E12z9aXl/Jfs4lm0bsQswdsC5N12m789H hR2XfY7L2BcX5M4uLuhVpdrp5rAXXwCqH7KxH+mPRiwjpJZoGd6G9rj24aGUVvGAbxh/VS ZwVeMjoENFB/LKZ1s7WsZTEufh3cysJPoVA1MO3koeg+PDhXp89Qlf31eVI0+RxCEhubK0 zzavHAI4BEw1DI8Q+OQ7ncK8C2Z+wN8vRWZH+ZUQ+xk8CQ9coSK6WycksKTKIxTRJ35gLg za8HTOLXdrTuN1Y3Kjbjq9FC23SaTsUR2o7z1KQtg7l/xcj1yyw39dmF89ik6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cH7453xzPz8JP; Wed, 03 Sep 2025 16:15:01 +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 583GF1Mb096794; Wed, 3 Sep 2025 16:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583GF13N096791; Wed, 3 Sep 2025 16:15:01 GMT (envelope-from git) Date: Wed, 3 Sep 2025 16:15:01 GMT Message-Id: <202509031615.583GF13N096791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 13e7b21901a5 - main - Makefile.inc1: Build openssl as a certctl dependency on old FreeBSD 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 Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13e7b21901a5e246e4b42d28e930ec80fe6889d0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=13e7b21901a5e246e4b42d28e930ec80fe6889d0 commit 13e7b21901a5e246e4b42d28e930ec80fe6889d0 Author: Mark Johnston AuthorDate: 2025-09-03 16:14:37 +0000 Commit: Mark Johnston CommitDate: 2025-09-03 16:14:37 +0000 Makefile.inc1: Build openssl as a certctl dependency on old FreeBSD X509_NAME_hash_ex() is not available in OpenSSL 1.x. Reviewed by: des Reported by: syzbot+54c1e57e7184582a8f59@syzkaller.appspotmail.com Fixes: c340ef28fd38 ("certctl: Reimplement in C") Differential Revision: https://reviews.freebsd.org/D52291 --- Makefile.inc1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3bbc4afed3fd..01866f949e49 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2714,9 +2714,10 @@ _basic_bootstrap_tools+=usr.sbin/tzsetup # certctl is needed as an install tool. libcrypto is rather heavy, so we'll # build that alongside it only for platforms that don't expose headers for -# OpenSSL, like macOS. +# OpenSSL, like macOS, or when building on releases with OpenSSL 1.x. .if ${MK_CAROOT} != "no" && ${MK_OPENSSL} != "no" -.if ${.MAKE.OS} == "Darwin" +.if ${.MAKE.OS} == "Darwin" || \ + (${.MAKE.OS} == "FreeBSD" && ${BOOTSTRAPPING} < 1400000) _bootstrap_libcrypto=secure/lib/libcrypto ${_bt}-usr.sbin/certctl: ${_bt}-secure/lib/libcrypto .endif