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
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user