xSugSkLUEWm7WOJeyWJhl2xHWWF/o8/pgak9JRuPagp ftshjTE3Pmz4qFICNZalrxbAlcM2ASXr5ORR0lW/5XY7Uri2XsWh10kO4lvzEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760531655; 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=IbfSg/4P/GdmCiItnWdMC2AbvO1eSTBNp93HR29S6rc=; b=bjBtCpfUi0CphA9M/W2sdb8o2YmyJy6HLE5f6B0QXXJP4I58fhFIFCzIJofrPOKp1RUNBj 9uSi+Yj4+2gVVhOtAvavW7SCBggmxE2v4NT3jj7ekTexTM3KPS7+8jhmV66z7HrOx4PZET vzFax35T28MhLHyqNzVtYhuj2vdghnI6NlTcUOA7W8QWEW5nQesYP4DVprfWROremE6V1u 9j83cq18RFcXT4NIdVp7KvzOKdT3yJR8AsMgnZVYsU2s9gmh1ncW5zP84KE1HceC/EVarE W8f/UEnJazLFCXGf5072GzMPD9vkf+D0kiCYb2diR8zikK9dWDOPga6jimDubA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760531655; a=rsa-sha256; cv=none; b=xUQZHnNPZo9XAludE/RgfktkQTTQuigY2tOVNgOAKWMw6+8d1EG3K6CS70jlFzaerG6G0L GRrkjLsTdYa6z1WgKKh9BbmZcvNOIPVT/znyOF8K5BVyylc0KJTDwtJgi/qOhnUgipfJPh HQDoZC3+YQ5UxGuW4AkXa4/c/J2kpJ2Mw7mOkZqNql8ZUun83Vxa5NeGLcGr29vIn5Cf5M 0nDi6l3CljZzyIEN0Y0XovgTtEtU3qDYJRSwGO8d/+JjDQ8Ddw5tWQfcFYVGiF66FLeD6H x5shlOCjHsnog5At05sQnCHrP6xqoNhQH3Kdd849y6gcr42JGmLIM+9L/+/Luw== 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 4cmr9z519qzfry; Wed, 15 Oct 2025 12:34:15 +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 59FCYFvf055595; Wed, 15 Oct 2025 12:34:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FCYFtO055592; Wed, 15 Oct 2025 12:34:15 GMT (envelope-from git) Date: Wed, 15 Oct 2025 12:34:15 GMT Message-Id: <202510151234.59FCYFtO055592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: bf84861460f9 - main - packages: Rename unbound to local-unbound 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/main X-Git-Reftype: branch X-Git-Commit: bf84861460f9287fe9cf66b2cd22fefe8e242a28 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=bf84861460f9287fe9cf66b2cd22fefe8e242a28 commit bf84861460f9287fe9cf66b2cd22fefe8e242a28 Author: Lexi Winter AuthorDate: 2025-10-15 11:00:35 +0000 Commit: Lexi Winter CommitDate: 2025-10-15 12:29:18 +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 --- 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 9c8bd3a9fd6b..ed49bd76e917 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +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. + 20251012: Blacklist has been renamed upstream to Blocklist. If you have it configured, rename all configuration files, firewall anchors or 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 + * + * 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: <