From nobody Thu Oct 30 01:52:23 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 4cxnDT71nGz6DTM0; Thu, 30 Oct 2025 01:52:25 +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 4cxnDR2lMrz3pr1; Thu, 30 Oct 2025 01:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761789143; 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=kpgm9mt4jnfmLbG7OTAjiqVRQlB5eSwJ9turve+yxG0=; b=E+KaLaEGbmg2bJZNtz+GCSr+eJn93CMSYI2Tnope90pcx9uPgEIPCmkyPWcI/AqZyiw/MH Z9g5pkzy1yUgcZAgmNiYxlNCaLy0toWzZsOrMPADDB42Is++N+/Bem358iRfpiqaVVagdp Ee4J+YZBYZ2TY91JAfOY4apklucF90i7nCRp5+sorPymd/w/ScoPfffUfz4IUyKVVjwrKD GOQUqIQU1s2rRqb9RSUdEzqiibxC714r1zGCqX6c4hILtiCY1OS6S/QCDPg7EQ2bWHXIY+ DFTGURn6OEGAmoKs+9Dj5ZGQmGTT3oqC9TMuI9GScWVOyj7tUG9q9phbizzAsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761789143; 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=kpgm9mt4jnfmLbG7OTAjiqVRQlB5eSwJ9turve+yxG0=; b=Av/+/WnRPsUsNOusTRB/CpFpMS9YXxs78upiAYBJ1urn0fC+zl9CK28b4WZKJRhA3bz2wJ Z1qkQngLmFR+hojZaK2VKmsWRLI13KojxMQ3RPbCp2UCt50BwW2nlFntobA+OC8IE/07+3 yjdwxI3MVCjmzKb4CSoTiLYF8Yt6NbbC+UI/5TnEP1B2Gn5zTjZKuXijpdZP0/Oq6Yd4/e uu8r6xER1AwdeCfS3VwzNxBjRCmxhS5u+zir3TnM1QuKBFEv3HEDmW3+w7TpKBBNrpahSX UV8Ryd8UVMMvCSUYCQedWHLsvGDI4hHTUhW2imKoqTdY5Gdi9xYY7bFQvdHTSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761789143; a=rsa-sha256; cv=none; b=NgSWi+LR97rrE1359KRnry8+2GUYBQya3fYIshn1GAiJSdSEaYqHXjotjhCwnu9PcJiKBC qP9tyaAYqAtn66pUVABjJOQiadxHei+Ah43gaUJctb0uhP/1j19T71/lBEXwJHGkpirq9b bdSDVmS2nPoOXIK1k08vO2naiEWBnG3IJXqCeTlq0bTDOvz54r4hc1v/p2IlWuVNi+4t7p rApTAgu9BocVgappc+VK0RaHLuWlA30TB6L2dhv7HA7BQQCi8KmYfbcia4dzx8bTP/Nt9S LERH1WO/nnKGwI893yu+5rjwonxaVTYb9GnPd2ezeJXJfumCe6fw3VGLmd4Ofg== 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 4cxnDR1Ztlz12cb; Thu, 30 Oct 2025 01:52:23 +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 59U1qNHH097611; Thu, 30 Oct 2025 01:52:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U1qNeB097608; Thu, 30 Oct 2025 01:52:23 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:52:23 GMT Message-Id: <202510300152.59U1qNeB097608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: b7780e24533b - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: b7780e24533b82a9b4b374facbd61fa0a83908fc Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=b7780e24533b82a9b4b374facbd61fa0a83908fc commit b7780e24533b82a9b4b374facbd61fa0a83908fc Author: Jose Luis Duran AuthorDate: 2025-10-28 11:44:50 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-30 01:48:53 +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 (cherry picked from commit e12ec5f4338c2d769c266278320232a98a962f63) --- 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