From nobody Thu Oct 30 01:52:18 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 4cxnDM0sdBz6DTXZ; Thu, 30 Oct 2025 01:52:19 +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 4cxnDL5Z88z3pbw; Thu, 30 Oct 2025 01:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761789138; 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=DrZzWoB/psR+QgfGBbPUG+ErXTDAJ8Yn+WyaOxbUJdc=; b=uUepWbivq1ohGcWE2rwPzhn0HKZvnmdFqQKGkYH8eEfo25/2Cdx2os7HHxGFYHMEnKQaQL kPKwPkvimjWvg18gYBvyEg4cSxA0GVaJ+lqvPreJxbhb3L15/PzimOB/W3GFlgww4/mFYh +EfU/ZEUtnBKtcvNLga9NvqZhfxmeVplBC4UroxLxIAlcYZW9huHIJMXw/xgFuUeuw9RdH gQeV5bCkjDEbdXpdoXWVWB+Sr1YPp0ga6OrCZAsoo8DwUs7yLVsFvh37LqnPsNy+d1wS/y ubINKGY56ImB/F6YLbRLNTJk2jLkHVbmyRAfOjuEBqRSo8Bz8VW9lzXIE9UXtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761789138; 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=DrZzWoB/psR+QgfGBbPUG+ErXTDAJ8Yn+WyaOxbUJdc=; b=lFor8k7iRwRvZ35eGGLJ9CFF3QtzdaQmzFIime6vZ5/sgGOay0zyjGfJ10U+/bpxZOQisW Fkz0h2r29aCq+zVwEdUD7cyvdYdi1Ap81pjOIsl3swPVyMyUZ0sq47zHSZ+GUcAh4+lSO2 /IkYJ54gFXthKC6Ivp4sNge12Ev9q5Z2bRE+T0ojeGapzO3mgIdy7WAnYgppDMCM027TXz gn8nqGhFbDvEokmz6T2yMItVPCooK679diwnELYgdMPRIV3UXRXkbBo7kz1Md0S/xistLK Qw/J983mPe3vZx2rrBmFN7re77U2BQUG9TLHQJluJfBFOKR1D6WDD0KgzvlI7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761789138; a=rsa-sha256; cv=none; b=tPLr8uaRDzxuqe4iF/++sQamqAiD7h7rrLZocdqURKqZ1MpB4b7XHAHglE3v3BD7g9jv5k I39Iltr6BVBoZAXnMVL4WeqknPocxT+Uw8w9Xe3RwObvu5ADEbT2s7alyYrwvCmcwqdli/ QyG41Cuxo8stqb78PPu5mE6vSDXwHNsJ8DNDTiwfqtcX2jNLUmow3w6yUCPFEZD8bKAibq XGuuzYr55GN2toEIKPHSfnzxKs3TriF8TXH6s/vLwaPTpC/6yAPC3WHXdp6SIv0RYPwY8Y 7MLRP4DpZ8kHZylFGYVFQZNTvrTcPWgTJTMSj42T1bcLHhJsTWUwI4yIQKDhow== 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 4cxnDL56kYz12NV; Thu, 30 Oct 2025 01:52:18 +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 59U1qImD097462; Thu, 30 Oct 2025 01:52:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U1qICE097459; Thu, 30 Oct 2025 01:52:18 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:52:18 GMT Message-Id: <202510300152.59U1qICE097459@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: 528e1d14037a - stable/15 - blocklist: blacklist: Chase recent upstream changes 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: 528e1d14037af30003b4451ec6f1686ea674621f Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=528e1d14037af30003b4451ec6f1686ea674621f commit 528e1d14037af30003b4451ec6f1686ea674621f Author: Jose Luis Duran AuthorDate: 2025-10-27 15:01:22 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-30 01:46:42 +0000 blocklist: blacklist: Chase recent upstream changes Upstream introduced a fix that avoids blocklistd(8) from running into an endless loop when it tries to delete an address from the database which has been added multiple times. Apply the same fix to blacklistd(8). Upstream PR: https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=57193 MFC after: 2 days (cherry picked from commit b502a451cbae6a85636c7b8375f5ee53caca4388) --- contrib/blocklist/bin/blacklistd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/blocklist/bin/blacklistd.c b/contrib/blocklist/bin/blacklistd.c index b5f9358122ef..cb6ce6578d9c 100644 --- a/contrib/blocklist/bin/blacklistd.c +++ b/contrib/blocklist/bin/blacklistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $ */ +/* $NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #ifdef HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $"); +__RCSID("$NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $"); #include #include @@ -329,8 +329,8 @@ again: (*lfun)(LOG_INFO, "released %s/%d:%d after %d seconds", buf, c.c_lmask, c.c_port, c.c_duration); } - state_del(state, &c); - goto again; + if (state_del(state, &c) == 0) + goto again; } }