Page MenuHomeFreeBSD
Files F164281587

D51518.diff
No OneTemporary
Actions

D51518.diff
View Options

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- 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
--- a/krb5/lib/kadm5clnt/Makefile
+++ b/krb5/lib/kadm5clnt/Makefile
@@ -28,7 +28,8 @@
.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 @@
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
--- a/krb5/lib/kadm5srv/Makefile
+++ b/krb5/lib/kadm5srv/Makefile
@@ -37,7 +37,8 @@
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 @@
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
--- a/krb5/lib/krad/Makefile
+++ b/krb5/lib/krad/Makefile
@@ -24,10 +24,6 @@
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
--- a/krb5/lib/rpc/Makefile
+++ b/krb5/lib/rpc/Makefile
@@ -65,10 +65,6 @@
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 @@
.include <bsd.lib.mk>
-.SUFFIXES: .h .c
-
.PATH: ${KRB5_DIR}/lib/rpc
diff --git a/krb5/libexec/kadmind/Makefile b/krb5/libexec/kadmind/Makefile
--- a/krb5/libexec/kadmind/Makefile
+++ b/krb5/libexec/kadmind/Makefile
@@ -29,6 +29,7 @@
-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
--- a/krb5/plugins/kdb/db2/Makefile
+++ b/krb5/plugins/kdb/db2/Makefile
@@ -49,6 +49,7 @@
-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
--- a/krb5/usr.sbin/kdb5_util/Makefile
+++ b/krb5/usr.sbin/kdb5_util/Makefile
@@ -32,6 +32,7 @@
MAN= kdb5_util.8
CFLAGS+=-I${KRB5_DIR}/include \
+ -I${KRB5_DIR}/lib \
-I${KRB5_SRCTOP}/include
MAN= kdb5_util.8

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 31, 8:48 AM (18 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35778101
Default Alt Text
D51518.diff (3 KB)

Event Timeline