From nobody Wed Aug 13 22:39:43 2025 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 4c2Nbg5ZCHz64cyq; Wed, 13 Aug 2025 22:39:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c2Nbg3fgwz3f7M; Wed, 13 Aug 2025 22:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755124783; 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=7mRA8NQJDQruPVxBxJI+ylMcZ7kLgQRgYCBXzea6CTQ=; b=S0rt0fhHngTPjL5VH9EZI96ei5jiLlQ2loUK+RPuSS+BcbeSlbxFO0kHvqf7niyxe8p03I /+AnZ8X2B5f1DeCDse9Ta+CaYJGpdf7v0jNJ2BrkSLHZTGIQY29fkDStguVXaHi9vphTKt Ufy2qJ5LWlUUQk47DEIf2hEjyneAJdbpSPuGfK176hrZM3xjHoRgsKCPKknW7rDA5hoGdK 0MXRrY4u75ZuFwkAGgc4bC0CYrPUfkW99S4XBdxhFkj05x0JRgjBVjIjZ3TsQgUCeMSepf 2cXo2hO5xBi1W3IOyOf9zPrR+URmO50jtvTjFKgZaZbSY9mQ0tQBotz/npM61g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755124783; 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=7mRA8NQJDQruPVxBxJI+ylMcZ7kLgQRgYCBXzea6CTQ=; b=jirejmjvdEwIIR3/tyLJtIpfP2xjaOM5NRfxmJqNrPaH/bsiDOVeT/FGYdC1cuCPprv0V+ iERlFmb9BEsBoL9Za8BDn8btnSl3HGHdZh/2mnQNAQyrDss/ptMboPFlfZ1RDsV5ZIE0MI N07GZ+gkgzcLA06bWlNUP0S9/qaoWBW5ZmsbuQMCKAvfq4ss5f/C8JdSE1XN4PLrUbcqBr s/n5CfSImDqfVyZD/yRT/X/SAciiKF6TTDUKF9nmB/5TWVH4vofE8p9VLsXZdxuoBBXr2y AVhsW+8ixrqeLeFzDg6n4etDEZ9zbh5n9cZDWRzipDrpLUQk+t37vIXnAycpVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755124783; a=rsa-sha256; cv=none; b=e/VSKOhnHLpN6Cm4ZCb0DPop+1K9Y3bRATmRT1RzQEXvawEs74DUTZotKraYxdJPIV1061 lGl1uvpPf/m6elFQNe3+3PGSrHDdthFppped5gOri+hNUkU1+iNzrzp6LpxC9/1jFbBJPB DaIdD+snGMmOb7BtjCZrk0BLUdSAviUym6irs+Y80bjNatEFXNkVTjWGuVjSxZLQh4yH6X a9MosTz0wPCLWStGQylbHtI0vpGrZWOUBaojQPH0+OSjszm6f69IRM25MFyjMx1wO3j8Hn rglnBGgc3PFe6zSE9ajtGcCWBe0rbW8AWSBy9Etp1RRDEu0TUMcs9TgC1E3h+w== 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 4c2Nbg3G6zzBNp; Wed, 13 Aug 2025 22:39:43 +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 57DMdhGm003415; Wed, 13 Aug 2025 22:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57DMdha8003412; Wed, 13 Aug 2025 22:39:43 GMT (envelope-from git) Date: Wed, 13 Aug 2025 22:39:43 GMT Message-Id: <202508132239.57DMdha8003412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c989e3cc3da1 - main - certctl: Fix bootstrap build 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c989e3cc3da1bfd8ac3ec5a05d1e86ab8ff719f7 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c989e3cc3da1bfd8ac3ec5a05d1e86ab8ff719f7 commit c989e3cc3da1bfd8ac3ec5a05d1e86ab8ff719f7 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-13 22:38:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-13 22:39:21 +0000 certctl: Fix bootstrap build Fixes: 81d8827ad875 ("certctl: Reimplement in C") --- usr.sbin/certctl/Makefile | 4 ++++ usr.sbin/certctl/certctl.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/usr.sbin/certctl/Makefile b/usr.sbin/certctl/Makefile index 5430dbf24853..6900f0ce3b65 100644 --- a/usr.sbin/certctl/Makefile +++ b/usr.sbin/certctl/Makefile @@ -7,4 +7,8 @@ LIBADD= crypto HAS_TESTS= SUBDIR.${MK_TESTS}= tests +.ifdef BOOTSTRAPPING +CFLAGS+=-DBOOTSTRAPPING +.endif + .include diff --git a/usr.sbin/certctl/certctl.c b/usr.sbin/certctl/certctl.c index 6687e56f23b4..365870167aeb 100644 --- a/usr.sbin/certctl/certctl.c +++ b/usr.sbin/certctl/certctl.c @@ -387,7 +387,12 @@ write_certs(const char *dir, struct cert_tree *tree) * Open and scan the directory. */ if ((d = open(dir, O_DIRECTORY | O_RDONLY)) < 0 || - (ndents = fdscandir(d, &dents, NULL, lexisort)) < 0) +#ifdef BOOTSTRAPPING + (ndents = scandir(dir, &dents, NULL, lexisort)) +#else + (ndents = fdscandir(d, &dents, NULL, lexisort)) +#endif + < 0) err(1, "%s", dir); /* * Iterate over the directory listing and the certificate listing