The branch main has been updated by ivy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4cb1baa7d85c1e227c4acfcc13a35a9f1b7e5a44
commit 4cb1baa7d85c1e227c4acfcc13a35a9f1b7e5a44
Author: Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-07-24 09:31:40 +0000
Commit: Lexi Winter <i...@freebsd.org>
CommitDate: 2025-07-24 10:35:35 +0000
krb5: use 'kerberos' as package name
Rename krb5 and krb5-lib to kerberos and kerberos-lib to match the
existing Heimdal package names. Since it's not possible to build or
install both at the same time, and Heimdal will be removed anyway,
there's no benefit to using a different package name for MIT Kerberos
and doing so will create friction for pkgbase users.
Move a few things (e.g., headers) from kerberos to kerberos-lib.
Move the KDC to a new package, kerberos-kdc, so the client utilities
can be installed without the KDC. As most systems won't have the KDC
running, this saves a bit of disk space for jails/containers.
Remove a few instances of 'PACKAGE=' in target-specific Makefiles
where we can set that in the parent's Makefile.inc instead.
Revert 01c587521dd8 ("OCI: Attempt to fix "runtime" container")
which is no longer required.
The KDC init script is still installed in the 'rc' package for
compatibility with the security/krb5 port; we should fix this
at some point, possibly after Heimdal is removed.
Reviewed by: manu, kevans, des
Approved by: des (mentor), kevans (mentor)
Differential Revision: https://reviews.freebsd.org/D51420
---
krb5/include/Makefile | 2 +-
krb5/lib/Makefile.inc | 2 ++
krb5/lib/apputils/Makefile | 2 --
krb5/lib/crypto/Makefile | 2 --
krb5/lib/gssapi/Makefile | 2 --
krb5/lib/kadm5clnt/Makefile | 2 --
krb5/lib/kadm5srv/Makefile | 2 --
krb5/lib/kdb/Makefile | 2 --
krb5/lib/krad/Makefile | 2 --
krb5/lib/krb5/Makefile | 2 --
krb5/lib/rpc/Makefile | 2 --
krb5/libexec/Makefile.inc | 1 +
krb5/libexec/kadmind/Makefile | 2 --
krb5/libexec/kdc/Makefile | 2 --
krb5/libexec/kprop/Makefile | 2 --
krb5/libexec/kpropd/Makefile | 2 --
krb5/libexec/kproplog/Makefile | 2 --
krb5/plugins/Makefile.inc | 1 +
krb5/plugins/audit/Makefile | 2 --
krb5/plugins/k5tls/Makefile | 2 --
krb5/plugins/kdb/db2/Makefile | 2 --
krb5/plugins/preauth/Makefile.inc | 1 +
krb5/plugins/preauth/otp/Makefile | 2 --
krb5/plugins/preauth/pkinit/Makefile | 2 --
krb5/plugins/preauth/spake/Makefile | 2 --
krb5/plugins/preauth/test/Makefile | 2 --
krb5/usr.bin/Makefile.inc | 1 +
krb5/usr.bin/gss-client/Makefile | 2 --
krb5/usr.bin/kadmin/Makefile | 2 --
krb5/usr.bin/kdestroy/Makefile | 2 --
krb5/usr.bin/kinit/Makefile | 2 --
krb5/usr.bin/klist/Makefile | 2 --
krb5/usr.bin/kpasswd/Makefile | 2 --
krb5/usr.bin/ksu/Makefile | 2 --
krb5/usr.bin/kswitch/Makefile | 2 --
krb5/usr.bin/ktutil/Makefile | 2 --
krb5/usr.bin/kvno/Makefile | 2 --
krb5/usr.bin/sclient/Makefile | 2 --
krb5/usr.bin/sim_client/Makefile | 2 --
krb5/usr.sbin/gss-server/Makefile | 2 +-
krb5/usr.sbin/kadmin.local/Makefile | 2 +-
krb5/usr.sbin/kdb5_util/Makefile | 2 +-
krb5/usr.sbin/sim_server/Makefile | 2 +-
krb5/usr.sbin/sserver/Makefile | 2 +-
krb5/util/build-tools/Makefile | 2 +-
krb5/util/compile_et/Makefile | 2 +-
krb5/util/et/Makefile | 2 +-
krb5/util/profile/Makefile | 2 +-
krb5/util/ss/Makefile | 2 +-
krb5/util/support/Makefile | 2 +-
krb5/util/verto/Makefile | 2 +-
lib/libpam/modules/pam_krb5/Makefile | 2 +-
release/packages/ucl/kerberos-all.ucl | 4 ++--
release/packages/ucl/kerberos-kdc-all.ucl | 5 +++++
release/packages/ucl/kerberos-lib-all.ucl | 4 ++--
release/packages/ucl/krb5-all.ucl | 4 ----
release/packages/ucl/krb5-lib-all.ucl | 4 ----
release/tools/oci-image-runtime.conf | 2 +-
58 files changed, 30 insertions(+), 93 deletions(-)
diff --git a/krb5/include/Makefile b/krb5/include/Makefile
index 0a2ceaebb689..c7b3f0f10a99 100644
--- a/krb5/include/Makefile
+++ b/krb5/include/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos-lib
.include <src.opts.mk>
diff --git a/krb5/lib/Makefile.inc b/krb5/lib/Makefile.inc
index 8df7b76410a2..6d86e7a35146 100644
--- a/krb5/lib/Makefile.inc
+++ b/krb5/lib/Makefile.inc
@@ -9,6 +9,8 @@
.include "../Makefile.inc"
+PACKAGE?= kerberos-lib
+
KRB5_KRB5LIBDIR= ${KRB5_SRCLIBDIR}/krb5
KRB5_K5CRYPTODIR= ${KRB5_SRCLIBDIR}/crypto
diff --git a/krb5/lib/apputils/Makefile b/krb5/lib/apputils/Makefile
index 62ef36f0615e..cf430eb3cd27 100644
--- a/krb5/lib/apputils/Makefile
+++ b/krb5/lib/apputils/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5-lib
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/lib/crypto/Makefile b/krb5/lib/crypto/Makefile
index 5efe53d12aa8..ed1cd7764012 100644
--- a/krb5/lib/crypto/Makefile
+++ b/krb5/lib/crypto/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/lib/gssapi/Makefile b/krb5/lib/gssapi/Makefile
index 569452cfb538..63e4d7df4bed 100644
--- a/krb5/lib/gssapi/Makefile
+++ b/krb5/lib/gssapi/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile
index c9f199bdaea3..22d78d7ae2f1 100644
--- a/krb5/lib/kadm5clnt/Makefile
+++ b/krb5/lib/kadm5clnt/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/lib/kadm5srv/Makefile b/krb5/lib/kadm5srv/Makefile
index 90a2180d496a..50f1e859f17b 100644
--- a/krb5/lib/kadm5srv/Makefile
+++ b/krb5/lib/kadm5srv/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/lib/kdb/Makefile b/krb5/lib/kdb/Makefile
index 57fe32e39347..ff17900fb7ec 100644
--- a/krb5/lib/kdb/Makefile
+++ b/krb5/lib/kdb/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/lib/krad/Makefile b/krb5/lib/krad/Makefile
index 28751d9bf9b6..0bc74e8318f8 100644
--- a/krb5/lib/krad/Makefile
+++ b/krb5/lib/krad/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5-lib
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/lib/krb5/Makefile b/krb5/lib/krb5/Makefile
index 76f40a3174cc..163005b6abf3 100644
--- a/krb5/lib/krb5/Makefile
+++ b/krb5/lib/krb5/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/lib/rpc/Makefile b/krb5/lib/rpc/Makefile
index f6dfd014ca3c..3bcd7ff7d9d3 100644
--- a/krb5/lib/rpc/Makefile
+++ b/krb5/lib/rpc/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/libexec/Makefile.inc b/krb5/libexec/Makefile.inc
index bcc6d4b1c21e..6ce709d08304 100644
--- a/krb5/libexec/Makefile.inc
+++ b/krb5/libexec/Makefile.inc
@@ -9,4 +9,5 @@
.include "../Makefile.inc"
+PACKAGE?= kerberos-kdc
BINDIR?= /usr/libexec
diff --git a/krb5/libexec/kadmind/Makefile b/krb5/libexec/kadmind/Makefile
index bb572a32445f..a845851f708e 100644
--- a/krb5/libexec/kadmind/Makefile
+++ b/krb5/libexec/kadmind/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include "../Makefile.inc"
PROG= kadmind
diff --git a/krb5/libexec/kdc/Makefile b/krb5/libexec/kdc/Makefile
index a990666d9338..ac5ada19eb37 100644
--- a/krb5/libexec/kdc/Makefile
+++ b/krb5/libexec/kdc/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include "../Makefile.inc"
PROG= krb5kdc
diff --git a/krb5/libexec/kprop/Makefile b/krb5/libexec/kprop/Makefile
index 74a56232f6bb..1294d9014ee4 100644
--- a/krb5/libexec/kprop/Makefile
+++ b/krb5/libexec/kprop/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include "../Makefile.inc"
PROG= kprop
diff --git a/krb5/libexec/kpropd/Makefile b/krb5/libexec/kpropd/Makefile
index 2fb2bfdff228..e7ffe5a26016 100644
--- a/krb5/libexec/kpropd/Makefile
+++ b/krb5/libexec/kpropd/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= kpropd
LIBADD= kprop_util kdb5 kadm5clnt_mit gssrpc gssapi_krb5 krb5 k5crypto \
diff --git a/krb5/libexec/kproplog/Makefile b/krb5/libexec/kproplog/Makefile
index 533b6fdaa5c2..81405260a06e 100644
--- a/krb5/libexec/kproplog/Makefile
+++ b/krb5/libexec/kproplog/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= kproplog
LIBADD= kadm5srv_mit kdb5 gssrpc gssapi_krb5 krb5 k5crypto com_err \
krb5support sys
diff --git a/krb5/plugins/Makefile.inc b/krb5/plugins/Makefile.inc
index 846770a801e0..e888f79acd49 100644
--- a/krb5/plugins/Makefile.inc
+++ b/krb5/plugins/Makefile.inc
@@ -7,6 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
+PACKAGE?= kerberos-kdc
MK_INSTALLLIB= no
SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR}
PLUGINSDIR= ${LIBDIR_BASE}/krb5/plugins
diff --git a/krb5/plugins/audit/Makefile b/krb5/plugins/audit/Makefile
index eb615a3b89f4..f85e5d1a81a5 100644
--- a/krb5/plugins/audit/Makefile
+++ b/krb5/plugins/audit/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/plugins/k5tls/Makefile b/krb5/plugins/k5tls/Makefile
index 790794d4744c..30738a70e71d 100644
--- a/krb5/plugins/k5tls/Makefile
+++ b/krb5/plugins/k5tls/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/plugins/kdb/db2/Makefile b/krb5/plugins/kdb/db2/Makefile
index a91bea73677b..e9429bc03de1 100644
--- a/krb5/plugins/kdb/db2/Makefile
+++ b/krb5/plugins/kdb/db2/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/plugins/preauth/Makefile.inc
b/krb5/plugins/preauth/Makefile.inc
index aecd360f50e7..8a713e4d0856 100644
--- a/krb5/plugins/preauth/Makefile.inc
+++ b/krb5/plugins/preauth/Makefile.inc
@@ -7,6 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
+PACKAGE?= kerberos-kdc
LIBDIR= ${PLUGINSDIR}/preauth
SHLIBDIR= ${LIBDIR}
diff --git a/krb5/plugins/preauth/otp/Makefile
b/krb5/plugins/preauth/otp/Makefile
index 724d8df16230..48fc35db0727 100644
--- a/krb5/plugins/preauth/otp/Makefile
+++ b/krb5/plugins/preauth/otp/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/plugins/preauth/pkinit/Makefile
b/krb5/plugins/preauth/pkinit/Makefile
index 600b02b02346..7d227aca5420 100644
--- a/krb5/plugins/preauth/pkinit/Makefile
+++ b/krb5/plugins/preauth/pkinit/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/plugins/preauth/spake/Makefile
b/krb5/plugins/preauth/spake/Makefile
index 62d8a5aa9574..3aa375cb5100 100644
--- a/krb5/plugins/preauth/spake/Makefile
+++ b/krb5/plugins/preauth/spake/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/plugins/preauth/test/Makefile
b/krb5/plugins/preauth/test/Makefile
index 411868e9a1d1..99f632c0cb17 100644
--- a/krb5/plugins/preauth/test/Makefile
+++ b/krb5/plugins/preauth/test/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/usr.bin/Makefile.inc b/krb5/usr.bin/Makefile.inc
index ea8e5ee805bb..f27bd78cd54c 100644
--- a/krb5/usr.bin/Makefile.inc
+++ b/krb5/usr.bin/Makefile.inc
@@ -9,4 +9,5 @@
.include "../Makefile.inc"
+PACKAGE?= kerberos
BINDIR?= /usr/bin
diff --git a/krb5/usr.bin/gss-client/Makefile b/krb5/usr.bin/gss-client/Makefile
index f2b5285ac3bb..acd67f9c17c6 100644
--- a/krb5/usr.bin/gss-client/Makefile
+++ b/krb5/usr.bin/gss-client/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= gss-client
LIBADD= gssapi_krb5 krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.bin/kadmin/Makefile b/krb5/usr.bin/kadmin/Makefile
index 95fcea307827..36b7378dee11 100644
--- a/krb5/usr.bin/kadmin/Makefile
+++ b/krb5/usr.bin/kadmin/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= kadmin
LIBADD= kadmin_common edit kadm5clnt_mit gssrpc gssapi_krb5 krb5
k5crypto \
diff --git a/krb5/usr.bin/kdestroy/Makefile b/krb5/usr.bin/kdestroy/Makefile
index 4ec2ef4a1392..e3f493ffdc60 100644
--- a/krb5/usr.bin/kdestroy/Makefile
+++ b/krb5/usr.bin/kdestroy/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= kdestroy
LIBADD= krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.bin/kinit/Makefile b/krb5/usr.bin/kinit/Makefile
index 8aff9af3687b..3d1285137f85 100644
--- a/krb5/usr.bin/kinit/Makefile
+++ b/krb5/usr.bin/kinit/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= kinit
LIBADD= kadm5srv_mit kdb5 gssrpc gssapi_krb5 krb5 k5crypto com_err \
diff --git a/krb5/usr.bin/klist/Makefile b/krb5/usr.bin/klist/Makefile
index a5d6cecbaddb..3094a3b69d4b 100644
--- a/krb5/usr.bin/klist/Makefile
+++ b/krb5/usr.bin/klist/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= klist
LIBADD= krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.bin/kpasswd/Makefile b/krb5/usr.bin/kpasswd/Makefile
index 431cf239928e..e4d7d1e8ab84 100644
--- a/krb5/usr.bin/kpasswd/Makefile
+++ b/krb5/usr.bin/kpasswd/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= kpasswd
LIBADD= krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.bin/ksu/Makefile b/krb5/usr.bin/ksu/Makefile
index 4ddfa8096773..37a4c166aec6 100644
--- a/krb5/usr.bin/ksu/Makefile
+++ b/krb5/usr.bin/ksu/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= ksu
.if defined(ENABLE_SUID_K5SU)
BINMODE=4555
diff --git a/krb5/usr.bin/kswitch/Makefile b/krb5/usr.bin/kswitch/Makefile
index 1e9853012ae5..10298f34a9d4 100644
--- a/krb5/usr.bin/kswitch/Makefile
+++ b/krb5/usr.bin/kswitch/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= kswitch
LIBADD= krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.bin/ktutil/Makefile b/krb5/usr.bin/ktutil/Makefile
index abe02965de4d..6bcb4877ed6f 100644
--- a/krb5/usr.bin/ktutil/Makefile
+++ b/krb5/usr.bin/ktutil/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= ktutil
LIBADD= edit krb5 k5crypto com_err krb5profile krb5support krb5ss
tinfow sys
diff --git a/krb5/usr.bin/kvno/Makefile b/krb5/usr.bin/kvno/Makefile
index 203839624414..0a43765e53f4 100644
--- a/krb5/usr.bin/kvno/Makefile
+++ b/krb5/usr.bin/kvno/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= kvno
LIBADD= krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.bin/sclient/Makefile b/krb5/usr.bin/sclient/Makefile
index f27dad42fa08..8a3cc38fe3b6 100644
--- a/krb5/usr.bin/sclient/Makefile
+++ b/krb5/usr.bin/sclient/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= sclient
LIBADD= krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.bin/sim_client/Makefile b/krb5/usr.bin/sim_client/Makefile
index ecdf9ac8885e..3e5ea72407bc 100644
--- a/krb5/usr.bin/sim_client/Makefile
+++ b/krb5/usr.bin/sim_client/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
-
PROG= sim_client
LIBADD= krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.sbin/gss-server/Makefile
b/krb5/usr.sbin/gss-server/Makefile
index 9e80b466d427..c42740045ac4 100644
--- a/krb5/usr.sbin/gss-server/Makefile
+++ b/krb5/usr.sbin/gss-server/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos
PROG= gss-server
diff --git a/krb5/usr.sbin/kadmin.local/Makefile
b/krb5/usr.sbin/kadmin.local/Makefile
index 7e89d0953683..4b99f490bd7b 100644
--- a/krb5/usr.sbin/kadmin.local/Makefile
+++ b/krb5/usr.sbin/kadmin.local/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos-kdc
PROG= kadmin.local
diff --git a/krb5/usr.sbin/kdb5_util/Makefile b/krb5/usr.sbin/kdb5_util/Makefile
index 6a7b66dc205c..5b3d3ecc3410 100644
--- a/krb5/usr.sbin/kdb5_util/Makefile
+++ b/krb5/usr.sbin/kdb5_util/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos-kdc
PROG= kdb5_util
diff --git a/krb5/usr.sbin/sim_server/Makefile
b/krb5/usr.sbin/sim_server/Makefile
index 793a6ad421b1..adaf8d1f087f 100644
--- a/krb5/usr.sbin/sim_server/Makefile
+++ b/krb5/usr.sbin/sim_server/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos
PROG= sim_server
diff --git a/krb5/usr.sbin/sserver/Makefile b/krb5/usr.sbin/sserver/Makefile
index 3b205b490a5f..e4e85b28157e 100644
--- a/krb5/usr.sbin/sserver/Makefile
+++ b/krb5/usr.sbin/sserver/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos
PROG= sserver
diff --git a/krb5/util/build-tools/Makefile b/krb5/util/build-tools/Makefile
index c33d47f70c8f..1a6a373f0e7f 100644
--- a/krb5/util/build-tools/Makefile
+++ b/krb5/util/build-tools/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos-lib
.include "../Makefile.inc"
diff --git a/krb5/util/compile_et/Makefile b/krb5/util/compile_et/Makefile
index 57eb2f614802..03446f2d7d1c 100644
--- a/krb5/util/compile_et/Makefile
+++ b/krb5/util/compile_et/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos
.include "../Makefile.inc"
diff --git a/krb5/util/et/Makefile b/krb5/util/et/Makefile
index 16b700fb5d1f..5d0c2a3e3ca5 100644
--- a/krb5/util/et/Makefile
+++ b/krb5/util/et/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5-lib
+PACKAGE= kerberos-lib
.include <src.opts.mk>
diff --git a/krb5/util/profile/Makefile b/krb5/util/profile/Makefile
index 72ef3176ab5d..a921e29150bb 100644
--- a/krb5/util/profile/Makefile
+++ b/krb5/util/profile/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos-lib
.include <src.opts.mk>
diff --git a/krb5/util/ss/Makefile b/krb5/util/ss/Makefile
index 600d125a7853..e7e025184284 100644
--- a/krb5/util/ss/Makefile
+++ b/krb5/util/ss/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos-lib
.include <src.opts.mk>
diff --git a/krb5/util/support/Makefile b/krb5/util/support/Makefile
index 25ef7faf74ee..bba65bcd89c1 100644
--- a/krb5/util/support/Makefile
+++ b/krb5/util/support/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5-lib
+PACKAGE= kerberos-lib
.include <src.opts.mk>
diff --git a/krb5/util/verto/Makefile b/krb5/util/verto/Makefile
index 18faddb3a09e..8f02d5f897f4 100644
--- a/krb5/util/verto/Makefile
+++ b/krb5/util/verto/Makefile
@@ -7,7 +7,7 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= krb5
+PACKAGE= kerberos-lib
.include <src.opts.mk>
diff --git a/lib/libpam/modules/pam_krb5/Makefile
b/lib/libpam/modules/pam_krb5/Makefile
index b537bf37b7f3..c1792b5fb61d 100644
--- a/lib/libpam/modules/pam_krb5/Makefile
+++ b/lib/libpam/modules/pam_krb5/Makefile
@@ -32,7 +32,7 @@ SRCDIR= ${SRCTOP}/contrib/pam-krb5
${SRCDIR}/pam-util \
${SRCDIR}
-PACKAGE= krb5
+PACKAGE= kerberos
LIB= pam_krb5
LIBADD= com_err krb5
diff --git a/release/packages/ucl/kerberos-all.ucl
b/release/packages/ucl/kerberos-all.ucl
index 6fb7f059296b..bf82040da3d0 100644
--- a/release/packages/ucl/kerberos-all.ucl
+++ b/release/packages/ucl/kerberos-all.ucl
@@ -1,4 +1,4 @@
-comment = "Kerberos Utilities"
+comment = "Kerberos utilities"
desc = <<EOD
-Kerberos Utilities
+The Kerberos command-line utilities, including kinit and kadmin.
EOD
diff --git a/release/packages/ucl/kerberos-kdc-all.ucl
b/release/packages/ucl/kerberos-kdc-all.ucl
new file mode 100644
index 000000000000..068d2f26bc8d
--- /dev/null
+++ b/release/packages/ucl/kerberos-kdc-all.ucl
@@ -0,0 +1,5 @@
+comment = "Kerberos key distribution center"
+desc = <<EOD
+The Kerberos KDC, which manages the Kerberos database and issues tickets
+to clients.
+EOD
diff --git a/release/packages/ucl/kerberos-lib-all.ucl
b/release/packages/ucl/kerberos-lib-all.ucl
index ab769ee16f96..b524563a976d 100644
--- a/release/packages/ucl/kerberos-lib-all.ucl
+++ b/release/packages/ucl/kerberos-lib-all.ucl
@@ -1,4 +1,4 @@
-comment = "Kerberos Libraries"
+comment = "Kerberos libraries"
desc = <<EOD
-Kerberos Libraries
+Libraries requires to run programs that use Kerberos.
EOD
diff --git a/release/packages/ucl/krb5-all.ucl
b/release/packages/ucl/krb5-all.ucl
deleted file mode 100644
index e269aabe1e85..000000000000
--- a/release/packages/ucl/krb5-all.ucl
+++ /dev/null
@@ -1,4 +0,0 @@
-comment = "KRB5 Utilities"
-desc = <<EOD
-KRB5 Utilities
-EOD
diff --git a/release/packages/ucl/krb5-lib-all.ucl
b/release/packages/ucl/krb5-lib-all.ucl
deleted file mode 100644
index 854b8a9f85df..000000000000
--- a/release/packages/ucl/krb5-lib-all.ucl
+++ /dev/null
@@ -1,4 +0,0 @@
-comment = "KRB5 Libraries"
-desc = <<EOD
-KRB5 Libraries
-EOD
diff --git a/release/tools/oci-image-runtime.conf
b/release/tools/oci-image-runtime.conf
index 19ba23d2c834..93aad1e39250 100644
--- a/release/tools/oci-image-runtime.conf
+++ b/release/tools/oci-image-runtime.conf
@@ -12,7 +12,7 @@ oci_image_build() {
install_packages ${abi} ${workdir} \
FreeBSD-runtime \
FreeBSD-certctl \
- FreeBSD-krb5-lib \
+ FreeBSD-kerberos-lib \
FreeBSD-libarchive \
FreeBSD-libexecinfo \
FreeBSD-libucl \
