Page MenuHomeFreeBSD

packages: dhclient, local-unbound require resolvconf
ClosedPublic

Authored by ivy on Oct 15 2025, 1:33 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Dec 16, 7:45 PM
Unknown Object (File)
Sun, Dec 7, 2:55 PM
Unknown Object (File)
Mon, Dec 1, 7:25 AM
Unknown Object (File)
Sun, Nov 30, 12:35 AM
Unknown Object (File)
Fri, Nov 28, 12:05 PM
Unknown Object (File)
Fri, Nov 28, 11:15 AM
Unknown Object (File)
Fri, Nov 28, 2:37 AM
Unknown Object (File)
Thu, Nov 27, 8:47 AM
Subscribers

Details

Summary

Both of these packages use resolvconf for various things. Add a
dependency to make this work.

MFC after: 3 seconds

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ivy requested review of this revision.Oct 15 2025, 1:33 PM

I think stanzas got crossed-over?

I think stanzas got crossed-over?

phabricator is confused because it thinks files were renamed (because of the copyright header, probably), the actual diff is correct.

Ah, I see.
Sorry if I'm getting in the way to pkgbase.

release/packages/ucl/local-unbound.ucl
31

I think the file it generates after service local_unbound setup is called forward.conf.
Also why the message is no longer required? Or is its removal an artifact of Phabricator's confusion?

here is the actual diff of this revision, as you can see no messages are removed:

commit 16a89bec7b6900c20dbdebaf94061db552e16565 (HEAD -> lf/dev/pkgbase-resolvconf)
Author: Lexi Winter <ivy@FreeBSD.org>
Date:   Wed Oct 15 14:11:45 2025 +0100

    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 seconds

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 <ivy@FreeBSD.org>
+ *
+ * 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..031055322755 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 forwarders.conf.
+       "resolvconf" {
+               version = "${VERSION}"
+       },
+}
release/packages/ucl/local-unbound.ucl
31

i don't use local-unbound and don't know what this file is called, so this may be wrong. @des?

Thank you!

release/packages/ucl/local-unbound.ucl
31

i don't use local-unbound and don't know what this file is called, so this may be wrong. @des?

https://cgit.freebsd.org/src/tree/libexec/rc/rc.d/local_unbound#n31 but of course, let's wait for @des

This revision is now accepted and ready to land.Oct 17 2025, 11:26 AM