Module Name: src
Committed By: mrg
Date: Mon Jun 19 23:56:56 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5clnt: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5srv: Makefile
src/crypto/external/bsd/heimdal/lib/libkafs: Makefile
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
fix missing header issues.
might seems to have an undef symbol issue in libkrb5.so:
hc_UI_UTIL_read_pw_string
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.6 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.7
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.6 Mon May 8 22:17:36 2023
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/05/08 22:17:36 christos Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/19 23:56:55 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -275,6 +275,7 @@ INCSDIR= /usr/include
CPPFLAGS+= \
-I${HEIMDIST}/lib/krb5 \
-I${HEIMDIST}/lib/asn1 \
+ -I${HEIMDIST}/lib
COPTS.krb5__get_mic.c+= -Wno-error=deprecated-declarations
COPTS.krb5__wrap.c+= -Wno-error=deprecated-declarations
Index: src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.4 Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libhdb/Makefile Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/19 23:56:55 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -48,7 +48,8 @@ CPPFLAGS+= \
-I${HEIMBASE}/include/krb5 \
-I${HEIMDIST}/lib/asn1 \
-I${HEIMDIST}/lib/krb5 \
- -DHDB_DB_DIR=\"/var/heimdal\" \
+ -I${HEIMDIST}/lib \
+ -DHDB_DB_DIR=\"/var/heimdal\"
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.4 Mon May 8 22:17:36 2023
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/05/08 22:17:36 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/19 23:56:55 mrg Exp $
USE_FORT?= yes # cryptographic software
@@ -20,6 +20,9 @@ LIBDPLIBS+= asn1 ${.CURDIR}/../libasn1 \
HEIMSRCS= ntlm_err.et ntlm.c
+CPPFLAGS+= \
+ -I${HEIMDIST}/lib
+
INCS= heimntlm.h heimntlm-protos.h ${COMPILE_ET_INCS}
INCSDIR= /usr/include/krb5
Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.8 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.9
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.8 Mon May 8 22:17:36 2023
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/05/08 22:17:36 christos Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/19 23:56:55 mrg Exp $
NOLINT= # defined
@@ -61,7 +61,8 @@ SRCS= \
CPPFLAGS+= \
-I${HEIMDIST}/lib/hx509/ref \
- -I${HEIMDIST}/lib/asn1
+ -I${HEIMDIST}/lib/asn1 \
+ -I${HEIMDIST}/lib
sel-gram.c: ${ASN1_INCS} ${COMPILE_ET_INCS}
Index: src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.4 Mon Jun 19 23:11:44 2023
+++ src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/19 23:56:55 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -18,7 +18,9 @@ LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
HEIMSRCS= kadm5_err.et
-CPPFLAGS+= -I${HEIMDIST}/lib/krb5
+CPPFLAGS+= \
+ -I${HEIMDIST}/lib/krb5 \
+ -I${HEIMDIST}/lib
SRCS = \
ad.c \
Index: src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.5 src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.5 Thu Jul 12 11:13:50 2018
+++ src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/07/12 11:13:50 martin Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/19 23:56:55 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -10,7 +10,9 @@ NOLINT= # defined
.PATH: ${HEIMDIST}/lib/kadm5
LIB= kadm5srv
-CPPFLAGS+= -I${HEIMDIST}/lib/krb5
+CPPFLAGS+= \
+ -I${HEIMDIST}/lib/krb5 \
+ -I${HEIMDIST}/lib
LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
com_err ${.CURDIR}/../libcom_err \
Index: src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.4 Mon May 8 22:17:37 2023
+++ src/crypto/external/bsd/heimdal/lib/libkafs/Makefile Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/05/08 22:17:37 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/19 23:56:55 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -17,6 +17,9 @@ LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
SRCS= afssys.c afskrb5.c common.c rxkad_kdf.c
+CPPFLAGS+= \
+ -I${HEIMDIST}/lib
+
INCS= kafs.h
INCSDIR= /usr/include/krb5
MAN= kafs.3
Index: src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.5 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.5 Mon May 8 22:17:37 2023
+++ src/crypto/external/bsd/heimdal/lib/libkdc/Makefile Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/05/08 22:17:37 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/19 23:56:55 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -36,7 +36,9 @@ SRCS = default_config.c \
INCSDIR=/usr/include/krb5
INCS= kdc-protos.h kdc.h
-CPPFLAGS+= -I${HEIMDIST}/lib/krb5
+CPPFLAGS+= \
+ -I${HEIMDIST}/lib/krb5 \
+ -I${HEIMDIST}/lib
COPTS.kx509.c+= -Wno-error=deprecated-declarations
COPTS.pkinit-ec.c+= -Wno-error=deprecated-declarations
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.12 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.13
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.12 Mon May 8 22:17:37 2023
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Mon Jun 19 23:56:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/05/08 22:17:37 christos Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/19 23:56:56 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -519,7 +519,9 @@ MLINKS= \
krb5_verify_user.3 krb5_verify_user_lrealm.3 \
krb5_verify_user.3 krb5_verify_user_opt.3
-CPPFLAGS+= -I${HEIMDIST}/lib/ipc
+CPPFLAGS+= \
+ -I${HEIMDIST}/lib/ipc \
+ -I${HEIMDIST}/lib
# Prevent collision with old MIT Kerberos includes -- require manual
# intervention of the operator.
