Module Name: src
Committed By: christos
Date: Tue Jun 20 17:23:05 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/bin: Makefile.inc
src/crypto/external/bsd/heimdal/bin/gsstool: Makefile
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile
src/crypto/external/bsd/heimdal/bin/kcc: Makefile
src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile
src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile
src/crypto/external/bsd/heimdal/bin/kinit: Makefile
src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile
src/crypto/external/bsd/heimdal/bin/kvno: Makefile
src/crypto/external/bsd/heimdal/bin/string2key: Makefile
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
src/crypto/external/bsd/heimdal/lib/libvers: Makefile
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile
Log Message:
Use PROGDPLIBS instead of LDADD/DPADD; remove ui.c kludges
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/kvno/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/lib/libvers/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/ktutil/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/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.6 src/crypto/external/bsd/heimdal/Makefile.inc:1.7
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.6 Thu Jul 23 03:53:35 2020
+++ src/crypto/external/bsd/heimdal/Makefile.inc Tue Jun 20 13:23:01 2023
@@ -1,20 +1,27 @@
-# $NetBSD: Makefile.inc,v 1.6 2020/07/23 07:53:35 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2023/06/20 17:23:01 christos Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
SSLBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}
-LIBVERSDIR!= cd ${HEIMBASE}/lib/libvers && ${PRINTOBJDIR}
-LIBVERS= ${LIBVERSDIR}/libvers.a
-
-LIBIPCDIR!= cd ${HEIMBASE}/lib/libipc && ${PRINTOBJDIR}
-LIBIPC= ${LIBIPCDIR}/libipc.a
-.if ${MKPICLIB} != "yes"
-LIBIPC_PIC= ${LIBIPCDIR}/libipc.a
-.else
-LIBIPC_PIC= ${LIBIPCDIR}/libipc_pic.a
-.endif
+DPLIBASN1= asn1 ${HEIMBASE}/lib/libasn1
+DPLIBCOM_ERR= com_err ${HEIMBASE}/lib/libcom_err
+DPLIBGSSAPI= gssapi ${HEIMBASE}/lib/libgssapi
+DPLIBHDB= hdb ${HEIMBASE}/lib/libhdb
+DPLIBHEIMBASE= heimbase ${HEIMBASE}/lib/libheimbase
+DPLIBHEIMNTLM= heimntlm ${HEIMBASE}/lib/libheimntlm
+DPLIBHX509= hx509 ${HEIMBASE}/lib/libhx509
+DPLIBIPC= ipc ${HEIMBASE}/lib/libipc
+DPLIBKADM5CLNT= kadm5clnt ${HEIMBASE}/lib/libkadm5clnt
+DPLIBKADM5SRV= kadm5srv ${HEIMBASE}/lib/libkadm5srv
+DPLIBKAFS= kafs ${HEIMBASE}/lib/libkafs
+DPLIBKDC= kdc ${HEIMBASE}/lib/libkdc
+DPLIBKRB5= krb5 ${HEIMBASE}/lib/libkrb5
+DPLIBROKEN= roken ${HEIMBASE}/lib/libroken
+DPLIBSL= sl ${HEIMBASE}/lib/libsl
+DPLIBVERS= vers ${HEIMBASE}/lib/libvers
+DPLIBWIND= wind ${HEIMBASE}/lib/libwind
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
Index: src/crypto/external/bsd/heimdal/bin/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.4 src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.5
--- src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.4 Sat Feb 24 19:16:48 2018
+++ src/crypto/external/bsd/heimdal/bin/Makefile.inc Tue Jun 20 13:23:01 2023
@@ -1,9 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/02/25 00:16:48 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2023/06/20 17:23:01 christos Exp $
BINDIR=/usr/bin
-LDADD+= ${LIBKRB5_LDADD}
-DPADD+= ${LIBKRB5_DPADD}
-
-LDADD+= -lheimbase ${LIBVERS}
-DPADD+= ${LIBHEIMBASE} ${LIBVERS}
+PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
Index: src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.2 Wed May 25 15:21:16 2011
+++ src/crypto/external/bsd/heimdal/bin/gsstool/Makefile Tue Jun 20 13:23:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 17:23:01 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -13,11 +13,9 @@ HEIMSRCS= gsstool.c gss-commands.in
MAN=
-LDADD+= -lgssapi -lheimntlm
-LDADD+= -lsl ${LIBVERS}
+PROGDPLIBS += ${DPLIBGSSAPI} ${DPLIBSL}
+
LDADD+= -ledit -lterminfo
-DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM}
-DPADD+= ${LIBSL}
DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
Index: src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.4 Mon Jun 19 20:30:16 2023
+++ src/crypto/external/bsd/heimdal/bin/hxtool/Makefile Tue Jun 20 13:23:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:01 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -7,20 +7,15 @@ USE_FORT?= yes # cryptographic software
.PATH: ${HEIMDIST}/lib/hx509
-CPPFLAGS+=-I${HEIMDIST}/lib
-
PROG= hxtool
HEIMSRCS= hxtool.c hxtool-commands.in
MAN=
-LDADD+= -lgssapi
-LDADD+= -lsl
-LDADD+= -ledit -lterminfo
-DPADD+= ${LIBGSSAPI}
-DPADD+= ${LIBSL}
-DPADD+= ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBGSSAPI} ${DPLIBHX509} ${DPLIBSL}
+LDADD+= -lcrypto -ledit -lterminfo
+DPADD+= ${LIBCRYPTO} ${LIBEDIT} ${LIBTERMINFO}
COPTS.hxtool.c+= -Wno-error=deprecated-declarations
Index: src/crypto/external/bsd/heimdal/bin/kcc/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.4 Mon Jun 19 20:30:16 2023
+++ src/crypto/external/bsd/heimdal/bin/kcc/Makefile Tue Jun 20 13:23:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:01 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -21,11 +21,9 @@ SRCS= copy_cred_cache.c \
CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
CPPFLAGS+= -I${HEIMDIST}/kuser
-CPPFLAGS+= -I${HEIMDIST}/lib
-LDADD+= -lkafs -lsl
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBSL}
LDADD+= -ledit -lterminfo
-DPADD+= ${LIBKAFS} ${LIBSL}
DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
Index: src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.3 Mon Jun 19 20:30:16 2023
+++ src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile Tue Jun 20 13:23:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,10 +10,7 @@ USE_FORT?= yes # cryptographic software
PROG= kdestroy
SRCS= kdestroy.c
-LDADD+= -lkafs -lsl -lheimntlm
-DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
-
-CPPFLAGS+= -I${HEIMDIST}/lib
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.3 Mon Jun 19 20:30:16 2023
+++ src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile Tue Jun 20 13:23:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,10 +10,7 @@ USE_FORT?= yes # cryptographic software
PROG= kgetcred
SRCS= kgetcred.c
-LDADD+= -lkafs -lsl -lheimntlm
-DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
-
-CPPFLAGS+= -I${HEIMDIST}/lib
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kinit/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.3 Mon Jun 19 20:30:16 2023
+++ src/crypto/external/bsd/heimdal/bin/kinit/Makefile Tue Jun 20 13:23:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,16 +11,10 @@ PROG= kinit
SRCS= kinit.c
CPPFLAGS+= -I${HEIMDIST}/lib/ntlm
-CPPFLAGS+= -I${HEIMDIST}/lib
-LDADD+= -lkafs -lsl -lheimntlm
-DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
-
-# XXX: Pull this in from hcrypto. Be sure to be last!
-SRCS+= ui.c
-.PATH: ${HEIMDIST}/lib/hcrypto
-CPPFLAGS.ui.c+= \
- -I${HEIMDIST}/lib/hcrypto
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
+LDADD+= -lcrypto
+DPSDD+= ${LIBCRYPTO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.3 Mon Jun 19 19:11:43 2023
+++ src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile Tue Jun 20 13:23:02 2023
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:43 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
USE_FORT?= yes # cryptographic software
-.PATH: ${HEIMDIST}/kpasswd ${HEIMDIST}/lib/hcrypto
-
-CPPFLAGS+=-I${HEIMDIST}/lib
+.PATH: ${HEIMDIST}/kpasswd
PROG= kpasswd
-SRCS= kpasswd.c ui.c
+SRCS= kpasswd.c
-LDADD+= -lkafs -lsl -lheimntlm
-DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kvno/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.2 Mon Jun 19 19:11:43 2023
+++ src/crypto/external/bsd/heimdal/bin/kvno/Makefile Tue Jun 20 13:23:02 2023
@@ -1,26 +1,25 @@
-# $NetBSD: Makefile,v 1.2 2023/06/19 23:11:43 christos Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
USE_FORT?= yes # cryptographic software
-.PATH: ${HEIMDIST}/kuser ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/kuser
PROG= kvno
#HEIMSRCS= kcc-commands.in
-SRCS= kvno.c ui.c
+SRCS= kvno.c
MAN= kvno.1
-CPPFLAGS+= -I${DESTDIR}/usr/include/krb5 -I${HEIMDIST}/lib
+CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
COPTS.kvno.c+= -Wno-deprecated-declarations
-LDADD+= -lkafs -lsl
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBSL}
LDADD+= -ledit -lterminfo
-DPADD+= ${LIBKAFS} ${LIBSL}
DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
Index: src/crypto/external/bsd/heimdal/bin/string2key/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.3 Mon Jun 19 19:11:44 2023
+++ src/crypto/external/bsd/heimdal/bin/string2key/Makefile Tue Jun 20 13:23:02 2023
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
USE_FORT?= yes # cryptographic software
-.PATH: ${HEIMDIST}/kdc ${HEIMDIST}/lib/hcrypto
-
-CPPFLAGS+=-I${HEIMDIST}/lib
+.PATH: ${HEIMDIST}/kdc
PROG= string2key
-SRCS= string2key.c ui.c
+SRCS= string2key.c
MAN= string2key.8
CPPFLAGS+= \
@@ -22,5 +20,8 @@ CPPFLAGS+= \
-I${HEIMBASE}/lib/libheimntlm \
-I${HEIMBASE}/lib/libwind \
+LDADD+=-lcrypto
+DPADD+=${LIBCRYPTO}
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.3 Mon Jun 19 19:11:44 2023
+++ src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile Tue Jun 20 13:23:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
WARNS?= 2 # XXX -Wextra
@@ -7,14 +7,12 @@ NOLINT= # defined
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
-.PATH: ${HEIMDIST}/lib/krb5 ${HEIMDIST}/lib/hcrypto
-
-CPPFLAGS+=-I${HEIMDIST}/lib
+.PATH: ${HEIMDIST}/lib/krb5
PROG= verify_krb5_conf
MAN= verify_krb5_conf.8
-SRCS= verify_krb5_conf.c ui.c
+SRCS= verify_krb5_conf.c
#CPPFLAGS+= -I. \
# -I${DIST}/heimdal/lib/asn1 \
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.14 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.15
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.14 Mon Jun 19 20:30:17 2023
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Tue Jun 20 13:23:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/06/20 00:30:17 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/20 17:23:02 christos Exp $
USE_FORT?= yes # network protocol library
@@ -520,8 +520,7 @@ MLINKS= \
krb5_verify_user.3 krb5_verify_user_opt.3
CPPFLAGS+= \
- -I${HEIMDIST}/lib/ipc \
- -I${HEIMDIST}/lib
+ -I${HEIMDIST}/lib/ipc
# Prevent collision with old MIT Kerberos includes -- require manual
# intervention of the operator.
@@ -560,15 +559,6 @@ COPTS.salt-des.c+= -Wno-error=deprecated
COPTS.salt-des3.c+= -Wno-error=deprecated-declarations
COPTS.sp800-108-kdf.c+= -Wno-error=deprecated-declarations
-# XXX: Pull this in from hcrypto. Be sure to be last! This subdir
-# XXX: also has a "doxygen.c" in it, but the .PATH ordering ensures
-# XXX: that the lib/krb5 version is used here, not the lib/hcrypto
-# XXX: version.
-SRCS+= ui.c
-.PATH: ${HEIMDIST}/lib/hcrypto
-CPPFLAGS.ui.c+= \
- -I${HEIMDIST}/lib/hcrypto
-
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.lib.mk>
.include <bsd.info.mk>
Index: src/crypto/external/bsd/heimdal/lib/libvers/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libvers/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libvers/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libvers/Makefile:1.2 Sun Aug 28 07:20:16 2011
+++ src/crypto/external/bsd/heimdal/lib/libvers/Makefile Tue Jun 20 13:23:03 2023
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2011/08/28 11:20:16 elric Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 17:23:03 christos Exp $
+LIBISPRIVATE= yes
NOLINKLIB= # defined
NOPIC= # defined
NOPROFILE= # defined
Index: src/crypto/external/bsd/heimdal/libexec/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.6 src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.7
--- src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.6 Sat Feb 24 19:16:48 2018
+++ src/crypto/external/bsd/heimdal/libexec/Makefile.inc Tue Jun 20 13:23:03 2023
@@ -1,9 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.6 2018/02/25 00:16:48 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2023/06/20 17:23:03 christos Exp $
BINDIR=/usr/libexec
-LDADD+= ${LIBKRB5_LDADD}
-DPADD+= ${LIBKRB5_DPADD}
-
-LDADD+= -lheimntlm ${LIBVERS}
-DPADD+= ${LIBHEIMNTLM} ${LIBVERS}
+PROGDPLIBS+= ${DPLIBKRB5} ${DPLIBHEIMNTLM} ${DPLIBROKEN} ${DPLIBVERS}
Index: src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.3 src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.4
--- src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.3 Mon Jun 19 19:11:44 2023
+++ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile Tue Jun 20 13:23:03 2023
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
-.PATH: ${HEIMDIST}/kdc ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/kdc
PROG= digest-service
-SRCS= digest-service.c ui.c
+SRCS= digest-service.c
MAN=
CPPFLAGS+= \
-I${HEIMBASE}/include/krb5 \
-I${HEIMDIST}/lib/krb5 \
- -I${HEIMDIST}/lib/ipc \
- -I${HEIMDIST}/lib
+ -I${HEIMDIST}/lib/ipc
-LDADD+= -lkdc -lhdb
-DPADD+= ${LIBKDC} ${LIBHDB}
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKDC} ${DPLIBHDB}
+LDADD+=-lcrypto
+DPADD+=${LIBCRYPTO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.3 src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.4
--- src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.3 Mon Jun 19 19:11:44 2023
+++ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile Tue Jun 20 13:23:03 2023
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
-.PATH: ${HEIMDIST}/kdc ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/kdc
PROG= hpropd
-SRCS= hpropd.c ui.c
+SRCS= hpropd.c
MAN= hpropd.8
CPPFLAGS+= \
-I${HEIMBASE}/include/krb5 \
-I${HEIMDIST}/lib/asn1 \
- -I${HEIMDIST}/lib/krb5 \
- -I${HEIMDIST}/lib
+ -I${HEIMDIST}/lib/krb5
-LDADD+= -lhdb
-DPADD+= ${LIBHDB}
+PROGDPLIBS+= ${DPLIBHDB}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.3 src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.4
--- src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.3 Mon Jun 19 19:11:44 2023
+++ src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile Tue Jun 20 13:23:03 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
-.PATH: ${HEIMDIST}/lib/kadm5 ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/lib/kadm5
PROG= ipropd-master
@@ -13,17 +13,16 @@ MLINKS= \
iprop.8 ipropd-slave.8
SRCS+= ipropd_master.c \
- ipropd_common.c \
- ui.c
+ ipropd_common.c
CPPFLAGS+= \
-I${HEIMDIST}/lib/krb5 \
-I${HEIMDIST}/lib/asn1 \
- -I${HEIMDIST}/lib \
-I${DESTDIR}/usr/include/kadm5
-LDADD+= -lkadm5srv -lhdb -lutil
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBUTIL}
+PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB}
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.3 src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.4
--- src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.3 Mon Jun 19 19:11:44 2023
+++ src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile Tue Jun 20 13:23:03 2023
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
-.PATH: ${HEIMDIST}/lib/kadm5 ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/lib/kadm5
PROG= ipropd-slave
# man page included with ipropd-master
MAN=
-SRCS+= ipropd_slave.c ipropd_common.c ui.c
+SRCS+= ipropd_slave.c ipropd_common.c
CPPFLAGS+= \
-I${HEIMDIST}/lib/krb5 \
-I${HEIMDIST}/lib/asn1 \
- -I${HEIMDIST}/lib \
-I${DESTDIR}/usr/include/kadm5
-LDADD+= -lkadm5srv -lhdb -lutil
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBUTIL}
+PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB}
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.6
--- src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.5 Tue Jun 20 03:17:11 2023
+++ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile Tue Jun 20 13:23:03 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2023/06/20 07:17:11 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/20 17:23:03 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
-.PATH: ${HEIMDIST}/kadmin ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/kadmin
PROG= kadmind
MAN= kadmind.8
@@ -11,23 +11,16 @@ MAN= kadmind.8
SRCS+= kadmind.c \
rpc.c \
server.c \
- kadm_conn.c \
- ui.c
+ kadm_conn.c
CPPFLAGS+= \
-I${HEIMDIST}/lib/krb5 \
-I${HEIMDIST}/lib/asn1 \
-I${HEIMBASE}/include/krb5
-LDADD+= -lgssapi -lkadm5srv -lhdb -lutil
-DPADD+= ${LIBGSSAPI} ${LIBKADM5SRV} ${LIBHDB} ${LIBUTIL}
+PROGDPLIBS+= ${DPLIBGSSAPI} ${DPLIBKADM5SRV} ${DPLIBHDB}
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
-
-# XXX
-CLEANFILES+=hcrypto
-.if !make(clean) && !make(cleandir) && !make(distclean) && !make(obj)
-.BEGIN:
- @ln -sf ${HEIMDIST}/lib/hcrypto .
-.endif
Index: src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.3 src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.4
--- src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.3 Mon Jun 19 19:11:44 2023
+++ src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile Tue Jun 20 13:23:03 2023
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
-.PATH: ${HEIMDIST}/kpasswd ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/kpasswd
PROG= kpasswdd
-SRCS= kpasswdd.c ui.c
+SRCS= kpasswdd.c
MAN= kpasswdd.8
CPPFLAGS+= -DINETD_SUPPORT
CPPFLAGS+= -I${HEIMDIST}/lib
-LDADD+= -lkadm5srv -lhdb -lutil
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBUTIL}
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKADM5SRV} ${DPLIBHDB}
+LDADD+= -lcrypto -lutil
+DPADD+= ${LIBCRYPTO} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.5 src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.6
--- src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.5 Sat Feb 24 19:16:48 2018
+++ src/crypto/external/bsd/heimdal/sbin/Makefile.inc Tue Jun 20 13:23:04 2023
@@ -1,9 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.5 2018/02/25 00:16:48 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.6 2023/06/20 17:23:04 christos Exp $
BINDIR=/usr/sbin
-LDADD+= ${LIBKRB5_LDADD}
-DPADD+= ${LIBKRB5_DPADD}
-
-LDADD+= -lheimbase ${LIBVERS}
-DPADD+= ${LIBHEIMBASE} ${LIBVERS}
+PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
Index: src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.3 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.4
--- src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.3 Mon Jun 19 20:30:17 2023
+++ src/crypto/external/bsd/heimdal/sbin/hprop/Makefile Tue Jun 20 13:23:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -19,16 +19,10 @@ CPPFLAGS+= \
-I${HEIMDIST}/lib/asn1 \
-I${HEIMDIST}/lib/hdb \
-I${HEIMDIST}/lib/krb5 \
- -I${HEIMDIST}/lib
-LDADD+= -lhdb -lutil
-DPADD+= ${LIBHDB} ${LIBUTIL}
-
-# XXX: Pull this in from hcrypto. Be sure to be last!
-SRCS+= ui.c
-.PATH: ${HEIMDIST}/lib/hcrypto
-CPPFLAGS.ui.c+= \
- -I${HEIMDIST}/lib/hcrypto
+PROGDPLIBS+= ${DPLIBHDB}
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.3 src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.4
--- src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.3 Mon Jun 19 19:11:45 2023
+++ src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile Tue Jun 20 13:23:04 2023
@@ -1,22 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:45 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
-.PATH: ${HEIMDIST}/lib/kadm5 ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/lib/kadm5
PROG= iprop-log
MAN= iprop-log.8
-CPPFLAGS+=-I${HEIMDIST}/lib
-
-HEIMSRCS= iprop-log.c iprop-commands.in ui.c
+HEIMSRCS= iprop-log.c iprop-commands.in
CPPFLAGS+= -I${DESTDIR}/usr/include/kadm5 -I${HEIMDIST}/lib/krb5
-LDADD+= -lkadm5srv -lhdb -lsl
+PROGDPLIBS += ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBSL}
LDADD+= -ledit -lterminfo
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBSL}
DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
Index: src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.4 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.5
--- src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.4 Mon Jun 19 19:11:45 2023
+++ src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile Tue Jun 20 13:23:04 2023
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2023/06/19 23:11:45 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:04 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
USE_FORT?= yes # network client
-.PATH: ${HEIMDIST}/kadmin ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/kadmin
PROG= kadmin
MAN= kadmin.8
@@ -29,22 +29,20 @@ SRCS= add_enctype.c \
random_password.c \
rename.c \
stash.c \
- ui.c \
util.c
CPPFLAGS+= \
-I${HEIMDIST}/base \
- -I${HEIMDIST}/lib \
-I${HEIMDIST}/lib/krb5 \
-I${HEIMDIST}/lib/asn1 \
-I${HEIMDIST}/lib/wind \
-I${HEIMBASE}/lib/libwind \
-I${DESTDIR}/usr/include/kadm5
-LDADD+= -lkadm5srv -lhdb -lkadm5clnt -lsl
-LDADD+= -lutil -ledit -lterminfo
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBKADM5CLNT} ${LIBSL}
-DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBKADM5CLNT}
+PROGDPLIBS+= ${DPLIBSL}
+LDADD+= -lcrypto -lutil -ledit -lterminfo
+DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
kadmin.8: kadmin.1
@${TOOL_SED} -e 's/KADMIN 1/KADMIN 8/' < ${.ALLSRC} > ${.TARGET}
Index: src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.3 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.4
--- src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.3 Mon Jun 19 20:30:17 2023
+++ src/crypto/external/bsd/heimdal/sbin/kcm/Makefile Tue Jun 20 13:23:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -26,17 +26,11 @@ SRCS= \
sessions.c
CPPFLAGS+= \
- -I${HEIMDIST}/lib/ipc \
- -I${HEIMDIST}/lib
+ -I${HEIMDIST}/lib/ipc
-LDADD+= -lkafs -lheimntlm -lutil
-DPADD+= ${LIBKAFS} ${LIBHEIMNTLM} ${LIBUTIL}
-
-# XXX: Pull this in from hcrypto. Be sure to be last!
-SRCS+= ui.c
-.PATH: ${HEIMDIST}/lib/hcrypto
-CPPFLAGS.ui.c+= \
- -I${HEIMDIST}/lib/hcrypto
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBHEIMNTLM}
+LDADD+= -lcrypto -lutil
+DPADD+= ${LIBCRYPTO} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.3 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.4
--- src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.3 Mon Jun 19 20:30:17 2023
+++ src/crypto/external/bsd/heimdal/sbin/kdc/Makefile Tue Jun 20 13:23:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -19,16 +19,11 @@ CPPFLAGS+= \
-I${HEIMBASE}/include/krb5 \
-I${HEIMDIST}/lib
-LDADD+= -lkdc -lhdb -lheimntlm -lutil
-DPADD+= ${LIBKDC} ${LIBHDB} ${LIBHEIMNTLM} ${LIBUTIL}
+PROGDPLIBS+= ${DPLIBKDC} ${DPLIBHDB} ${DPLIBHEIMNTLM}
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
MAN= kdc.8
-# XXX: Pull this in from hcrypto. Be sure to be last!
-SRCS+= ui.c
-.PATH: ${HEIMDIST}/lib/hcrypto
-CPPFLAGS.ui.c+= \
- -I${HEIMDIST}/lib/hcrypto
-
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.4 src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.5
--- src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.4 Mon Jun 19 20:30:17 2023
+++ src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile Tue Jun 20 13:23:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:05 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,17 +10,9 @@ MAN= kdigest.8
HEIMSRCS+= kdigest.c kdigest-commands.in
-CPPFLAGS+= \
- -I${HEIMDIST}/lib
-
-LDADD+= -lheimntlm -lsl -lutil -ledit -lterminfo
-DPADD+= ${LIBHEIMNTLM} ${LIBSL} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
-
-# XXX: Pull this in from hcrypto. Be sure to be last!
-SRCS+= ui.c
-.PATH: ${HEIMDIST}/lib/hcrypto
-CPPFLAGS.ui.c+= \
- -I${HEIMDIST}/lib/hcrypto
+PROGDPLIBS+= ${DPLIBHEIMNTLM} ${DPLIBSL}
+LDADD+= -lcrypto -lutil -ledit -lterminfo
+DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.3 src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.4
--- src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.3 Mon Jun 19 20:30:17 2023
+++ src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile Tue Jun 20 13:23:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:05 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -9,17 +9,7 @@ PROG= kimpersonate
SRCS= kimpersonate.c
MAN= kimpersonate.8
-CPPFLAGS+= \
- -I${HEIMDIST}/lib
-
-LDADD+= -lkafs -lheimntlm
-DPADD+= ${LIBKAFS} ${LIBHEIMNTLM}
-
-# XXX: Pull this in from hcrypto. Be sure to be last!
-SRCS+= ui.c
-.PATH: ${HEIMDIST}/lib/hcrypto
-CPPFLAGS.ui.c+= \
- -I${HEIMDIST}/lib/hcrypto
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.3 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.4
--- src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.3 Mon Jun 19 19:11:45 2023
+++ src/crypto/external/bsd/heimdal/sbin/kstash/Makefile Tue Jun 20 13:23:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:45 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:05 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -13,7 +13,6 @@ MAN= kstash.8
CPPFLAGS+= -I${HEIMDIST}/lib/krb5 -I${DESTDIR}/usr/include/krb5
-CPPFLAGS+= -I${HEIMDIST}/lib
# -I${HEIMBASE}/include \
# -I${HEIMDIST}/base \
@@ -23,8 +22,9 @@ CPPFLAGS+= -I${HEIMDIST}/lib
# -I${HEIMBASE}/lib/libwind \
# -DHAVE_CONFIG_H
-LDADD+= -lhdb
-DPADD+= ${LIBHDB}
+PROGDPLIBS+= ${DPLIBHDB}
+LDADD+=-lcrypto
+DPADD+=${LIBCRYPTO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.4 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.5
--- src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.4 Mon Jun 19 19:11:45 2023
+++ src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile Tue Jun 20 13:23:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/19 23:11:45 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:05 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -12,7 +12,6 @@ PROG= ktutil
MAN= ktutil.8
HEIMSRCS= ktutil-commands.in
-CPPFLAGS+=-I${HEIMDIST}/lib
SRCS= \
add.c \
@@ -25,11 +24,11 @@ SRCS= \
list.c \
purge.c \
remove.c \
- rename.c \
- ui.c
+ rename.c
-LDADD+= -lkadm5clnt -lsl -ledit -lterminfo -lutil
-DPADD+= ${LIBKADM5CLNT} ${LIBSL} ${LIBEDIT} ${LIBTERMINFO} ${LIBUTIL}
+PROGDPLIBS+= ${DPLIBKADM5CLNT} ${DPLIBSL}
+LDADD+= -lcrypto -ledit -lterminfo -lutil
+DPADD+= ${LIBCRYPTO} ${LIBEDIT} ${LIBTERMINFO} ${LIBUTIL}
ktutil.8: ktutil.1
@${TOOL_SED} -e 's/KTUTIL 1/KTUTIL 8/' < ${.ALLSRC} > ${.TARGET}
