The branch main has been updated by ivy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2a454b05f2c1f9dc2d27f0d553fd1f890b750aa1
commit 2a454b05f2c1f9dc2d27f0d553fd1f890b750aa1
Author: Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-07-25 14:04:03 +0000
Commit: Lexi Winter <i...@freebsd.org>
CommitDate: 2025-07-25 17:31:26 +0000
krb5: remove private headers
I compared the contents of the FreeBSD-kerberos-lib-dev package with
the contents of the security/krb5 port. Based on that, remove all
the headers which are installed by base krb5 but not by the port.
These all appear to be internal headers which are not meant to be
publicly visible.
This removes some headers with unfortunate conflict-prone names like
<internal.h> and <dyn.h>.
Reviewed by: des, cy
Differential Revision: https://reviews.freebsd.org/D51518
---
ObsoleteFiles.inc | 12 ++++++++++++
krb5/lib/kadm5clnt/Makefile | 7 ++-----
krb5/lib/kadm5srv/Makefile | 7 ++-----
krb5/lib/krad/Makefile | 4 ----
krb5/lib/rpc/Makefile | 6 ------
krb5/libexec/kadmind/Makefile | 1 +
krb5/plugins/kdb/db2/Makefile | 1 +
krb5/usr.sbin/kdb5_util/Makefile | 1 +
8 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index e5a3da94e127..2c68b2ab783c 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,18 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20250725: Headers installed by krb5 which shouldn't have been.
+OLD_FILES+=usr/include/kadm5/admin_internal.h
+OLD_FILES+=usr/include/kadm5/admin_xdr.h
+OLD_FILES+=usr/include/kadm5/kadm_rpc.h
+OLD_FILES+=usr/include/kadm5/server_internal.h
+OLD_FILES+=usr/include/internal.h
+OLD_FILES+=usr/include/t_daemon.h
+OLD_FILES+=usr/include/t_test.h
+OLD_FILES+=usr/include/dyn.h
+OLD_FILES+=usr/include/dynP.h
+OLD_FILES+=usr/include/gssrpcint.h
+
# 20250716: Remove an old manual page, vn(4) was removed in FreeBSD 5.0
OLD_FILES+=usr/share/man/man4/vn.4.gz
diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile
index 22d78d7ae2f1..898276e77d04 100644
--- a/krb5/lib/kadm5clnt/Makefile
+++ b/krb5/lib/kadm5clnt/Makefile
@@ -28,7 +28,8 @@ SRCS= alt_prof.c \
.include "${KRB5_SRCTOP}/lib/kadm5clnt/clnt/Makefile.inc"
-CFLAGS+=-I${KRB5_DIR}/lib/kadm5 \
+CFLAGS+=-I${KRB5_DIR}/lib \
+ -I${KRB5_DIR}/lib/kadm5 \
-I${KRB5_DIR}/include \
-I${KRB5_OBJTOP}/include/krb5_private \
-I${KRB5_SRCTOP}/include \
@@ -36,10 +37,6 @@ CFLAGS+=-I${KRB5_DIR}/lib/kadm5 \
INCSDIR=${INCLUDEDIR}/kadm5
INCS= admin.h \
- admin_internal.h \
- admin_xdr.h \
- kadm_rpc.h \
- server_internal.h \
${GENI}
KADM_ERR= kadm_err.et
diff --git a/krb5/lib/kadm5srv/Makefile b/krb5/lib/kadm5srv/Makefile
index 50f1e859f17b..e0ec557a3f5b 100644
--- a/krb5/lib/kadm5srv/Makefile
+++ b/krb5/lib/kadm5srv/Makefile
@@ -37,7 +37,8 @@ INCS= admin.h \
GEN= kadm_err.c kadm_err.h chpass_util_strings.c chpass_util_strings.h
CLEANFILES= ${GEN} ${GENI}
-CFLAGS+=-I${KRB5_DIR}/lib/kadm5 \
+CFLAGS+=-I${KRB5_DIR}/lib \
+ -I${KRB5_DIR}/lib/kadm5 \
-I${KRB5_DIR}/include \
-I${KRB5_OBJTOP}/include/krb5_private \
-I${KRB5_SRCTOP}/include \
@@ -48,10 +49,6 @@ CFLAGS+=-I${KRB5_DIR}/lib/kadm5 \
HDRDIR= ${KRB5_OBJHDR}/kadm5
HDRS= ${HDRDIR}/admin.h \
- ${HDRDIR}/admin_internal.h \
- ${HDRDIR}/admin_xdr.h \
- ${HDRDIR}/kadm_rpc.h \
- ${HDRDIR}/server_internal.h \
${HDRDIR}/chpass_util_strings.h \
${HDRDIR}/kadm_err.h
diff --git a/krb5/lib/krad/Makefile b/krb5/lib/krad/Makefile
index 0bc74e8318f8..a990354c1877 100644
--- a/krb5/lib/krad/Makefile
+++ b/krb5/lib/krad/Makefile
@@ -24,10 +24,6 @@ SRCS= attr.c \
packet.c \
remote.c
-INCS= internal.h \
- t_daemon.h \
- t_test.h
-
CFLAGS+=-I${KRB5_DIR}/lib/krad \
-I${KRB5_DIR}/include \
-I${KRB5_SRCTOP}/include \
diff --git a/krb5/lib/rpc/Makefile b/krb5/lib/rpc/Makefile
index 3bcd7ff7d9d3..a539803cc57c 100644
--- a/krb5/lib/rpc/Makefile
+++ b/krb5/lib/rpc/Makefile
@@ -65,10 +65,6 @@ SRCS= auth_gss.c \
xdr_sizeof.c \
xdr_stdio.c
-INCS= dyn.h \
- dynP.h \
- gssrpcint.h
-
CFLAGS+=-I${KRB5_DIR}/lib/rpc \
-I${KRB5_DIR}/include \
-I${KRB5_SRCTOP}/include \
@@ -79,6 +75,4 @@ CFLAGS+=-I${KRB5_DIR}/lib/rpc \
.include <bsd.lib.mk>
-.SUFFIXES: .h .c
-
.PATH: ${KRB5_DIR}/lib/rpc
diff --git a/krb5/libexec/kadmind/Makefile b/krb5/libexec/kadmind/Makefile
index a845851f708e..62046214af7b 100644
--- a/krb5/libexec/kadmind/Makefile
+++ b/krb5/libexec/kadmind/Makefile
@@ -29,6 +29,7 @@ CFLAGS+=-I${KRB5_DIR}/include \
-I${KRB5_SRCTOP}/include \
-I${KRB5_OBJTOP}/lib/gssapi \
-I${KRB5_OBJTOP}/lib \
+ -I${KRB5_DIR}/lib \
-I${KRB5_DIR}/lib/gssapi/krb5 \
-I${KRB5_DIR}/lib/gssapi/generic
diff --git a/krb5/plugins/kdb/db2/Makefile b/krb5/plugins/kdb/db2/Makefile
index e9429bc03de1..1d42951c3c97 100644
--- a/krb5/plugins/kdb/db2/Makefile
+++ b/krb5/plugins/kdb/db2/Makefile
@@ -49,6 +49,7 @@ CFLAGS+=-I${KRB5_DIR}/plugins/kdb/db2 \
-I${KRB5_DIR}/include \
-I${KRB5_SRCTOP}/include \
-I${KRB5_DIR}/lib/kdb \
+ -I${KRB5_DIR}/lib \
-I${KRB5_OBJTOP}/plugins/kdb/db2 \
-I${KRB5_OBJTOP}/lib/kdb
diff --git a/krb5/usr.sbin/kdb5_util/Makefile b/krb5/usr.sbin/kdb5_util/Makefile
index 5b3d3ecc3410..1fab7ee58556 100644
--- a/krb5/usr.sbin/kdb5_util/Makefile
+++ b/krb5/usr.sbin/kdb5_util/Makefile
@@ -32,6 +32,7 @@ INCS= ${GENI}
MAN= kdb5_util.8
CFLAGS+=-I${KRB5_DIR}/include \
+ -I${KRB5_DIR}/lib \
-I${KRB5_SRCTOP}/include
MAN= kdb5_util.8
