From nobody Tue Feb 10 01:39:29 2026 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 4f94416tSvz6R9Jp for ; Tue, 10 Feb 2026 01:39:29 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f94414lCGz3FZ1 for ; Tue, 10 Feb 2026 01:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770687569; 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=8NbAep8fFCk+/0bhKiDsU/FkGkkFv76rhqLxO3/VzvE=; b=QgnsvT8TLlxtfjDAxnQTcd1JsjsLz62aswsAfggKIsc7gk/bfu6fQ2Lt1QGIBpn70JIZ10 jw/2Q2wj/oHgoaiVmb5qnNDHC5xsv28RuRHRCGgfM5s62C/Xg/P+DpYwqTpYQNZdYXXYtz 8DLo7WWAT9wlPcv/vUC8fXxTntQII++50zyvL3NdwMyyMQ6rKhCpuJZBy9rpjvV4u+PdAp NqVuazIwl8XdHnxuMkfd/uUfbAq5v57EoteUX5/bLeiSzCM939mljsPMhRLQZhaFFiNT2P 7uBO+GCenFjERscFAFuEzyjqnu/aeBzBFIss5WtD2TM27wdEYV1WrWJ8FXESQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770687569; a=rsa-sha256; cv=none; b=sXnJijBMdKAOK/EqVpoAsEf2rGlz/RhNhNQEhxma4vUSRE43kOpAV+nhCzU3ziPtyEOWOz sVevxgjajC5wlsaDzPzrtoTAhR0xZ4aaBm2UpNwcYhNrAiL3f1wwhk59/725ocFQa63+ap RYVyJAOxsr6At93hBWQDGEIDnJnqhAre4n55WoedkJOsIiiXCwiFXVS8Giz5JzvPAamrLZ D/G8AHuK5beyB111vYgaNHSKNyNIs3cEba3KKDsFeQwq0cDKnr0H5LrhUq/dSiFD8PO/xX 8T1kbQrQikK8L8SMHCxYwgpyuQieaZTeOnreaykTEBoZ3GBf8q1AYRIEneCgVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770687569; 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=8NbAep8fFCk+/0bhKiDsU/FkGkkFv76rhqLxO3/VzvE=; b=qzBvmRoX8AL2EPjr00UR9Z+PrxO6XCt2e/f1GYnmYgkL0xH8556Kqz4gYP6oT0/0Kz0UWc Lfk8NtpdvtoAT9h2uH+z8aIcf/0WSleSauYzgcGKppx6QXRo2rtRd6fnIvvbrQjDOKus4y 5AYqZ0XDXJq3HeqINNlSgmPuuzIk9qh4F3+BGn5MrX/0K3KZV/BEL2o3G3VAyjJhBlDp4f k6/oAxnpei4QnEEWNVSHrUr9Ead1HZxXG8udHHPF4b3JUTyHmkvw2VNrTQYbXSKQlQafBs DGlIOI3Dynx2511qkVY2g979SSW8JauoTfCqle2Bq+hPMEO4O9rBldK0fhjLjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f944147MlzxpV for ; Tue, 10 Feb 2026 01:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37297 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 01:39:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 1864a03eb2ac - stable/15 - blocklist: blacklist: Chase recent upstream changes 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1864a03eb2ac90faa3381f20eab9672efaa8a3d5 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 01:39:29 +0000 Message-Id: <698a8c51.37297.bb69663@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=1864a03eb2ac90faa3381f20eab9672efaa8a3d5 commit 1864a03eb2ac90faa3381f20eab9672efaa8a3d5 Author: Jose Luis Duran AuthorDate: 2026-02-07 23:06:32 +0000 Commit: Jose Luis Duran CommitDate: 2026-02-10 01:33:27 +0000 blocklist: blacklist: Chase recent upstream changes MFC after: 3 days (cherry picked from commit a25b12c6ce63be1fefb31d14daca332682fd31fc) --- contrib/blocklist/bin/blacklistd.c | 28 ++++++++++++++-------------- contrib/blocklist/bin/blacklistd.conf.5 | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/contrib/blocklist/bin/blacklistd.c b/contrib/blocklist/bin/blacklistd.c index 7dec62cfa58b..01eb662c83fe 100644 --- a/contrib/blocklist/bin/blacklistd.c +++ b/contrib/blocklist/bin/blacklistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocklistd.c,v 1.14 2025/12/15 15:51:37 christos Exp $ */ +/* $NetBSD: blocklistd.c,v 1.15 2026/02/07 14:32:04 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.14 2025/12/15 15:51:37 christos Exp $"); +__RCSID("$NetBSD: blocklistd.c,v 1.15 2026/02/07 14:32:04 christos Exp $"); #include #include @@ -346,10 +346,10 @@ addfd(struct pollfd **pfdp, bl_t **blp, size_t *nfd, size_t *maxfd, exit(EXIT_FAILURE); if (*nfd >= *maxfd) { *maxfd += 10; - *blp = realloc(*blp, sizeof(**blp) * *maxfd); + *blp = reallocarray(*blp, *maxfd, sizeof(**blp)); if (*blp == NULL) err(EXIT_FAILURE, "malloc"); - *pfdp = realloc(*pfdp, sizeof(**pfdp) * *maxfd); + *pfdp = reallocarray(*pfdp, *maxfd, sizeof(**pfdp)); if (*pfdp == NULL) err(EXIT_FAILURE, "malloc"); } @@ -373,7 +373,7 @@ uniqueadd(struct conf ***listp, size_t *nlist, size_t *mlist, struct conf *c) } if (*nlist == *mlist) { *mlist += 10; - void *p = realloc(*listp, *mlist * sizeof(*list)); + void *p = reallocarray(*listp, *mlist, sizeof(*list)); if (p == NULL) err(EXIT_FAILURE, "Can't allocate for rule list"); list = *listp = p; @@ -410,7 +410,7 @@ rules_restore(void) db = state_open(dbfile, O_RDONLY, 0); if (db == NULL) { (*lfun)(LOG_ERR, "Can't open `%s' to restore state (%m)", - dbfile); + dbfile); return; } for (f = 1; state_iterate(db, &c, &dbi, f) == 1; f = 0) { @@ -468,12 +468,12 @@ main(int argc, char *argv[]) case 's': if (nblsock >= maxblsock) { maxblsock += 10; - void *p = realloc(blsock, - sizeof(*blsock) * maxblsock); + void *p = reallocarray(blsock, maxblsock, + sizeof(*blsock)); if (p == NULL) - err(EXIT_FAILURE, - "Can't allocate memory for %zu sockets", - maxblsock); + err(EXIT_FAILURE, "Can't allocate " + "memory for %zu sockets", + maxblsock); blsock = p; } blsock[nblsock++] = optarg; @@ -552,7 +552,7 @@ main(int argc, char *argv[]) } } if (state == NULL) - return EXIT_FAILURE; + exit(EXIT_FAILURE); if (!debug) { if (daemon(0, 0) == -1) @@ -574,7 +574,7 @@ main(int argc, char *argv[]) if (errno == EINTR) continue; (*lfun)(LOG_ERR, "poll (%m)"); - return EXIT_FAILURE; + exit(EXIT_FAILURE); case 0: state_sync(state); break; @@ -590,5 +590,5 @@ main(int argc, char *argv[]) update(); } state_close(state); - return 0; + exit(EXIT_SUCCESS); } diff --git a/contrib/blocklist/bin/blacklistd.conf.5 b/contrib/blocklist/bin/blacklistd.conf.5 index e775d30e7e8e..d4ca6785d5bf 100644 --- a/contrib/blocklist/bin/blacklistd.conf.5 +++ b/contrib/blocklist/bin/blacklistd.conf.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: blocklistd.conf.5,v 1.7 2025/02/11 17:47:05 christos Exp $ +.\" $NetBSD: blocklistd.conf.5,v 1.9 2026/01/13 21:38:18 christos Exp $ .\" .\" Copyright (c) 2015, 2025 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 5, 2025 +.Dd January 13, 2026 .Dt BLACKLISTD.CONF 5 .Os .Sh NAME @@ -102,7 +102,7 @@ The syntax for the .Va location is: .Bd -literal -offset indent - [
|][/][:] + [
|[/]:] .Ed .Pp The