Module Name: src
Committed By: martin
Date: Sat Oct 14 06:56:36 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal [netbsd-10]: Makefile.inc
src/crypto/external/bsd/heimdal/include [netbsd-10]: config.h
src/crypto/external/bsd/heimdal/lib/libhdb [netbsd-10]: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5 [netbsd-10]: Makefile
src/crypto/external/bsd/heimdal/libexec/digest-service [netbsd-10]:
Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd [netbsd-10]: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master [netbsd-10]:
Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave [netbsd-10]:
Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind [netbsd-10]: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd [netbsd-10]: Makefile
src/crypto/external/bsd/heimdal/sbin/hprop [netbsd-10]: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log [netbsd-10]: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin [netbsd-10]: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc [netbsd-10]: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash [netbsd-10]: Makefile
src/share/mk [netbsd-10]: bsd.prog.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #412):
share/mk/bsd.prog.mk: revision 1.346
crypto/external/bsd/heimdal/sbin/kstash/Makefile: revision 1.6
share/mk/bsd.prog.mk: revision 1.347
crypto/external/bsd/heimdal/sbin/hprop/Makefile: revision 1.6
crypto/external/bsd/heimdal/sbin/kdc/Makefile: revision 1.6
crypto/external/bsd/heimdal/sbin/iprop-log/Makefile: revision 1.6
crypto/external/bsd/heimdal/lib/libkrb5/Makefile: revision 1.16
crypto/external/bsd/heimdal/libexec/digest-service/Makefile: revision
1.6
crypto/external/bsd/heimdal/Makefile.inc: revision 1.10
crypto/external/bsd/heimdal/Makefile.inc: revision 1.11
crypto/external/bsd/heimdal/Makefile.inc: revision 1.9
crypto/external/bsd/heimdal/libexec/kadmind/Makefile: revision 1.8
crypto/external/bsd/heimdal/lib/libhdb/Makefile: revision 1.6
crypto/external/bsd/heimdal/include/config.h: revision 1.12
crypto/external/bsd/heimdal/libexec/hpropd/Makefile: revision 1.6
crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile: revision 1.6
crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile: revision 1.6
crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile: revision 1.6
crypto/external/bsd/heimdal/sbin/kadmin/Makefile: revision 1.7
heimdal: Disable sqlite3 credential cache (SCC).
SCC is not usable in Heimdal 7.8.0, and this brings a dependency on
libsqlite3 into libkrb5 and therefore libgssapi, which is problematic
downstream applications that have sqlite3 from pkgsrc or statically
built in.
SCC will undergo substantial revision in the next Heimdal version
https://github.com/heimdal/heimdal/pull/1143. We can revisit later
how to deal with this -- perhaps by symbol-renaming a copy of sqlite3
in Heimdal as it looks like upstream intends to do.
PR lib/57406
bsd.prog.mk: krb5 stuff no longer needs to link against sqlite3.
(Why is this here? Seems like it should be a .mk fragment under
crypto/external/bsd/heimdal -- that way I would have found it for the
previous commit.)
PR lib/57406
heimdal: No need for -lm, was only added for -lsqlite3.
PR lib/57406
heimdal: Make sure whatever uses libhdb also gets libsqlite3 & libm.
Loose ends for static builds in the fix for PR lib/57406.
To generate a diff of this commit:
cvs rdiff -u -r1.6.6.1 -r1.6.6.2 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.10.8.1 -r1.10.8.2 \
src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.4.22.1 -r1.4.22.2 \
src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.11.22.1 -r1.11.22.2 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.3.22.1 -r1.3.22.2 \
src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.2.56.1 -r1.2.56.2 \
src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.341.2.1 -r1.341.2.2 src/share/mk/bsd.prog.mk
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/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.6.6.1 src/crypto/external/bsd/heimdal/Makefile.inc:1.6.6.2
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.6.6.1 Fri Aug 11 13:39:44 2023
+++ src/crypto/external/bsd/heimdal/Makefile.inc Sat Oct 14 06:56:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6.6.1 2023/08/11 13:39:44 martin Exp $
+# $NetBSD: Makefile.inc,v 1.6.6.2 2023/10/14 06:56:35 martin Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -22,8 +22,10 @@ DPLIBROKEN= roken ${HEIMBASE}/lib/librok
DPLIBSL= sl ${HEIMBASE}/lib/libsl
DPLIBVERS= vers ${HEIMBASE}/lib/libvers
DPLIBWIND= wind ${HEIMBASE}/lib/libwind
-KRB5LDADD= -lsqlite3 -lcrypto -lcrypt -lm
-KRB5DPADD= ${LIBSQLITE3} ${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
+KRB5LDADD= -lcrypto -lcrypt
+KRB5DPADD= ${LIBCRYPTO} ${LIBCRYPT}
+HDBLDADD= -lsqlite3 -lm
+HDBDPADD= ${LIBSQLITE3} ${LIBM}
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
Index: src/crypto/external/bsd/heimdal/include/config.h
diff -u src/crypto/external/bsd/heimdal/include/config.h:1.10.8.1 src/crypto/external/bsd/heimdal/include/config.h:1.10.8.2
--- src/crypto/external/bsd/heimdal/include/config.h:1.10.8.1 Fri Aug 11 13:40:05 2023
+++ src/crypto/external/bsd/heimdal/include/config.h Sat Oct 14 06:56:35 2023
@@ -754,7 +754,7 @@ static /**/const char *const rcsid[] = {
#define HAVE_SA_FAMILY_T 1
/* Define if you want support for cache in sqlite. */
-#define HAVE_SCC 1
+/* #undef HAVE_SCC */
/* Define to 1 if you have the <search.h> header file. */
#define HAVE_SEARCH_H 1
Index: src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.4.22.1 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.4.22.2
--- src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.4.22.1 Fri Aug 11 13:40:06 2023
+++ src/crypto/external/bsd/heimdal/lib/libhdb/Makefile Sat Oct 14 06:56:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.22.1 2023/08/11 13:40:06 martin Exp $
+# $NetBSD: Makefile,v 1.4.22.2 2023/10/14 06:56:35 martin Exp $
USE_FORT?= yes # network protocol library
@@ -18,7 +18,8 @@ LIBDPLIBS+= hx509 ${HEIMBASE}/lib/libhx
com_err ${HEIMBASE}/lib/libcom_err \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
- heimbase ${HEIMBASE}/lib/libheimbase
+ heimbase ${HEIMBASE}/lib/libheimbase \
+ sqlite3 ${NETBSDSRCDIR}/external/public-domain/sqlite/lib
HEIMSRCS= hdb_err.et hdb.asn1
ASN1_OPTS.hdb.asn1+= --one-code-file --sequence=HDB-Ext-KeySet --sequence=Keys
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.11.22.1 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.11.22.2
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.11.22.1 Fri Aug 11 13:40:07 2023
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Sat Oct 14 06:56:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11.22.1 2023/08/11 13:40:07 martin Exp $
+# $NetBSD: Makefile,v 1.11.22.2 2023/10/14 06:56:34 martin Exp $
USE_FORT?= yes # network protocol library
@@ -23,7 +23,6 @@ LIBDPLIBS+= \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
heimbase ${HEIMBASE}/lib/libheimbase \
- sqlite3 ${NETBSDSRCDIR}/external/public-domain/sqlite/lib \
crypt ${NETBSDSRCDIR}/lib/libcrypt
HEIMSRCS= krb_err.et krb5_err.et heim_err.et k524_err.et
Index: src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.2.56.1 Fri Aug 11 13:40:07 2023
+++ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile Sat Oct 14 06:56:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:07 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:34 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -19,5 +19,5 @@ PROGDPLIBS+= ${DPLIBKDC} ${DPLIBHDB} ${D
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= ${KRB5LDADD}
-DPADD+= ${KRB5DPADD}
+LDADD+= ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.2.56.1 Fri Aug 11 13:40:08 2023
+++ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile Sat Oct 14 06:56:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:08 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:35 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -19,5 +19,5 @@ PROGDPLIBS+= ${DPLIBHDB}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= ${KRB5LDADD}
-DPADD+= ${KRB5DPADD}
+LDADD+= ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.2.56.1 Fri Aug 11 13:40:08 2023
+++ src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile Sat Oct 14 06:56:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:08 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:35 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -25,5 +25,5 @@ PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= -lutil ${KRB5LDADD}
-DPADD+= ${LIBUTIL} ${KRB5DPADD}
+LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.2.56.1 Fri Aug 11 13:40:08 2023
+++ src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile Sat Oct 14 06:56:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:08 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:35 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -22,5 +22,5 @@ PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= -lutil ${KRB5LDADD}
-DPADD+= ${LIBUTIL} ${KRB5DPADD}
+LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.2.56.1 Fri Aug 11 13:40:08 2023
+++ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile Sat Oct 14 06:56:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:08 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:35 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -23,5 +23,5 @@ PROGDPLIBS+= ${DPLIBGSSAPI} ${DPLIBKADM5
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= -lutil ${KRB5LDADD}
-DPADD+= ${LIBUTIL} ${KRB5DPADD}
+LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.2.56.1 Fri Aug 11 13:40:08 2023
+++ src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile Sat Oct 14 06:56:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:08 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:35 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -17,5 +17,5 @@ PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKADM5SR
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= -lutil ${KRB5LDADD}
-DPADD+= ${LIBUTIL} ${KRB5DPADD}
+LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.2.56.1 Fri Aug 11 13:40:08 2023
+++ src/crypto/external/bsd/heimdal/sbin/hprop/Makefile Sat Oct 14 06:56:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:08 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:34 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -25,5 +25,5 @@ PROGDPLIBS+= ${DPLIBHDB}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= -lutil ${KRB5LDADD}
-DPADD+= ${LIBUTIL} ${KRB5DPADD}
+LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.2.56.1 Fri Aug 11 13:40:09 2023
+++ src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile Sat Oct 14 06:56:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:09 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:34 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -17,5 +17,5 @@ PROGDPLIBS += ${DPLIBKADM5SRV} ${DPLIBHD
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= -ledit -lterminfo ${KRB5LDADD}
-DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD}
+LDADD+= -ledit -lterminfo ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.3.22.1 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.3.22.2
--- src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.3.22.1 Fri Aug 11 13:40:09 2023
+++ src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile Sat Oct 14 06:56:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.22.1 2023/08/11 13:40:09 martin Exp $
+# $NetBSD: Makefile,v 1.3.22.2 2023/10/14 06:56:35 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -49,5 +49,5 @@ CLEANFILES+=kadmin.8
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= -lutil -ledit -lterminfo ${KRB5LDADD}
-DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD}
+LDADD+= -lutil -ledit -lterminfo ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.2.56.1 Fri Aug 11 13:40:09 2023
+++ src/crypto/external/bsd/heimdal/sbin/kdc/Makefile Sat Oct 14 06:56:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:09 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:34 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -26,5 +26,5 @@ MAN= kdc.8
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+= -lutil ${KRB5LDADD}
-DPADD+= ${LIBUTIL} ${KRB5DPADD}
+LDADD+= -lutil ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.2.56.1 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.2.56.2
--- src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.2.56.1 Fri Aug 11 13:40:09 2023
+++ src/crypto/external/bsd/heimdal/sbin/kstash/Makefile Sat Oct 14 06:56:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.56.1 2023/08/11 13:40:09 martin Exp $
+# $NetBSD: Makefile,v 1.2.56.2 2023/10/14 06:56:34 martin Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -27,5 +27,5 @@ PROGDPLIBS+= ${DPLIBHDB}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-LDADD+=${KRB5LDADD}
-DPADD+=${KRB5DPADD}
+LDADD+=${KRB5LDADD} ${HDBLDADD}
+DPADD+=${KRB5DPADD} ${HDBDPADD}
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.341.2.1 src/share/mk/bsd.prog.mk:1.341.2.2
--- src/share/mk/bsd.prog.mk:1.341.2.1 Fri Aug 11 13:43:42 2023
+++ src/share/mk/bsd.prog.mk Sat Oct 14 06:56:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.341.2.1 2023/08/11 13:43:42 martin Exp $
+# $NetBSD: bsd.prog.mk,v 1.341.2.2 2023/10/14 06:56:34 martin Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -222,11 +222,11 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
LIBKRB5_LDADD+= -lkrb5 -lcom_err \
-lhx509 -lcrypto -lasn1 \
-lwind -lheimbase -lcom_err -lroken \
- -lsqlite3 -lm -lcrypt -lutil
+ -lcrypt -lutil
LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \
${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
- ${LIBSQLITE3} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
+ ${LIBCRYPT} ${LIBUTIL}
LIBGSSAPI_LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
LIBGSSAPI_DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
.endif
