From nobody Mon Mar 16 19:49:14 2026 X-Original-To: dev-commits-ports-main@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 4fZQdk3zCPz6VtPC for ; Mon, 16 Mar 2026 19:49:14 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZQdk3MCYz44yM for ; Mon, 16 Mar 2026 19:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773690554; 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=qUQRcY2pTYBQrsnW0NcbmVzCf7WAqTXOkhjq8jDkcMM=; b=QIgoq6L2wf7NM85rmU8w7ERRADZ99Ex/cplQXdM3QDjqoLu7AaREPIuiKlptpftFfavAi5 t7DST5xnTP6fHlBtn9v2Y9UQ/wR9V5VUYJU+FSR9/nN2Iwc1LNFkpH1DzKcSTVSQtfueid XGlr0C+x76o7HVZ6Oj2/ZoH1tvAnjODnBGG2F4PXlzY+TuP/kYsa7NOyYK+Z932Wb+mAE2 tE82tZ+rNpdKLHQnu2riAhvf86REwtwax4y5LA/5f3Q7ZEaiVFoSt6PE5pHPj31kGSPC9s aNYvVhCfjnPl0nPqOCJ5X02IS/GgK8dGZz2B0lEK1KMTevA3IfJW+5ANQ0h8Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773690554; a=rsa-sha256; cv=none; b=AMvkJoSsRk//etqGlkebtji9bY83OM6/qFVXahXDny4vQmkf4WZ+YVzfHpLg7NWVC72B42 UYeW0sk9qqRSL0yMA8yKB72ei6dUznUmr+NiMC2tbejKJmaCfS4u+GltZI3wfqiir4mqoh c+6OblsrB3tA4zv1iZOPTL7kr4QJbKHw+HQAN1m7WG74fGlCR0N8mSD3djJnbDix4BIsId 1Vaxnp6mhymiVlpfKIxWbuzMTXrZ8+HEyrEdgIe3gVJplJ4mXYPfmR9KMKPmeF0yIg7mUI r0Gc8G6jQwW5sFzhSzDxgFQ9EVOy3F+b/FQCYJ7mlvCQsvJ/169zkYaym1p2Ig== 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=1773690554; 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=qUQRcY2pTYBQrsnW0NcbmVzCf7WAqTXOkhjq8jDkcMM=; b=sw3iQEsCmnRI9lzpG3morxP8vz7nLHr6rwHXISSASlRvzv/kFAiKtnCJprz6z/z9T/CPuT f2nHgXi2KqizerbQxNty3oXieALwLlo3vVHaaNC6Cybe85iVQtQa5P71n9hx8K+Sr+Luj6 u7YG05YIxj85UbnVYJVVmQZxmo73Qjui0zukv+vOX5cy8Rx9WAoF8PkorzqZV0+4Qs+TZW 1JSOs79K6qloiK7GKC3yx+VtVt6H5Hx43mnT3Wu55RnYcNp6wFO6UCKWvBlWMHOkFqg4Zt ueKWVRW5Y7VTRV2bmOGBeBDdANWCl1J758uXbGPp8ecl98ijXw/6DuZ1pj0z0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZQdk2wZXzq7k for ; Mon, 16 Mar 2026 19:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a5aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Mar 2026 19:49:14 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: 78e749651307 - main - net/dhcpcd: update to 10.3.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78e749651307d9fcb263dfa7a1501bda0ac37a74 Auto-Submitted: auto-generated Date: Mon, 16 Mar 2026 19:49:14 +0000 Message-Id: <69b85eba.3a5aa.5e5e5756@gitrepo.freebsd.org> The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=78e749651307d9fcb263dfa7a1501bda0ac37a74 commit 78e749651307d9fcb263dfa7a1501bda0ac37a74 Author: Dries Michiels AuthorDate: 2026-03-16 19:45:21 +0000 Commit: Dries Michiels CommitDate: 2026-03-16 19:48:29 +0000 net/dhcpcd: update to 10.3.1 Changes: https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.3.1 --- net/dhcpcd/Makefile | 3 +- net/dhcpcd/distinfo | 6 +-- net/dhcpcd/files/patch-src_privsep-root.c | 84 ------------------------------- 3 files changed, 4 insertions(+), 89 deletions(-) diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile index acf4c397cef2..eee3a628394f 100644 --- a/net/dhcpcd/Makefile +++ b/net/dhcpcd/Makefile @@ -1,6 +1,5 @@ PORTNAME= dhcpcd -DISTVERSION= 10.3.0 -PORTREVISION= 1 +DISTVERSION= 10.3.1 CATEGORIES= net MASTER_SITES= https://github.com/NetworkConfiguration/${PORTNAME}/releases/download/v${DISTVERSION}/ diff --git a/net/dhcpcd/distinfo b/net/dhcpcd/distinfo index f4c96d61e86f..1e5bbc458d38 100644 --- a/net/dhcpcd/distinfo +++ b/net/dhcpcd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763136225 -SHA256 (dhcpcd-10.3.0.tar.xz) = 06e4c1aaf958523f3fd1c57258c613c6c7ae56b8f1d678fa7943495d5ea6aeb5 -SIZE (dhcpcd-10.3.0.tar.xz) = 279100 +TIMESTAMP = 1773690314 +SHA256 (dhcpcd-10.3.1.tar.xz) = 1aed450dfd22f280a64f7e5feee148d29727c292a3d1819287cf4f98b12d4a68 +SIZE (dhcpcd-10.3.1.tar.xz) = 279320 diff --git a/net/dhcpcd/files/patch-src_privsep-root.c b/net/dhcpcd/files/patch-src_privsep-root.c deleted file mode 100644 index c57d5422622d..000000000000 --- a/net/dhcpcd/files/patch-src_privsep-root.c +++ /dev/null @@ -1,84 +0,0 @@ ---- src/privsep-root.c.orig 2025-11-14 15:38:04 UTC -+++ src/privsep-root.c -@@ -86,6 +86,7 @@ ps_root_readerrorcb(struct psr_ctx *psr_ctx) - { .iov_base = psr_error, .iov_len = sizeof(*psr_error) }, - { .iov_base = NULL, .iov_len = 0 }, - }; -+ struct msghdr msg = { .msg_iov = iov, .msg_iovlen = __arraycount(iov) }; - ssize_t len; - - #define PSR_ERROR(e) \ -@@ -98,37 +99,58 @@ ps_root_readerrorcb(struct psr_ctx *psr_ctx) - if (eloop_waitfd(fd) == -1) - PSR_ERROR(errno); - -- len = recv(fd, psr_error, sizeof(*psr_error), MSG_PEEK); -+ /* We peek at the psr_error structure to tell us how much of a buffer -+ * we need to read the whole packet. */ -+ len = recvmsg(fd, &msg, MSG_PEEK | MSG_WAITALL); - if (len == -1) - PSR_ERROR(errno); -- else if ((size_t)len < sizeof(*psr_error)) -- PSR_ERROR(EINVAL); - -- if (psr_error->psr_datalen > SSIZE_MAX) -- PSR_ERROR(ENOBUFS); -+ /* After this point, we MUST do another recvmsg even on a failure -+ * to remove the message after peeking. */ -+ if ((size_t)len < sizeof(*psr_error)) -+ goto recv; -+ - if (psr_ctx->psr_usemdata && - psr_error->psr_datalen > psr_ctx->psr_mdatalen) - { - void *d = realloc(psr_ctx->psr_mdata, psr_error->psr_datalen); -- if (d == NULL) -- PSR_ERROR(errno); -- psr_ctx->psr_mdata = d; -- psr_ctx->psr_mdatalen = psr_error->psr_datalen; -+ -+ /* If we failed to malloc then psr_mdatalen will be smaller -+ * than psr_datalen. -+ * The following recvmsg will get MSG_TRUNC so the malloc error -+ * will be reported there but more importantly the -+ * message will be correctly discarded from the queue. */ -+ if (d != NULL) { -+ psr_ctx->psr_mdata = d; -+ psr_ctx->psr_mdatalen = psr_error->psr_datalen; -+ } - } - if (psr_error->psr_datalen != 0) { -- if (psr_ctx->psr_usemdata) -+ if (psr_ctx->psr_usemdata) { - iov[1].iov_base = psr_ctx->psr_mdata; -- else { -- if (psr_error->psr_datalen > psr_ctx->psr_datalen) -- PSR_ERROR(ENOBUFS); -+ /* psr_mdatalen could be smaller then psr_datalen -+ * if the above malloc failed. */ -+ iov[1].iov_len = -+ MIN(psr_ctx->psr_mdatalen, psr_error->psr_datalen); -+ } else { - iov[1].iov_base = psr_ctx->psr_data; -+ /* This should never be the case */ -+ iov[1].iov_len = -+ MIN(psr_ctx->psr_datalen, psr_error->psr_datalen); - } -- iov[1].iov_len = psr_error->psr_datalen; - } - -- len = readv(fd, iov, __arraycount(iov)); -+recv: -+ /* fd is SOCK_SEQPACKET and we mark the boundary with MSG_EOR -+ * so this can never stall if the receive buffers are bigger -+ * than the actual message. */ -+ len = recvmsg(fd, &msg, MSG_WAITALL); - if (len == -1) - PSR_ERROR(errno); -+ else if ((size_t)len < sizeof(*psr_error)) -+ PSR_ERROR(EINVAL); -+ else if (msg.msg_flags & MSG_TRUNC) -+ PSR_ERROR(ENOBUFS); - else if ((size_t)len != sizeof(*psr_error) + psr_error->psr_datalen) - PSR_ERROR(EINVAL); - return len;