From nobody Mon Apr 13 01:05:51 2026 X-Original-To: dev-commits-src-branches@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 4fv8Nb2MHVz6ZFFF for ; Mon, 13 Apr 2026 01:05:51 +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 4fv8Nb1drZz3Zm5 for ; Mon, 13 Apr 2026 01:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776042351; 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=F/AWW3FbOuKjni6GxwEG8PoUkT7T82wh0c9vUBvMhSYo0C+nPHb/AK/J1JHJZ+FwNApjQa sd9beYl8YY0R4zrwHVCj7+1+Ee9V3DlGFDjD4urpDe98s0KRsT33DhGllOvNO4Sw4OEwX/ gvCNTE9UUN79PZ2zPnlRkXziJ3MHhwq0CowkRN2IFh/ZeXY0slzuHS7vXOJDYPgmaOtpqa 4U2YPbDXzAmzDvfgfan4Gb+yZqG4uUOhnb6iDRWydyqG17xBRgbPo5I3rFg/k6m5JjY3QW Hq9tocORTsSGsDQY20K1iPjmEnI+19l0WJqDOggUH27hk5dCZEv9GL604FSHZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776042351; a=rsa-sha256; cv=none; b=ga76He7774wQCJ/mAZebZoY02tDt4YY1iwvTFv5m3k7ksX0BBge41F57TKup3Z+G5/emq0 ou1BDkIHRu+YGt/L8dru/AYrypXbEgjeR+f7jqlbOl66uo555svsLUQRzKwT4TSW9kZYOO chz5FkHh4J52k+qZKRHGN0mYkWtN6WfwcWhTBOdA/QtloNfBFwiU1ExTrMrU0P2StwuQBz G5+7O/4tHpTdeM4dX9da/UMGXswgr7RESZ6yr4VDxK5EW/eacZTAVOu+WMZzp4aXIGaNWn k4FLDQME31TUc7H5y5kuHGbHHqdo1by3rcS9WstAT8dmIBk7IJ9bX4Qx2iY2LA== 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=1776042351; 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=bmBIsTDn5lRz7ztapOtIamQ8owcMX1+7/wrtusWzLMkbq5cLFyJGWSzNLuBKcbHWfUPXDD 9Oe217KcDAhZP9rG0MWHCRdFjnLn9AFLURtfjz345n01rIt4F499Cs7HRkK7X1LnjudhPR d5qd160oYu2TvnTVjfdc+qOi7B8oiYd2WHK6u/bikVQvPECjnnl8Lxlakk1wiYb1V7EbJe 5Ee2avZseNpdrOX3XfAe/JxGaLDfxi6aLkNpKLho6dL3KLrMjIKEHZveNlDhdYmBwNBwbR HFL5feb8ImG+ao2o1HXHaNrU5qkHu/5K9XFF8qVQubb5wG+hCSqChboQuRNQiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv8Nb0sGwzhRD for ; Mon, 13 Apr 2026 01:05:51 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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