From nobody Tue Oct 28 11:53:30 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 4cwpfy4JhZz6Dm9D; Tue, 28 Oct 2025 11:53:30 +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 4cwpfy1T9wz3VcF; Tue, 28 Oct 2025 11:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652410; 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=o+wAD3tAMkT+nGwYTKq/CtbpqPb2Vsih4slIiTA2Lf4=; b=ESoDMf0Ry+erAaFeCyOQs/W+iJTc4wWUwQ+tWTnPaGMN4szjpEucUWY7x0ssuYxiKexviA xF5M4jbJ3YCDzoQoExPenI1Gbc09zPVZPDGqn48289akytwWKvzeO7QHc05GAnVMkYvg22 PJ2QWDrUZJ5VjE+yCRtqXwd959iEdw3+upm2ay6uO79MBKKndsOJPsjoJs5IZc6DgRpXb5 qTN++Ba4nA7GsbOK/mB+3r9TESNxzYw2Kz+hOYcgLkOi7mQZqueyg/mVNYxSWoMQBsgnM8 jAZK+73iygKAwQS6zN1ZZ8yodC0YtVLdRsps9j+/dGnTqUIJIAiPQLoUtEhOIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652410; 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=o+wAD3tAMkT+nGwYTKq/CtbpqPb2Vsih4slIiTA2Lf4=; b=SsZWl1wpsCzu3p9mspvdVZ6yCkBn7ym/CKxi+C1KdTXGgIA4ftJdKTSBYSgYUolyoPBO5K 5bHNoXvgzGw5aNUsYEvcz1RY61FYZcvrORAWnBdAQW2zQhevQ/Qj8jF/bi7J+COoBcVDqS 5I2VrHbZNak943s2Lc27ZCoAz6CqB2st05rC7dgW7F+lAyyFt9Uw0PdPjp67jKJKjufBPj Kp+4RIy2iRssOgd0d9AE+eCQ1fDwJkSQzkqaiYfgjE7Cqzhvu2wvCOiPgXmCuPtYnFbk/V S77EvcRX+Wm1NFVuzfdF22pZuUM4B/eFCfRMsIOVgDeawaBv6/oN2dFGl1KKKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761652410; a=rsa-sha256; cv=none; b=N9WN0oADHESL/nDVACZD/L9HwuyOeCUZyThA3hFIkhnhKNA5EyNf3L0kp9UB+e3GIfqKs/ F5gsoK0buEWoWxUyl4BDDW6gR75rxfO0jZwhlaRoECdOVorzPbhNNHLtSSyI8F/XFNizRG zbJCRgop3b9mkHWMsYY9hDEVHvG9SvX1lXxFnkC2M+GFqMBpzXwskXpjFArne4DQ4VPdUd BKbjgB2KYMb/R4nBNE8SBSfNd+9xmifcttY93b0B0kAOpkde2EBBveSzuZzBivUvF/61g/ qfC70zy3CD6Yzrhkoj17E94zI9kUOa68V7kHNbVej4bDnHLvRD7B8m6Z9r5mdA== 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 4cwpfy0rxPzq40; Tue, 28 Oct 2025 11:53:30 +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 59SBrUu8001305; Tue, 28 Oct 2025 11:53:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SBrUtY001302; Tue, 28 Oct 2025 11:53:30 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:53:30 GMT Message-Id: <202510281153.59SBrUtY001302@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: e12ec5f4338c - main - Revert "blocklist-helper: Silence a 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: e12ec5f4338c2d769c266278320232a98a962f63 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=e12ec5f4338c2d769c266278320232a98a962f63 commit e12ec5f4338c2d769c266278320232a98a962f63 Author: Jose Luis Duran AuthorDate: 2025-10-28 11:44:50 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-28 11:52:42 +0000 Revert "blocklist-helper: Silence a bogus pf warning" This reverts commit 2347ca21d657121670e6e7246c6ac32efc996cac. A fix has been implemented in 99560fe98c76 ("pfctl: Do not warn if there is no Ethernet anchor"). Revert this commit to avoid having differences with upstream. MFC after: 2 days --- 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 14a192ee35ce..f27cde4ed4ea 100755 --- a/contrib/blocklist/libexec/blocklistd-helper +++ b/contrib/blocklist/libexec/blocklistd-helper @@ -258,7 +258,7 @@ flush) pf) # 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" -t "port${anchor##*/}" -T flush /sbin/pfctl -a "$anchor" -F rules done echo OK diff --git a/libexec/blocklistd-helper/blacklistd-helper b/libexec/blocklistd-helper/blacklistd-helper index 92f768e86cdf..4195f070e8ee 100644 --- a/libexec/blocklistd-helper/blacklistd-helper +++ b/libexec/blocklistd-helper/blacklistd-helper @@ -279,7 +279,7 @@ flush) pf) # 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" -t "port${anchor##*/}" -T flush /sbin/pfctl -a "$anchor" -F rules done echo OK