From nobody Thu Oct 30 16:15:30 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 4cy8NM06Cvz6FCNW; Thu, 30 Oct 2025 16:15:31 +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 4cy8NL3s2Rz3wP9; Thu, 30 Oct 2025 16:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761840930; 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=1SLSuGu+jk5r9oz3/PwJHBNKyAEVl1Q5+y/BpzSP3J4=; b=J8eGVMdp+j4V3ElxBxOkYWQKEB6mhqSrVcM6TDTBqfB8OrO6Z31C8XpHqRYDt09pRM5R2h /KfiqmAakBs4gopMYYKLtmup9Oj7jluKX49qavjaMrjYb6HVB+Pu4rM2i1wUYZKrZAFkH6 MaQYCPF41+4GiZs/Ott6krPEM8/TQm+BWcFc4MEyd1d5A8y650cqYpRZGXv+sV9M0v8Pxh kgHqkJgRD+AoGjUJNq/aRs9O6WMf+V+juMAu+GXtG0t9sgtuZ6qUAAoH2tPs+t+K/nKKeF dnB0POg9RlJ2pbWckavvVnKduvVQVCakFF39yTBxV2bbvJ6DsqCucAah+87sqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761840930; 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=1SLSuGu+jk5r9oz3/PwJHBNKyAEVl1Q5+y/BpzSP3J4=; b=UBOShf2D+IUI2XpG9ue5CqgPnU6HIZ5BLQWGFHwAyMYP82p2X/Ldey4Wmc3ZywzklCoulz AcpI9oVxUSZs+IlByLR2eFo0hCnn3vCDDa722lGstLJxn9O3ENYM8WElaSTvExSHFBSqCD mjv3sD/L0/csiDwKdIV2WCQnGp/AetOR0QIsscTW9Mta+1TE49FwahJJpH50Bn1G1cQb5n OTeQs7St8Frt9Oq+G+dCcgXzIJKh3r3b28Y1Q/kMuzj8tKXF6ZTn5flmWfzW8h9GIA8Oea oujcyQuZrnNXXtGpth6YdjUFlbne3x2iT+Z9Vq2klkdvgBcVYdNhhVW6s2bfvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761840930; a=rsa-sha256; cv=none; b=aPaVGtbqklxoYcu6kec1tRqTa9byFgz9YWhbhvgNKsv+wY8kb+cfnQ7QsXwoJEfwHl+/PO QP3MwBCfCXET2dcv/RM4GyB8aTEc3gIsU3RUAPWh1BvCnOD5ripADtjTHX4klgmbwqxAfJ cK+tUcAVFFL8IUPz/XRta6O9xK929SQM2BHcOGq99Du1N+FZwi864esmwUVSnP60/fdDDG 4pgn7drCm15VgLTLo6s4AQ/Me0g063crbLXEY6V1Xsixrce8Hto0IDgafRKvuDDky5VvRl FM0s1Ss16W16FfXE6gafm0ZWDIAqI3U+JFmD3JfnYv/P3yvFCLioVcotagULwQ== 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 4cy8NL2zMtzDB1; Thu, 30 Oct 2025 16:15:30 +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 59UGFUIj023092; Thu, 30 Oct 2025 16:15:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UGFUYF023089; Thu, 30 Oct 2025 16:15:30 GMT (envelope-from git) Date: Thu, 30 Oct 2025 16:15:30 GMT Message-Id: <202510301615.59UGFUYF023089@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: 2b0a1e6a9359 - releng/15.0 - packages: dhclient, local-unbound require resolvconf 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: 2b0a1e6a935985bb24e65ed5a7df80d08c48de6a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2b0a1e6a935985bb24e65ed5a7df80d08c48de6a commit 2b0a1e6a935985bb24e65ed5a7df80d08c48de6a Author: Lexi Winter AuthorDate: 2025-10-25 17:28:28 +0000 Commit: Colin Percival CommitDate: 2025-10-30 16:14:57 +0000 packages: dhclient, local-unbound require resolvconf Both of these packages use resolvconf for various things. Add a dependency to make this work. Approved by: re (cperciva) MFC after: 3 days Reviewed by: des Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53115 (cherry picked from commit bf28c98f14b439796b395eb4bf9070e4f7cffd68) (cherry picked from commit 01f1896527115a6d1fcea3b93033e28480eda37a) --- release/packages/ucl/dhclient.ucl | 26 ++++++++++++++++++++++++++ release/packages/ucl/local-unbound.ucl | 8 ++++++++ 2 files changed, 34 insertions(+) diff --git a/release/packages/ucl/dhclient.ucl b/release/packages/ucl/dhclient.ucl new file mode 100644 index 000000000000..f15ca8703edf --- /dev/null +++ b/release/packages/ucl/dhclient.ucl @@ -0,0 +1,26 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +deps { + # dhclient uses resolvconf to update /etc/resolv.conf in case the + # DHCP server returns nameserver addresses. + "resolvconf" { + version = "${VERSION}" + }, +} + diff --git a/release/packages/ucl/local-unbound.ucl b/release/packages/ucl/local-unbound.ucl index 0f1c77a0d0ee..34d4c3664c9e 100644 --- a/release/packages/ucl/local-unbound.ucl +++ b/release/packages/ucl/local-unbound.ucl @@ -25,3 +25,11 @@ by running "service local_unbound setup" before restarting the service. EOM } ] + +deps { + # local-unbound uses resolvconf to update resolv.conf and to generate + # its forward.conf. + "resolvconf" { + version = "${VERSION}" + }, +}