encoding:content-transfer-encoding;
	bh=yHDs7fPSkNImwmvlnqO8PKrPhLpBZ8vvChhboUWH3Ew=;
	b=oL71lUiQajwlTZ7+WUIZ/7FDDOmtfYE//FzBlaE5At5x1XtwwexOil6th+YUYWxxA1Mruw
	4fRnv/Hp88k3FK8FOfr7r0+kADO8iDXl+9s1oM8XB6p31tP2es3Dme1zc04juREIdvj+Ac
	ULmzLsudR9ytD9ZFCYmHXKA5Xk81YJIjLFnzmqF/y2Pxs+NRax2+IcNcQjQOzHBzRegVpx
	C7KMs8OD7ZazLTRf0QllRuxr+UU18W/Tp77bSwPz2X2mUHTfbZeFBQK8/vpTadlyl17goP
	d6YW3PtLpBWDeHLHw5ZXMI58FvRTG4OBA2r/oaBGcnRFCXe7pXjw0kUN9v6m7w==
Date: Wed, 15 Oct 2025 12:59:02 GMT
Message-Id: <202510151259.59FCx2jv094713@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-branches@FreeBSD.org
From: Lexi Winter <ivy@FreeBSD.org>
Subject: git: f1b0e00d56a8 - stable/15 - packages: Rename unbound
  to local-unbound
Sender: owner-dev-commits-src-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Auto-Submitted: auto-generated

The branch stable/15 has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=f1b0e00d56a8b01be86ff41a05cb6916727cee8a

commit f1b0e00d56a8b01be86ff41a05cb6916727cee8a
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-10-15 11:00:35 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-10-15 12:55:50 +0000

    packages: Rename unbound to local-unbound
    
    This more accurately reflects its purpose, and its contents, since
    everything in the package is prefixed with "local-".
    
    While here, add a message on upgrade about regenerating the config.
    
    MFC after:      3 seconds
    Requested by:   des
    Reviewed by:    des
    Sponsored by:   https://www.patreon.com/bsdivy
    Differential Revision:  https://reviews.freebsd.org/D53056
    
    (cherry picked from commit bf84861460f9287fe9cf66b2cd22fefe8e242a28)
---
 UPDATING                                           |  8 +++++++
 etc/Makefile                                       |  2 +-
 etc/mtree/BSD.var.dist                             |  4 ++--
 lib/libunbound/Makefile                            |  6 ++---
 libexec/rc/rc.d/Makefile                           |  2 +-
 .../ucl/{unbound-all.ucl => local-unbound-all.ucl} |  0
 release/packages/ucl/local-unbound.ucl             | 27 ++++++++++++++++++++++
 usr.sbin/unbound/Makefile.inc                      |  2 +-
 8 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/UPDATING b/UPDATING
index 26c2355de1ac..6310ef5828c1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before updating system packages
 and/or ports.
 
+20251015:
+	The "FreeBSD-unbound" package is renamed to "FreeBSD-local-unbound".
+	If you have set-optional or set-base installed, the new package will
+	be installed automatically, otherwise you should manually install the
+	new package and remove the old one.
+
+	This change only affects pkgbase users.
+
 20251001:
 	The deprecated ftpd(8) has been removed.  Users who still need ftpd
 	can install the ftp/freebsd-ftpd port.  pkgbase users should remove
diff --git a/etc/Makefile b/etc/Makefile
index 93d4b489ec7d..bda70b8af391 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -68,7 +68,7 @@ distribution:
 # install the /etc/unbound symlink, otherwise, don't overwrite the user's
 # existing symlink.
 	if [ "${NO_ROOT:Dtrue}" = true -o ! -e ${DESTDIR}/etc/unbound ]; then \
-		${INSTALL_SYMLINK} -Tpackage=unbound ../var/unbound \
+		${INSTALL_SYMLINK} -Tpackage=local-unbound ../var/unbound \
 			${DESTDIR}/etc/unbound; \
 	fi
 .endif
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index b3372196f5f9..b55c0150848e 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -104,8 +104,8 @@
         vi.recover      mode=01777
         ..
     ..
-    unbound         uname=unbound gname=unbound mode=0755 tags=package=unbound
-        conf.d          uname=unbound gname=unbound mode=0755 tags=package=unbound
+    unbound         uname=unbound gname=unbound mode=0755 tags=package=local-unbound
+        conf.d          uname=unbound gname=unbound mode=0755 tags=package=local-unbound
         ..
     ..
     yp
diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
index e2cd25ea8b34..1a31e50e6416 100644
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@@ -1,4 +1,3 @@
-PACKAGE=lib${LIB}
 # Vendor sources and generated files
 LDNSDIR= ${SRCTOP}/contrib/ldns
 UNBOUNDDIR= ${SRCTOP}/contrib/unbound
@@ -6,9 +5,10 @@ UNBOUNDDIR= ${SRCTOP}/contrib/unbound
 # Hold my beer and watch this
 .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/cachedb ${UNBOUNDDIR}/dns64 ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/sldns ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/respip ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator 
 
-LIB=	unbound
+PACKAGE=	local-unbound
+
+LIB=		unbound
 PRIVATELIB=
-PACKAGE=	unbound
 
 CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} -I${.CURDIR}
 CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 093da31ed787..3b7f45e8f101 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -294,7 +294,7 @@ SSHPACKAGE=			ssh
 SSH=		sshd
 
 CONFGROUPS.${MK_UNBOUND}+=	UNBOUND
-UNBOUNDPACKAGE=			unbound
+UNBOUNDPACKAGE=			local-unbound
 UNBOUND=	local_unbound
 
 CONFGROUPS.${MK_VI}+=		VI
diff --git a/release/packages/ucl/unbound-all.ucl b/release/packages/ucl/local-unbound-all.ucl
similarity index 100%
rename from release/packages/ucl/unbound-all.ucl
rename to release/packages/ucl/local-unbound-all.ucl
diff --git a/release/packages/ucl/local-unbound.ucl b/release/packages/ucl/local-unbound.ucl
new file mode 100644
index 000000000000..0f1c77a0d0ee
--- /dev/null
+++ b/release/packages/ucl/local-unbound.ucl
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+messages = [
+	{
+		type: upgrade
+		message: <<EOM
+After upgrading local-unbound, the configuration file should be regenerated
+by running "service local_unbound setup" before restarting the service.
+EOM
+	}
+]
diff --git a/usr.sbin/unbound/Makefile.inc b/usr.sbin/unbound/Makefile.inc
index a28e388e47c0..84dfdbf736bd 100644
--- a/usr.sbin/unbound/Makefile.inc
+++ b/usr.sbin/unbound/Makefile.inc
@@ -1,6 +1,6 @@
 MK_WERROR=	no
 NO_WTHREAD_SAFETY= true
-PACKAGE=	unbound
+PACKAGE=	local-unbound
 
 .for man in ${MAN}
 ${man}: ${UNBOUNDDIR}/doc/${man:S/local-//}