From nobody Wed Jan 28 19:20:21 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 4f1XD633h7z6QdMQ for ; Wed, 28 Jan 2026 19:20:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f1XD61P83z3pTd for ; Wed, 28 Jan 2026 19:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769628022; 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=rneltlCeLfnR86auUYrLbZ+nx3RxzcE+njSzDwLsqDE=; b=wodRKCDXbNJa9mwQaU3gGQI18pEtlk5lClqX8+SoeI7snvxtR3pgzLo5K1B41unv2ozFSv h9kZpk8J1f7kUkK8OcYJyQf7KbqxNNkRPb3sKTe7zOVNMhF/3DnVVaImAEBg7FV9i7Sbyh pcMX/SJBU77ZoDDj7Pjf/s/3FL1UBz0Q/83qCW3s/qJvu1QasOBjaMQjIR/34RiGfRBtlD NqHtXVU10azvcsItj3wJtrUkMGcOC4g/RDL0Y2LjzygBnU9g3Jj1EwkcvJGWNVMWyst5Bt +/7NTURhkcYIKCGXuBg9lO4y2oqdpPIFen56deHL4q/nSiP7PGbVnuQsdL0/nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769628022; 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=rneltlCeLfnR86auUYrLbZ+nx3RxzcE+njSzDwLsqDE=; b=Nj26tBHC3P1YcAXBuoQMKJonF2xG13eWXPc7qC8QlTDrAanheOyz0YIud84vJ/gOMrGczk PclYgAdsdE5gMBi5htqlN9G9BH4QxinJLBnxqo+e6SX6jWcPN64apNe9aROkLhjTDqXZUk JDhEfcTUQ/0aFqhxKOLdSaiRTcOomewL4CSeeH4IvThm3dy2yeuzTm+zNBgJcOOpz54otA 1ZOQeki5zoADFNsX+fu0QGGfRMEsve0M/66CuP/H8Xwm6ekMV76PaZGAiGpEAf6FH/KCRI 06hHYGjnogkz2B/TGDzD6R2+U3/JErVD7vmDcLPItVlBnGcfi0v4/9DGuCAfCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769628022; a=rsa-sha256; cv=none; b=EIpEhxhvOo2YhgOzsCFS8JrEi2IS8jDXQIte49+F9BFEvK/BOz8nvKeGtJdeVWR7W1Rplu lZjzZi4qk2jSw0a2WckhqnbOMnepdBnzem0jQjyneTunIfIIdCX08ghhmu7us4CSyAhFK0 VrYVNrnPRc4WL7w3g6FlvvLBfg4Xei+oTaDdcHDG2fUEEDlM6xOYiY7r6wuhCvY/5eEZmB yFr9MucuuIxL/9v6XLuXBULrLUExICEzvOjMFl0yBf0E20kjFmrxm70UUGx33tz3/Fe+jt oCYbwVo1vk61QmvRQ2Zffo5AzpWZM3SQK8ZGjWYzciQSA2cRm4YPa3kefW4wDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f1XD56jVSz14dC for ; Wed, 28 Jan 2026 19:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 212c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Jan 2026 19:20:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 19709a0cd866 - stable/15 - pfctl: allow new page character (^L) in pf.conf 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 19709a0cd866a6ce8f9b0858b360c584da8cb6ce Auto-Submitted: auto-generated Date: Wed, 28 Jan 2026 19:20:21 +0000 Message-Id: <697a6175.212c0.6b33928@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=19709a0cd866a6ce8f9b0858b360c584da8cb6ce commit 19709a0cd866a6ce8f9b0858b360c584da8cb6ce Author: Kristof Provost AuthorDate: 2026-01-14 06:18:27 +0000 Commit: Kristof Provost CommitDate: 2026-01-28 09:08:06 +0000 pfctl: allow new page character (^L) in pf.conf PF configuration files can contains many things. Using the new page characters (i.e. ^L, \014) to mark the beginning of parts is useful because many editors such as emacs and vim has facilities to jump next/previous ones. PR: 86635 MFC after: 2 weeks Submitted by: MOROHOSHI Akihiko Submitted by: Simon Wollwage Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit fc353e5e61fadd6ef618948f417f96381c08239c) --- sbin/pfctl/parse.y | 2 +- sbin/pfctl/tests/files/pf1078.in | 3 +++ sbin/pfctl/tests/files/pf1078.ok | 2 ++ sbin/pfctl/tests/pfctl_test_list.inc | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 05bc97e2f2ef..c733a9496a59 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -6875,7 +6875,7 @@ yylex(void) top: p = buf; - while ((c = lgetc(0)) == ' ' || c == '\t') + while ((c = lgetc(0)) == ' ' || c == '\t' || c == '\014') ; /* nothing */ yylval.lineno = file->lineno; diff --git a/sbin/pfctl/tests/files/pf1078.in b/sbin/pfctl/tests/files/pf1078.in new file mode 100644 index 000000000000..11ce16d5fdc9 --- /dev/null +++ b/sbin/pfctl/tests/files/pf1078.in @@ -0,0 +1,3 @@ +pass in proto tcp + +pass in proto udp diff --git a/sbin/pfctl/tests/files/pf1078.ok b/sbin/pfctl/tests/files/pf1078.ok new file mode 100644 index 000000000000..585236af942a --- /dev/null +++ b/sbin/pfctl/tests/files/pf1078.ok @@ -0,0 +1,2 @@ +pass in proto tcp all flags S/SA keep state +pass in proto udp all keep state diff --git a/sbin/pfctl/tests/pfctl_test_list.inc b/sbin/pfctl/tests/pfctl_test_list.inc index 8bfccddf50e5..b686e23b1da0 100644 --- a/sbin/pfctl/tests/pfctl_test_list.inc +++ b/sbin/pfctl/tests/pfctl_test_list.inc @@ -183,3 +183,4 @@ PFCTL_TEST(1071, "mask length on (lo0)") PFCTL_TEST_FAIL(1072, "Invalid port range") PFCTL_TEST(1073, "Filter AF different than route-to AF, with prefer-ipv6-nexthop") PFCTL_TEST_FAIL(1074, "Filter AF different than route-to AF, without prefer-ipv6-nexthop") +PFCTL_TEST(1078, "New page")