From nobody Tue Oct 28 11:53:28 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 4cwpfx10qNz6Dm6b; Tue, 28 Oct 2025 11:53:29 +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 4cwpfx0QWKz3VfL; Tue, 28 Oct 2025 11:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652409; 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=aWf0zcs+ll6mXAAXtpttTVK6QFbcB70p1Wh3b2lYDqY=; b=bQQ1T+hXZGuIa66n+t+cMeBwMD/zN3NauB7p1DJ7t0/ZdI+EKsLgjV4rkA5EAE/0SYD/0F tGDhPsDWMgSCOAWDyHdJPWyPklXi9UBpoGPNBvxH4lJWcm/D6E0XH9METcCpET+idNsfVp CZWplUs/FClncDdx0TBcoZvstmAztho/js2zH+vX7EwrgpFdFGLUb7pbgP7XkA8bh+uVOL kJAD1nvb/+KIwwhZz4AKlh2+KLr9t6XyEakBj1n2hWL135GEjomBAZe94XbkE6BtJkYxZK 24/M9Tl5gct/RpoNrK9f1OgMmHGZmq5jyspti7gGATsCM8sALExQkU8kdRq3Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652409; 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=aWf0zcs+ll6mXAAXtpttTVK6QFbcB70p1Wh3b2lYDqY=; b=tg3IS/3GQ6AG5BRzefBx0BL3puoraKtdlVeHQA61bruVbWtS9aOp8yf9cj0OyIL5Qv2uE7 KjOnXPxfiQMIVa+E+t92Bhpexmg8CWg3yppRyVGay0tw5qFf6vgf46sO9tyaFxMaH/DgCb 9oD6L4Voik0YPYrB2GEu5soJNpV2xYrnEqvvmfCSgpqDlW8EotvJ8vBVcGdRQxEf0YrikF 2+Bxp+LKhwZGc52VHIXOHmst4fQitZz9e12VpIy+H4LysfgCoDVhUKXkjhy16iyAk9Fqjm z7h30SpB2DF6LmIwHceRI43aGC4msH3QGBr+IZtmBkoE9qLSYiqJlWT148lm6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761652409; a=rsa-sha256; cv=none; b=nCqbi4HSjqUJ4S+C7fI6wyBrdwKZtxBTzhB7ZS4oxhY13RadVkx0UEfnJiL8Wzwyi97mgq mtvMZsfBUtHz5ix2JD3UthMmke7Ut0OBUSw2W7aF1Pvro/j0TBEdIFJwpC7TCviIGDzopR LBcUAWgAYCN1FPilcU1va2MgMpWVYDnap1qQexTRjCnG9cUtgUwR0rZ+uObWqXQG+lO8Rl sYih/ThKCeWS0gLm83yhS9b8HzmhLtJ587nuFBYfPvvtQHVTFZsHlBtg+uDtmhootmRyjS Tn/w/SLsJiXpSYi4x/bS/gotsn4TPyUffPooM6jJvlqJuF8DuB7uIetz1QY+Mw== 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 4cwpfw71fwzpsR; Tue, 28 Oct 2025 11:53:28 +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 59SBrSbw001264; Tue, 28 Oct 2025 11:53:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SBrSY0001261; Tue, 28 Oct 2025 11:53:28 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:53:28 GMT Message-Id: <202510281153.59SBrSY0001261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 6f0942bde7a0 - main - Revert "blocklistd-helper: Silence another bogus pf warning" 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: 6f0942bde7a08fe46e575486f0e9c97c055d5aad Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=6f0942bde7a08fe46e575486f0e9c97c055d5aad commit 6f0942bde7a08fe46e575486f0e9c97c055d5aad Author: Jose Luis Duran AuthorDate: 2025-10-28 11:41:31 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-28 11:51:59 +0000 Revert "blocklistd-helper: Silence another bogus pf warning" This reverts commit 67ade69eb6079887215db1fde86eba2fb8e2acf7. A fix has been implemented in a943a96a50ba ("libpfctl: Fix displaying deeply nested anchors"). Revert this commit to avoid having differences with upstream. --- contrib/blocklist/libexec/blocklistd-helper | 2 +- libexec/blocklistd-helper/blacklistd-helper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/blocklist/libexec/blocklistd-helper b/contrib/blocklist/libexec/blocklistd-helper index 1d4a38b1d831..14a192ee35ce 100755 --- a/contrib/blocklist/libexec/blocklistd-helper +++ b/contrib/blocklist/libexec/blocklistd-helper @@ -259,7 +259,7 @@ flush) # dynamically determine which anchors exist for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null - /sbin/pfctl -a "$anchor" -F rules 2> /dev/null + /sbin/pfctl -a "$anchor" -F rules done echo OK ;; diff --git a/libexec/blocklistd-helper/blacklistd-helper b/libexec/blocklistd-helper/blacklistd-helper index 053c9ce9b2a2..92f768e86cdf 100644 --- a/libexec/blocklistd-helper/blacklistd-helper +++ b/libexec/blocklistd-helper/blacklistd-helper @@ -280,7 +280,7 @@ flush) # dynamically determine which anchors exist for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null - /sbin/pfctl -a "$anchor" -F rules 2> /dev/null + /sbin/pfctl -a "$anchor" -F rules done echo OK ;;