From nobody Thu Oct 30 04:36:55 2025 X-Original-To: dev-commits-src-branches@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 4cxrtH3w4Zz6Dl1x; Thu, 30 Oct 2025 04:36:55 +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 4cxrtH2gXCz3MLn; Thu, 30 Oct 2025 04:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761799015; 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=JhZiHiNFsXp1wQthKm3MJaJXnMgd5tIDoKMTSOiY7us=; b=GeoOhkJ4FC5om4bZomZ3BqKtN0WId9e6GEjZpQg+FdOaJssvQ8U0heyRpXxpJ9xbROqB3O 1nqPB5nct1cTkW+UTGGF4S/ip+Ri/Qdh35GvxNaJfpehd5gQmnviipuVLUqSs5zIz2nXDk 6OSNc0GYG0q0PjugkKklwo95ngioO1DffRqkT6Noxy7tmnLmTW54dcx8Q5mvhWjKd4HA7t UoGw4YuKeMCv8sudWyKHcdhk1YjD0EJihVGMmbTMcm7+AFGVJ3+VfITlpVIoHctHGGE51W J6Rcq9rmO98Kcq8wbwzUDovdK9gc5PuDhmqlR/tetTHrZtrAR0WzE9zLUU1uTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761799015; 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=JhZiHiNFsXp1wQthKm3MJaJXnMgd5tIDoKMTSOiY7us=; b=Hep5bdcGkBIgReM/9iIcL4+tX6y+zJzNJ9UtWUY6rK+6wCpHHDoun2RJHbXLqUDk+TqD57 DTGzWb0LHkMlmjKskHvzJMTAspiUiz52lKo0J76fpCzPuTenSdIb0Rf/rNQ0FQn1l9kMT/ QRxgRM2z5OgqBTieQgixB+b+Aug9zKZkqLGtdOB3Ugl1ImT4cYVFHm9ed7MUGsokzlVZbl I0SRXwVDBLhkH7BDAym6Te6cmNzRYEZCYZxe+syaOsdLZ+OxSR4UvV3mdrUS2+QaRdld3j JqV1OCvEjGJbz+4j1H7qUaZ+Py75DhZrz1N+zmG38aKOnkLAN2Cs2HqUBG47Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761799015; a=rsa-sha256; cv=none; b=tO3/55MBLEpYuBrBIUAW7Trgm4RFL1Qz8Xi8IHwXzBuPJrqHVYORkuxRlsdWY4kyhYaI93 Lh6SCCf4TdivoY1/C5jfE6gtvfEuuOgboUMhG91rR63kPNTEM167ZX1NrZZ8Y2CbjsFUhv J1wxp5WUPTYZezG+aW4vp1MxIqC4H7T5h/wI4XhG1hcuVd9GX/fHUNUtbiQ6b1lgfIVcDj BDpzuTq9YjW/4tv4+Y+cckGjLHdriTVisheEbvgGIR9EWMKq5iNRwI/B0ffKCL7WPG3gBy gxumJv3Yr1ANCnCjcFx4yru+XhGWT34LsFpANRszC9ezLRE+qPNt6sipRwuDHQ== 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 4cxrtH1xhtz16Z7; Thu, 30 Oct 2025 04:36:55 +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 59U4atnu005059; Thu, 30 Oct 2025 04:36:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4atTZ005056; Thu, 30 Oct 2025 04:36:55 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:36:55 GMT Message-Id: <202510300436.59U4atTZ005056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 4afb96fdd272 - releng/15.0 - MFV: Import blocklist 2025-10-26 (ff13526) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 4afb96fdd272c2dd5863482529825be2686dcd7f Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4afb96fdd272c2dd5863482529825be2686dcd7f commit 4afb96fdd272c2dd5863482529825be2686dcd7f Author: Jose Luis Duran AuthorDate: 2025-10-27 12:57:37 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:36:37 +0000 MFV: Import blocklist 2025-10-26 (ff13526) Merge commit 'df549a80425635d98419f7f742309d66d367e65f' Changes: https://github.com/zoulasc/blocklist/compare/156df4f...ff13526 Approved by: re (cperciva) MFC after: 2 days (cherry picked from commit 34ffc7073f1786bae5e77593abd423ed31c10024) (cherry picked from commit dfc4a7c10cf5923f21699e2217c969181c733be7) --- 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;