From nobody Tue Jun 20 00:23:30 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 4QlS6B5sbQz4f0FT; Tue, 20 Jun 2023 00:23:30 +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 4QlS6B5KNHz4J6y; Tue, 20 Jun 2023 00:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220610; 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=ccFGntROnIpqcjkJiyznxgCc/0cg1BJn0w52msgI+1g=; b=OIRQDq6T8I5IjTAX5GG4EX3g2Ag4n321Td2lyUFPq9AYd24KnmAaPoyq1G5e0YFlxMM51e 3ddG6nBF3LzAD60mUOJlAZihRN6KS+4MOUV45VpM5+oodPe8HPXLeftKtTckqtloVsiCEL idgINQbERkAEjwsGkpIUCkdgEOAczFDWbHiOUbesezYkrD6yMd6Pm+wPT4MvEHrSOxlZtd b5x83/4z6mDQbArQFVFQtsikOvB5W2VNKetsqu01uV2km39z1T7cdh6CyWcMcf4oebEGdP JIWJtd+uDuRzjf/U7EbLBYNgQzZkUEDH5CpEGqm5Iz3n94Js/HZgzEBfs5d31A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220610; 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=ccFGntROnIpqcjkJiyznxgCc/0cg1BJn0w52msgI+1g=; b=bYPJ5DttCX6LT5+rXwsJ9n4ofSUZZok7lve/X63svMDzwe+BC6wl8kZwvhlL7SgyoVIbSX XsSY1I/lBX791aedxgVNbaS0+cbG5mafqkBwcfT5q1m8WghesB//GzUJGsaih8U4DbqPIV /Utz94qw5Lh3k+ffErOXXFnV810VYXS/AD3O5XdhdEeTAIbpdqBkjBXSqIXIeLkvNpivmc o7osDuOVm87U3xBgS9vOQzlziIJuBD66qUp/92nJFfYXAgJTxykbOunOiPuD0eo7Ym2Q82 +BO3o8KHtDT52xrXs0vZ27UMT33HJAcqgzb+Dwmav8PZa2fvlzDhtNB0Dq15MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687220610; a=rsa-sha256; cv=none; b=js85ByUigWP3folSpsw+L6wNkhcSHQI3YyEVPQT55VMKCIy68tiFKsDfovFyjg3ss9ZahA /kgCCQ0WrJsF2cU9AWLnn+MgtXnuH728YhJPYdteb5353VEozLq9lAEKTazhocMUHGwNrq 5rm2AOB72EBHAntUrUCXAppEy1AKxK+URpCA62++PdyacY1j6EpqmM1Atxpya6sV5mQvP+ MvQq20kHiQnGBevooZcksSsOWauwMBmtW1/7Lztld1KrBtJWmbR2Qbkg/X+f2vQAWHC1hq qjDAKiSLdjVKwV6GiGRIJ3w1KRjdpsrMVcq/6/Mfd/TxFLF9lBKzAm+L5eck1A== 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 4QlS6B4FjSzdnH; Tue, 20 Jun 2023 00:23:30 +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 35K0NUDS057518; Tue, 20 Jun 2023 00:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K0NUmI057517; Tue, 20 Jun 2023 00:23:30 GMT (envelope-from git) Date: Tue, 20 Jun 2023 00:23:30 GMT Message-Id: <202306200023.35K0NUmI057517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c24c117b9644 - main - Remove WITHOUT_{CAPSICUM,CASPER} options 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c24c117b96445ecdbd4bf9856f88118b376296c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c24c117b96445ecdbd4bf9856f88118b376296c3 commit c24c117b96445ecdbd4bf9856f88118b376296c3 Author: Colin Percival AuthorDate: 2023-06-18 00:03:56 +0000 Commit: Colin Percival CommitDate: 2023-06-20 00:23:09 +0000 Remove WITHOUT_{CAPSICUM,CASPER} options At this point CAPSICUM and CASPER are merely forced on via the newly added __REQUIRED_OPTIONS list; after stable/14 branches I'll sweep the tree for MK_{CAPSICUM,CASPER}. This change will not be MFCed. Discussed on: freebsd-arch Differential Revision: https://reviews.freebsd.org/D40592 --- share/man/man5/src.conf.5 | 12 +----------- share/mk/src.opts.mk | 4 ++-- tools/build/options/WITHOUT_CAPSICUM | 2 -- tools/build/options/WITHOUT_CASPER | 2 -- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 08511661e328..815ffc62fc39 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 May 30, 2023 +.Dd June 17, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -260,19 +260,9 @@ Build some programs without optional bzip2 support. .It Va WITHOUT_CALENDAR Do not build .Xr calendar 1 . -.It Va WITHOUT_CAPSICUM -Do not build Capsicum support into system programs. -When set, it enforces these options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_CASPER -.El .It Va WITHOUT_CAROOT Do not add the trusted certificates from the Mozilla NSS bundle to base. -.It Va WITHOUT_CASPER -Do not build Casper program and related libraries. .It Va WITH_CCACHE_BUILD Use .Xr ccache 1 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 8120e23cb28b..3c17f9319619 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -76,9 +76,7 @@ __DEFAULT_YES_OPTIONS = \ BSNMP \ BZIP2 \ CALENDAR \ - CAPSICUM \ CAROOT \ - CASPER \ CCD \ CDDL \ CLANG \ @@ -217,6 +215,8 @@ __DEFAULT_NO_OPTIONS = \ ZONEINFO_LEAPSECONDS_SUPPORT \ __REQUIRED_OPTIONS = \ + CAPSICUM \ + CASPER # LEFT/RIGHT. Left options which default to "yes" unless their corresponding # RIGHT option is disabled. diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM deleted file mode 100644 index 9d0eb89e491d..000000000000 --- a/tools/build/options/WITHOUT_CAPSICUM +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Do not build Capsicum support into system programs. diff --git a/tools/build/options/WITHOUT_CASPER b/tools/build/options/WITHOUT_CASPER deleted file mode 100644 index 32bfa960d7d5..000000000000 --- a/tools/build/options/WITHOUT_CASPER +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Do not build Casper program and related libraries.