Page MenuHomeFreeBSD
Files F144522428

D51420.1775188182.diff
No OneTemporary
Actions

Size
15 KB
Referenced Files
None
Subscribers
None

D51420.1775188182.diff
View Options

diff --git a/krb5/include/Makefile b/krb5/include/Makefile
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/lib/libpam/modules/pam_krb5/Makefile
+++ b/lib/libpam/modules/pam_krb5/Makefile
@@ -32,7 +32,7 @@
${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
--- 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
--- /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 certificates
+to clients.
+EOD
diff --git a/release/packages/ucl/kerberos-lib-all.ucl b/release/packages/ucl/kerberos-lib-all.ucl
--- 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

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 3:49 AM (14 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28250919
Default Alt Text
D51420.1775188182.diff (15 KB)

Event Timeline