From nobody Thu Oct 30 12:34:55 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 4cy3Tr0Thkz6FbpC; Thu, 30 Oct 2025 12:34:56 +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 4cy3Tq3X3Lz3CMd; Thu, 30 Oct 2025 12:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761827695; 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=ZrUiSXFGRlaDqas0qJH2Ec53RLtSIb872vSYG4WYqdg=; b=ND9WdcfXC2DwciH2DsjzXlHalTQKPP+9IsSnFJqXumkSi4BLns+vYidGJg7JGg4NIcaLsX HyHNVOCSUyiI8whoa6x9t7pucW5uaNw+6HYKcfxl4HVSjYyW4PnUkU03qgVJY7U5Ewqo+6 AEIkaqyFMIE+c/8k8h9t5LEm2RdZgwy3h3Cf567tDPzeobJd2Qt1+e45pUUVMCLicRHN6v NWDoodBUoHMVzHiA070FBq4ki9e8y/GZXkWWCuAcmTK94dYiqL+ya/Ppr9T7cGeXNfap5w PJjaE6iadbyLyQr98dQ8MiwBRuNlN7a8gPmbZh+4eTXEj9gRzTMtpS3eW6KU4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761827695; 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=ZrUiSXFGRlaDqas0qJH2Ec53RLtSIb872vSYG4WYqdg=; b=en8HvOvz1nvvDw069cTZjgCAhXAOQuA2JQtQMt5Nr0Hl0OQiLBbW/gC8allpSuogd4KOCV 5XGIRbrIGBRS3LI8rT9gNZSEcE70g1HxjgHAlCzFHlOod0qOCZUhX+DzAnoO+eE6iKHj4W 3vAPiPObw3j3K5i6HOgKWNHZE8516sy/1Et1gTfaRV4soAZzSXARQASicejLMsXkvq0CnU xD7/wnyHPMfRnztzIm9n63A7qWw2yKWM7mq12rg2PCF+XxBrHevTMKkBEXYXbv74XFKjCU DVqDDdQfwW8xlQKVa784h8ycb6MmIKbJcBCEF6d6b4IYajwLnvPPRCBXmMB4Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761827695; a=rsa-sha256; cv=none; b=X3AKlo0yPUmzBdJBWwSB6TWpfsetNaQjahuXXih0GAjQss+J4O7rDqdbeB2qRyuHptwNtv /y0vHzCsQrgz+8A0Oca4SYBbIOJbvFX/MRUjxOgwvf7wkzDcW8VTjqaURaErClh3Y9aiXK SV5y5vGGOj5M7wlYa/X9oXl2ZHnhhmxck+nfhXojULpSd0BLFNk4m8kA3ICkJwHXuwoQZM g/Rimq51EX5M5jyyVXmwGqCr2+82uf1Hz8AbnYoYmuJvqhEujqqp2k1vHnsar6XgKBAQuW iFDE52AtSOA58KC6BqtbV+pOSWVMyNhLyOUGypL/UPQSqaLVUy93TQFxEl5+/A== 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 4cy3Tq2r2nz6tY; Thu, 30 Oct 2025 12:34: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 59UCYtNq006292; Thu, 30 Oct 2025 12:34:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UCYtUW006289; Thu, 30 Oct 2025 12:34:55 GMT (envelope-from git) Date: Thu, 30 Oct 2025 12:34:55 GMT Message-Id: <202510301234.59UCYtUW006289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 01f189652711 - stable/15 - packages: dhclient, local-unbound require resolvconf 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 01f1896527115a6d1fcea3b93033e28480eda37a Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=01f1896527115a6d1fcea3b93033e28480eda37a commit 01f1896527115a6d1fcea3b93033e28480eda37a Author: Lexi Winter AuthorDate: 2025-10-25 17:28:28 +0000 Commit: Lexi Winter CommitDate: 2025-10-30 12:34:28 +0000 packages: dhclient, local-unbound require resolvconf Both of these packages use resolvconf for various things. Add a dependency to make this work. 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) --- 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}" + }, +}