From nobody Mon Apr 13 01:05:51 2026 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 4fv8Nh5lg3z6ZDxq for ; Mon, 13 Apr 2026 01:05:56 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv8Nh3xcbz3Ztq for ; Mon, 13 Apr 2026 01:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776042356; 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=J5nwZCmDZKlXaquKNMYNO6jRMX6EaFPxUkZgN0GTsPs=; b=A8YOBR7/E4bwAjLeeXInMYNipiXu3bzoQx9FBST96HyecWNV9D7vDcbidyxwsMHuo3JuTZ TxjEpSqc6yW5TQI95zSdeO7rcLwyc1WfV8ZWIE0CtKYjkSJHxOa5eBkhzzrJFm805c7EQp M0MGblZ6DqGmUtmb2wITFjBmLqfON+wgr1Gwn75fRGkEpkrYaEjQlbH3O2gE3GG55xQQxj eBptdp7TJGcSQ8XHnbjJ0tgjx1qgxwYAaxRnfQKXnWzna+Riq5t409MAE3dvx0Um7wtqDJ Qh+5ymPpp/h9smEep5yA1Xr+Es9keEpN5y/ca7oG7LUND/iGWeLzGB2BX9t1Jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776042356; a=rsa-sha256; cv=none; b=DleVQ3EQupYoti+A1ro5MjIq3S+umZjwY8EySXcJv3hP2HjmjG2v0zVg0jQKxWH3kLCwBu B9Ue+a2hAynabf0/mvw6Z60qaR4nDlZCScGZtTBPceOIED/7HjfCa6oZl7vEJCHZCpfzHw AT6tzgj4qw/TmjBcBVfl2yASkWV1rgFaf2qXVSlaCepZ0EnFie8pbF+6lic/Wt9JW3WeW6 c3EMuRbHqdgz5TKzvY1l0PPhdDGfkUIclvhycFirhldFfKXU0zQg67eJuiunslU54x2Fu3 qcSIpspA0lWx8JnH/NedpeBycRArtmFrBZKIjuNWTLfN12uLPY0HqJDD54NVhw== 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=1776042356; 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=J5nwZCmDZKlXaquKNMYNO6jRMX6EaFPxUkZgN0GTsPs=; b=rRF+fqY64L365qoTje/NkzQv1/IMxEUa5HL7xZW1ujUVAGNNYpzTYtltT/7F1MEnlKEIJK 2pABWKba/v9Vx54r3xE5nlmAbyh6EwlO9GGufNvJvBP677sA+1XU8Mayh8CXhvOGlgl723 aFUXKpE49vytJCNY5J2XtzulcINJtQGsl7KvpCBAmEPSTTYZ2bCvHFs/YQfMH4MHqj6nce 4r35us9F83E05Roo8PjwechAJD04UZLKvrFHX6vnWfIlh1jdt7HWkzN7+8rPmzHTrPEqqd HYFVGdlqr596AB2sDk5iE27lCoryxcMU7tySzJw+dUC0QQMe35JaNCo4a43baw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv8Nh32Lbzj46 for ; Mon, 13 Apr 2026 01:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a7e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 01:05:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: b5737f2ff8d3 - stable/15 - mk: Disable blacklist when disabling blocklist 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b5737f2ff8d382bdee12b19c7f27580a8da5023c Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 01:05:51 +0000 Message-Id: <69dc416f.3a7e2.4b9d5b5b@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=b5737f2ff8d382bdee12b19c7f27580a8da5023c commit b5737f2ff8d382bdee12b19c7f27580a8da5023c Author: Jose Luis Duran AuthorDate: 2026-03-29 16:14:50 +0000 Commit: Jose Luis Duran CommitDate: 2026-04-13 01:05:12 +0000 mk: Disable blacklist when disabling blocklist WITHOUT_BLOCKLIST, when set, should enforce WITHOUT_BLACKLIST. This fixes the build when WITHOUT_BLOCKLIST=yes is set. Reported by: ivy Reviewed by: ivy Fixes: 7238317403b9 ("blocklist: Rename blacklist to blocklist") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56118 (cherry picked from commit 0d9676e1ca92febd42fbebef8d6833a0939d3f7c) --- share/man/man5/src.conf.5 | 19 ++++++++++++++++++- share/mk/src.opts.mk | 8 ++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index d5f44e79bee7..ad1a2b3ed93a 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 February 23, 2026 +.Dd March 28, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -261,9 +261,20 @@ Set this if you do not want to build .Xr blocklistd 8 and .Xr blocklistctl 8 . +When set, it enforces these options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_BLACKLIST +.El +.Pp When set, these options are also in effect: .Pp .Bl -inset -compact +.It Va WITHOUT_BLACKLIST_SUPPORT +(unless +.Va WITH_BLACKLIST_SUPPORT +is set explicitly) .It Va WITHOUT_BLOCKLIST_SUPPORT (unless .Va WITH_BLOCKLIST_SUPPORT @@ -276,6 +287,12 @@ support, like .Xr fingerd 8 and .Xr sshd 8 . +When set, it enforces these options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_BLACKLIST_SUPPORT +.El .It Va WITHOUT_BLUETOOTH Do not build Bluetooth related kernel modules, programs and libraries. .It Va WITHOUT_BOOT diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 88fd83a3c723..a0bf8c2d454f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -408,6 +408,14 @@ MK_BLOCKLIST:= no MK_BLOCKLIST_SUPPORT:= no .endif +.if ${MK_BLOCKLIST} == "no" +MK_BLACKLIST:= no +.endif + +.if ${MK_BLOCKLIST_SUPPORT} == "no" +MK_BLACKLIST_SUPPORT:= no +.endif + .if ${MK_CDDL} == "no" MK_CTF:= no MK_DTRACE:= no