From nobody Tue Jun 20 03:22:09 2023 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 4QlX4K57wfz4fpCS; Tue, 20 Jun 2023 03:22:09 +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 4QlX4K4fHzz3jRp; Tue, 20 Jun 2023 03:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687231329; 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=CMGVsT1bvhxyxzLoMnMnye6kxBneTtXl6A6rs2kM2qI=; b=Z5QM4tnsAfJ2eGYS3XLxPHVO24K4kG8VMjHsBcS/xUPw+E6DsrhKBxJP6/oYtf1rXZB60i eYKGMJDFKzjOEAzVO68zZuC1yMgqe1XXZetg59UoJOiP02fQl0zg8iCFs4NDTgm4Hp4G8Q Hx6qL+CvEzEWZ3cE+3eGB+5K+yej8WW6fWsCm5qgpCLu+R1jzq+sC1fSgreSpz1eXutCrs /FC8p+TYrZ66IopKTM1rI8wsMcxwzuJi1Qe8wtwYmUAl4lBg+T4tCMVNEepYbqGKPTShBc 9Rc5417AJithcGKo5A9zxz4MiBiQ/IfpdmktZLvfR3IJXYDV1Z0OgkDQ1Do4Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687231329; 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=CMGVsT1bvhxyxzLoMnMnye6kxBneTtXl6A6rs2kM2qI=; b=tcSJJ9Sx6KkFqhbtYp5P6EynS9pXZ7FcZv6uTfZ0aAFiJC1biTAKUWK0cGis0t1kFS+AgH Rg79sa6EjhbiQ8IPQdoN/dZpjJb9dKaClS7JR/cZe3+8vMBcJLwz4AK+5neWA0HqKHFsXE Ds33y4sX+j95cUN9psZqFTvv+8bMP9BpTWLK5ef7N4AZGcXmR8hJUJGsht4t2Cr/3g4p6W te2aEmM/dj9DlrVW9EtIsrjJyu0kwqRv2/tyEcfQ0CQKbgbQ5wh6BDrkh0USxuLo9TSDOe 5dWXwb89azuLabI/cY3H3rB4ZtqOuBnAsGVMj3SYrjsX6zsCdSEx+JqFEUYUMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687231329; a=rsa-sha256; cv=none; b=thZbHLZxJyEhxOAfteeH0GCWTGhAJRrzHGZuahamPzkgHTp+l0vTYSV/KNQHu7l52Gr3Xk 6+v6DfTnkB0ED0OIiB0iGthJSl0+AS7teP54Bd9adg5i45ElWwJ2Z75xKwpfXkgailNmIU aXaCCYE1htR1xLLtKC3YyCmr0ZAykgYuPqpJvcR1wcWHtmIQwZZ/6OtpltWsqeuIxJhtXU vDpfvg17NtL8v5LkINUf+7SDvBBL+3DS98bbl0lgpV8+1ZZgzcdoqGnwa8OzYhC40IuNXM WI6vsa8tbOnW/OCpICOoUXfl0AVgXiXEiluLOnlFr+hWx5Lc46LtU7hr/YKbJw== 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 4QlX4K3kVdzk4k; Tue, 20 Jun 2023 03:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K3M9pQ051234; Tue, 20 Jun 2023 03:22:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K3M9D1051233; Tue, 20 Jun 2023 03:22:09 GMT (envelope-from git) Date: Tue, 20 Jun 2023 03:22:09 GMT Message-Id: <202306200322.35K3M9D1051233@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2e65cfd3adbc - main - Restore dummy WITHOUT_{CAPSICUM,CASPER} descriptions 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e65cfd3adbc56df7bd86c507aae6730d941f391 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e65cfd3adbc56df7bd86c507aae6730d941f391 commit 2e65cfd3adbc56df7bd86c507aae6730d941f391 Author: Ed Maste AuthorDate: 2023-06-20 01:49:59 +0000 Commit: Ed Maste CommitDate: 2023-06-20 03:20:49 +0000 Restore dummy WITHOUT_{CAPSICUM,CASPER} descriptions The makeman CI job ensures that all options have description files. Bring the CI job back to green by adding back WITHOUT_CAPSICUM and WITHOUT_CASPER description files (that now state the assoicated options have no effect). Fixes: c24c117b9644 ("Remove WITHOUT_{CAPSICUM,CASPER} options") Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 6 +++++- tools/build/options/WITHOUT_CAPSICUM | 1 + tools/build/options/WITHOUT_CASPER | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 815ffc62fc39..869eccd03a49 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd June 17, 2023 +.Dd June 19, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -260,9 +260,13 @@ Build some programs without optional bzip2 support. .It Va WITHOUT_CALENDAR Do not build .Xr calendar 1 . +.It Va WITHOUT_CAPSICUM +This option has no effect. .It Va WITHOUT_CAROOT Do not add the trusted certificates from the Mozilla NSS bundle to base. +.It Va WITHOUT_CASPER +This option has no effect. .It Va WITH_CCACHE_BUILD Use .Xr ccache 1 diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM new file mode 100644 index 000000000000..19d821f6c981 --- /dev/null +++ b/tools/build/options/WITHOUT_CAPSICUM @@ -0,0 +1 @@ +This option has no effect. diff --git a/tools/build/options/WITHOUT_CASPER b/tools/build/options/WITHOUT_CASPER new file mode 100644 index 000000000000..19d821f6c981 --- /dev/null +++ b/tools/build/options/WITHOUT_CASPER @@ -0,0 +1 @@ +This option has no effect.