From nobody Sun Mar 29 16:15:39 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 4fkKHH6w9kz6Wcvl for ; Sun, 29 Mar 2026 16:15:39 +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 4fkKHH50RNz4MM6 for ; Sun, 29 Mar 2026 16:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774800939; 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=ApSdjuKc0DIofAZNGdS6Ep/HxImbRw+tJ61zPadih1E=; b=lZvF8iY3egBVS10cBiDB9XFS4cGRvcv4AbFy33nxAxwNmwfenceCdn5eb8+Ma1FtevbtkT 0MXHUrtcNFmuRRvOekwgx79Q3Ggkk3HQdSUD6xSJZ2wI4viel8r51MVgKk6SWM7kt+AyTZ Ww9AdK8mXNmtd0iGVCQAwElzFEI+/BNNvgpoZaVhitaIvIQLT1D2uu5E3qIYhM8e79nd0M 7hgUj0dPRjI5FRsS7rq4G791Ze75nlapw4Lm0EPkDJ773SkiIzRJa3wc+w3wqrljhEDU8h dNf+wHLcfTULOZOyaMIr+iMWTyLqLjl+MTZDLeSRa/mLuGJmw5r3Ra/QaW+Nfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774800939; a=rsa-sha256; cv=none; b=k0G1/JXsIo/bftzErci2+CXbpqLVAuYuqn/Kz+xkP9m+rUpTQyGmoDAfms0bo+1I4RlP/G yDZz3ewivBRLfomNc0ogU2Uxt/vCpQMBZwV+3L+8FtnSojhZ/qABmPac19dudr9FjdNwOB lp7Sk7JFTWxopP0Bh5vCusEHD56VyCnxYY3Q4n8VS0tqb3th5oSagnmxB+KEYIZWcSSfAy wH2wRFis2x38DEOvfHLnSL7WdJPOxhGEc5t8odI1Hz+IrstQt0Lndz1uHZ+vSBXaMw3o2Z owk+9SeI9lKdze+VJhwAMLwDQ+fzLNPzb+UEP3114sdA9n3y+DlyAXJaR3MYRw== 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=1774800939; 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=ApSdjuKc0DIofAZNGdS6Ep/HxImbRw+tJ61zPadih1E=; b=AztQZ/7QF6ikljtOcGUz00AHgYdGE7WTsj85cDU37oW8XuwA4NmocKIu+5LzI3vIS6Ksqu 4TCPUvRUjyMw1PKOsVyluu5ohSpZ2Q3d1g7UqpnfbeTXKtq3ahLfdFGfy0DV2GNeZGdnJ+ rxwVRRrtvkLsMp7xqll8oSBTmk4VHRqZT8rL76gN0l5U2bJmdsUratQrV/5NZ3AyvyO0TN n03a4DjWgyXyf7UP7BXpAN/pPQLlI/GrVjp8i0ByaL0L/h6K8n8PTaej4q/n4ivqPATImj KU/KCTU5k6eCidNoXPLwVmWUvxp80u5qWtvEQN7rPll+DUadtW62/ZuMHjVmcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkKHH4c52z1J9H for ; Sun, 29 Mar 2026 16:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b998 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 29 Mar 2026 16:15:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 0d9676e1ca92 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0d9676e1ca92febd42fbebef8d6833a0939d3f7c Auto-Submitted: auto-generated Date: Sun, 29 Mar 2026 16:15:39 +0000 Message-Id: <69c9502b.3b998.15ccc98f@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=0d9676e1ca92febd42fbebef8d6833a0939d3f7c commit 0d9676e1ca92febd42fbebef8d6833a0939d3f7c Author: Jose Luis Duran AuthorDate: 2026-03-29 16:14:50 +0000 Commit: Jose Luis Duran CommitDate: 2026-03-29 16:14:50 +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 --- 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 ad503a132a2c..33ce061a1114 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 March 20, 2026 +.Dd March 28, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -259,9 +259,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 @@ -274,6 +285,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 1cadc8450de3..47538c138eb7 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -407,6 +407,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