From nobody Thu Oct 30 01:52:17 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 4cxnDL0DtKz6DTRp; Thu, 30 Oct 2025 01:52:18 +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 4cxnDK4jyTz3pYX; Thu, 30 Oct 2025 01:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761789137; 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=FRy+E6ZECv41QB6pYG75JZG5oG4oF7K8JbYDtuDrH3Y=; b=ZiyBEfdWH7d0V2uWyL0M4Ww/yrDnF4qjnof8i05Nc/OA273LDQIDb/DYJCDlLQOuqV3k20 gwD3/Yaie+ufkIIDCWfN2dJJY1Ya9Bsy6savHog8i+x0TX6TVi/eywYmFoEqpGfcXaYGQl 9IJKc6IwJnXl9Gmzhuz+DZjbYvXJmiSAGjXa+/8YuEojMUPLrUc+Z2/m07dOGpfh4pBOT1 Xa21T9wTW3VveYpZfbHulWz1fqiDvpxs+e5VsCsHucDb4LY0tMyoQz8lKlyspUdhxDzD4w rC4KQZVN6t+ipmR/UfM1Rk1zrQoyVLG6/SBfWDszcpuSLTWnw6pkmt8odU3sQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761789137; 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=FRy+E6ZECv41QB6pYG75JZG5oG4oF7K8JbYDtuDrH3Y=; b=dHZ1j9pDyETNTEIghbOpwQCtfWoPUPO+GATG5gZaVRKnndrYAxd9M0JdHz3Hbq0F68LZ35 H9upubCtJ6mJFyIKqSa7/r7F0B4RN5KFYJ9ms7UbmkU7lKcapB+xsUwh05tkIiAxJJOv4K Wrg4QVF4qzX7DyhXcIMn3DqQebmjUgBqijPBflJkpbdw9KYeW43W0OblueoNjL6yTqdBev /FbputrvkPd5hKJioyScKeHInVDUPiLT+AmDCNYhyaBIIXrAF+eOcoWLy5c7VfxwXE/VJA u7wTwjtldkIeDzypxoK+YGD3Y/ZFa6HyPikJK4IrZLicbgHHHa9wX9srulldFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761789137; a=rsa-sha256; cv=none; b=AkFw08l6KPz5jOvwzm/mQWAmChdQDiamQ/H5a4VbiXPS2n30KvYIwFPKPvHmGAvXqtHEJN DZo27QjlXAa3d9ppP2c45Tzx0yrwIYe7GvcKjeTqYfq6GNnsWeqZAKnN50TAt2P3Ad08A6 yceAujN2OaH9Uz5VRVMW+hI3yC8Fjhc3VjmtxR8vwxAmtkPSzJ541BX8VlT7m9tpdm2Ocg /xYbIMCRJ/YHGKBM9tV1vF9sDBX6Ofuz3jK8Srg2b9GhLMA9blOcqgTVMbv+iJbNziFbMC A0lLJMoBn9sq/ATHV+iq8L675YoyAR820efE6pjfzmtPCvXOvOG0wPQvUWcU5A== 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 4cxnDK48rwz12LT; Thu, 30 Oct 2025 01:52:17 +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 59U1qHtf097425; Thu, 30 Oct 2025 01:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U1qHkT097422; Thu, 30 Oct 2025 01:52:17 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:52:17 GMT Message-Id: <202510300152.59U1qHkT097422@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: dfc4a7c10cf5 - stable/15 - MFV: Import blocklist 2025-10-26 (ff13526) 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: dfc4a7c10cf5923f21699e2217c969181c733be7 Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=dfc4a7c10cf5923f21699e2217c969181c733be7 commit dfc4a7c10cf5923f21699e2217c969181c733be7 Author: Jose Luis Duran AuthorDate: 2025-10-27 12:57:37 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-30 01:46:01 +0000 MFV: Import blocklist 2025-10-26 (ff13526) Merge commit 'df549a80425635d98419f7f742309d66d367e65f' Changes: https://github.com/zoulasc/blocklist/compare/156df4f...ff13526 MFC after: 2 days (cherry picked from commit 34ffc7073f1786bae5e77593abd423ed31c10024) --- contrib/blocklist/bin/blocklistctl.8 | 2 +- contrib/blocklist/bin/blocklistd.c | 8 ++++---- contrib/blocklist/bin/state.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/blocklist/bin/blocklistctl.8 b/contrib/blocklist/bin/blocklistctl.8 index 75228599a9de..d241f2844471 100644 --- a/contrib/blocklist/bin/blocklistctl.8 +++ b/contrib/blocklist/bin/blocklistctl.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: blocklistctl.8,v 1.5 2025/10/25 16:56:27 christos Exp $ +.\" $NetBSD: blocklistctl.8,v 1.6 2025/10/26 13:49:22 christos Exp $ .\" .\" Copyright (c) 2015 The NetBSD Foundation, Inc. .\" All rights reserved. diff --git a/contrib/blocklist/bin/blocklistd.c b/contrib/blocklist/bin/blocklistd.c index c78c560613fc..47c145c7aae1 100644 --- a/contrib/blocklist/bin/blocklistd.c +++ b/contrib/blocklist/bin/blocklistd.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; } } diff --git a/contrib/blocklist/bin/state.c b/contrib/blocklist/bin/state.c index 08e2622e223f..bb93904f3489 100644 --- a/contrib/blocklist/bin/state.c +++ b/contrib/blocklist/bin/state.c @@ -1,4 +1,4 @@ -/* $NetBSD: state.c,v 1.2 2025/02/11 17:48:30 christos Exp $ */ +/* $NetBSD: state.c,v 1.3 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: state.c,v 1.2 2025/02/11 17:48:30 christos Exp $"); +__RCSID("$NetBSD: state.c,v 1.3 2025/10/25 18:43:51 christos Exp $"); #include #include @@ -131,7 +131,7 @@ state_del(DB *db, const struct conf *c) (*lfun)(LOG_DEBUG, "%s: returns %d", __func__, rv); (*db->sync)(db, 0); } - return 0; + return rv; default: (*lfun)(LOG_ERR, "%s: failed (%m)", __func__); return -1;