From nobody Wed Sep 17 14:15:48 2025 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 4cRgm46klPz67SND; Wed, 17 Sep 2025 14:15:48 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRgm42mwCz44LP; Wed, 17 Sep 2025 14:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758118548; 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=eAJnzUyVC/Wuhw1YWabZMvhhmDMbdH6qcaLIagnWnrc=; b=vMjc0eESjt9abH/pfu3EpV01Ht1qSTRMdQSeaZGjDMz1zyRrIXYk6A/rVj6urfip4duSO0 kga1tc0xYxrRmEgbJSdh5X+uMLyP14V7bC1CuTPg658akU5r1XS6raGQVPNU3w8+3lbrf4 f+M0UtYGetfnG0faJwolKGqNJv9kSBjnZ5YNfdcypN/tqDPicXvaWGUdzOFIYJ+46xrC8K qA3NZg3gEaexBJmcou7/tZtZTHyZT2ZhH41D1gWDyfOGbs+9HHkD0NeUM+8CHdSH0COVvi LmVw+Q4IVTgZmZXHEI8C5Ebz73y1YqhMGyEpBoRmCCkvjFvgW7S+uqpU7cS66w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758118548; 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=eAJnzUyVC/Wuhw1YWabZMvhhmDMbdH6qcaLIagnWnrc=; b=RUtqAxoR6F77F3kVkjeKQNsl/LcRW3l0/Vo2JTM04YNugMHzn+Og0EMyGvg+DPkwlY4gti pCzWv1AMDWfso2Ofvw+C6DkpIHpW7tfPt1TiXU0nI44TFOwdEimCdF0TqxSqvzkGyRv5UT vF7UroQ4bxfCNACDbDpV+ZtrNTIoRdRRtxmrvA+4Cj9x+C+iYaxh3OdFQkMGKf2PYLrch6 A6QMT2kp7UwrrU5mAL9TJoYhlArh0yjfnf+cxs2OkkwCKbnPRGG6c+yR51n66/YzX+lbs+ R/jsSMyUL60oS3/Fr+aW14CtTA2i63JXpqP/xbt5D7kgbqr3pP94vTa/x+DOTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758118548; a=rsa-sha256; cv=none; b=Zayo/YkeiLwAACm6FJEYhmohRnGGKLG+xOhOidsz4eMNPAblWLQfiEinWr9R4pEuoEt9Ob VHr8ZgP2o3bHxQL/pN7xE3Mn9cbaVG1D6OX0gNpuiw0wMmmVu3S4lgJUKhUZn7IMCDnmeB 6aNXiCcade8sQOAln8WdVfPeCJ2J1CVuO+QAzmonJi60XEdQhd7WKWb3fhwAFDTZ/lOnvS shc4gjLPdmumQIbVRKYqIXbslzE2XNfXkvRBbo9BstBLTklR/lWZSyu8D9bdHh1PdvpE2P jZp1At6X7N5zN9Ud7I93AE5Yco56MsSE3Ofl460VrmnpK/b/x/iwpt67D8DwMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRgm42D3fzTJ4; Wed, 17 Sep 2025 14:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HEFmGt010430; Wed, 17 Sep 2025 14:15:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HEFmp5010427; Wed, 17 Sep 2025 14:15:48 GMT (envelope-from git) Date: Wed, 17 Sep 2025 14:15:48 GMT Message-Id: <202509171415.58HEFmp5010427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 3c3322d7ee97 - main - pf.conf.5: rephrase macro section 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c3322d7ee974673f6b8f7a490153f3558e71118 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c3322d7ee974673f6b8f7a490153f3558e71118 commit 3c3322d7ee974673f6b8f7a490153f3558e71118 Author: Kristof Provost AuthorDate: 2025-08-25 15:08:36 +0000 Commit: Kristof Provost CommitDate: 2025-09-17 14:15:16 +0000 pf.conf.5: rephrase macro section In the manual pages for configuration files based on parse.y, describe the syntax of both defining and using macros, rather than exclusively relying on examples, which some of the pages do not even provide. In those pages containing tables of content, also clarify that the "Macros" section contains *definitions* of variables. Both changes were already committed to vm.conf(5) earlier. OK florian@, and deraadt also requests keeping these manuals in sync. Obtained from: OpenBSD, schwarze , 20aba01e82 Sponsored by: Rubicon Communications, LLC ("Netgate") --- share/man/man5/pf.conf.5 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index edaa160dddf2..02114b3eaf3c 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 20, 2025 +.Dd August 25, 2025 .Dt PF.CONF 5 .Os .Sh NAME @@ -92,14 +92,20 @@ keyword, for example: include "/etc/pf/sub.filter.conf" .Ed .Sh MACROS -Macros can be defined that will later be expanded in context. -Macro names must start with a letter, and may contain letters, digits -and underscores. -Macro names may not be reserved words (for example +A macro is defined with a command of the form +.Ar name Ns = Ns Ar value . +The macro +.Ar name +can contain letters, digits, and underscores and cannot be a reserved word +(for example, .Ar pass , .Ar in , +or .Ar out ) . -Macros are not expanded inside quotes. +Within unquoted arguments, the string +.Pf $ Ar name +is later expanded to +.Ar value . Ranges of network addresses used in macros that will be expanded in lists later on must be quoted with additional simple quotes. .Pp