[src/trunk]: src/crypto/external/bsd/heimdal fix sun2

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c418fb0e2ade
branches:  trunk
changeset: 376580:c418fb0e2ade
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jun 22 22:39:22 2023 +0000

description:
fix sun2

diffstat:

 crypto/external/bsd/heimdal/Makefile.inc                    |   4 +++-
 crypto/external/bsd/heimdal/bin/Makefile.inc                |   5 +++--
 crypto/external/bsd/heimdal/bin/gsstool/Makefile            |  10 +++++-----
 crypto/external/bsd/heimdal/bin/hxtool/Makefile             |   9 +++++----
 crypto/external/bsd/heimdal/bin/kcc/Makefile                |   9 +++++----
 crypto/external/bsd/heimdal/bin/kdestroy/Makefile           |   5 ++++-
 crypto/external/bsd/heimdal/bin/kgetcred/Makefile           |   7 +++++--
 crypto/external/bsd/heimdal/bin/kinit/Makefile              |   7 ++++---
 crypto/external/bsd/heimdal/bin/kpasswd/Makefile            |   7 ++++---
 crypto/external/bsd/heimdal/bin/kvno/Makefile               |   9 +++++----
 crypto/external/bsd/heimdal/bin/string2key/Makefile         |   8 ++++----
 crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile   |   5 ++++-
 crypto/external/bsd/heimdal/libexec/Makefile.inc            |   5 +++--
 crypto/external/bsd/heimdal/libexec/digest-service/Makefile |   9 +++++----
 crypto/external/bsd/heimdal/libexec/hpropd/Makefile         |   5 ++++-
 crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile  |   7 ++++---
 crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile   |   7 ++++---
 crypto/external/bsd/heimdal/libexec/kadmind/Makefile        |   9 +++++----
 crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile       |   7 ++++---
 crypto/external/bsd/heimdal/sbin/Makefile.inc               |   5 +++--
 crypto/external/bsd/heimdal/sbin/hprop/Makefile             |   7 ++++---
 crypto/external/bsd/heimdal/sbin/iprop-log/Makefile         |   7 ++++---
 crypto/external/bsd/heimdal/sbin/kadmin/Makefile            |  10 +++++-----
 crypto/external/bsd/heimdal/sbin/kcm/Makefile               |   7 ++++---
 crypto/external/bsd/heimdal/sbin/kdc/Makefile               |   7 ++++---
 crypto/external/bsd/heimdal/sbin/kdigest/Makefile           |   7 ++++---
 crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile      |   7 +++++--
 crypto/external/bsd/heimdal/sbin/kstash/Makefile            |   7 ++++---
 crypto/external/bsd/heimdal/sbin/ktutil/Makefile            |   7 ++++---
 29 files changed, 121 insertions(+), 84 deletions(-)

diffs (truncated from 592 to 300 lines):

diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/Makefile.inc
--- a/crypto/external/bsd/heimdal/Makefile.inc  Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/Makefile.inc  Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/22 22:39:37 christos Exp $
 
 HEIMBASE?=     ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
 HEIMDIST=      ${HEIMBASE}/dist
@@ -22,6 +22,8 @@ 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}
 
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!=     cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/Makefile.inc
--- a/crypto/external/bsd/heimdal/bin/Makefile.inc      Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/Makefile.inc      Thu Jun 22 22:39:22 2023 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.5 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2023/06/22 22:39:22 christos Exp $
 
 BINDIR=/usr/bin
 
-PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
+PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHX509} ${DPLIBASN1} ${DPLIBCOM_ERR}
+PROGDPLIBS += ${DPLIBWIND} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/gsstool/Makefile
--- a/crypto/external/bsd/heimdal/bin/gsstool/Makefile  Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/gsstool/Makefile  Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/22 22:39:22 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,10 +13,10 @@ HEIMSRCS=   gsstool.c gss-commands.in
 
 MAN=
 
-PROGDPLIBS += ${DPLIBGSSAPI} ${DPLIBSL}
-
-LDADD+= -ledit -lterminfo
-DPADD+= ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS += ${DPLIBGSSAPI} ${DPLIBHEIMNTLM} ${DPLIBSL}
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= -ledit -lterminfo ${KRB5LDADD}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/hxtool/Makefile
--- a/crypto/external/bsd/heimdal/bin/hxtool/Makefile   Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/hxtool/Makefile   Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:22 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,11 +13,12 @@ HEIMSRCS= hxtool.c hxtool-commands.in
 
 MAN=
 
-PROGDPLIBS+= ${DPLIBASN1} ${DPLIBGSSAPI} ${DPLIBHX509} ${DPLIBSL}
-LDADD+= -lcrypto -ledit -lterminfo
-DPADD+= ${LIBCRYPTO} ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS+= ${DPLIBGSSAPI} ${DPLIBSL}
 
 COPTS.hxtool.c+= -Wno-error=deprecated-declarations
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= -lcrypto -ledit -lterminfo
+DPADD+= ${LIBCRYPTO} ${LIBEDIT} ${LIBTERMINFO}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/kcc/Makefile
--- a/crypto/external/bsd/heimdal/bin/kcc/Makefile      Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kcc/Makefile      Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:22 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -22,9 +22,10 @@ SRCS=        copy_cred_cache.c       \
 CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
 CPPFLAGS+= -I${HEIMDIST}/kuser
 
-PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBSL}
-LDADD+= -ledit -lterminfo
-DPADD+= ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL}
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= -ledit -lterminfo ${KRB5LDADD}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/kdestroy/Makefile
--- a/crypto/external/bsd/heimdal/bin/kdestroy/Makefile Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kdestroy/Makefile Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:23 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -14,3 +14,6 @@ PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${D
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/kgetcred/Makefile
--- a/crypto/external/bsd/heimdal/bin/kgetcred/Makefile Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kgetcred/Makefile Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:23 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -10,7 +10,10 @@ USE_FORT?= yes       # cryptographic software
 PROG= kgetcred
 SRCS= kgetcred.c
 
-PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/kinit/Makefile
--- a/crypto/external/bsd/heimdal/bin/kinit/Makefile    Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kinit/Makefile    Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:23 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,8 +13,9 @@ SRCS= kinit.c
 CPPFLAGS+= -I${HEIMDIST}/lib/ntlm
 
 PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
-LDADD+= -lcrypto
-DPSDD+= ${LIBCRYPTO}
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/kpasswd/Makefile
--- a/crypto/external/bsd/heimdal/bin/kpasswd/Makefile  Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kpasswd/Makefile  Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:23 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -11,8 +11,9 @@ PROG= kpasswd
 SRCS= kpasswd.c
 
 PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
-LDADD+= -lcrypto
-DPADD+= ${LIBCRYPTO}
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/kvno/Makefile
--- a/crypto/external/bsd/heimdal/bin/kvno/Makefile     Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kvno/Makefile     Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 17:23:02 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/22 22:39:23 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -18,9 +18,10 @@ MAN= kvno.1
 CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
 COPTS.kvno.c+= -Wno-deprecated-declarations
 
-PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBSL}
-LDADD+= -ledit -lterminfo
-DPADD+= ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL}
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= -ledit -lterminfo ${KRB5LDADD}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/string2key/Makefile
--- a/crypto/external/bsd/heimdal/bin/string2key/Makefile       Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/string2key/Makefile       Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:23 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -20,8 +20,8 @@ CPPFLAGS+=                            \
        -I${HEIMBASE}/lib/libheimntlm   \
        -I${HEIMBASE}/lib/libwind       \
 
-LDADD+=-lcrypto
-DPADD+=${LIBCRYPTO}
-
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
--- a/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
+#      $NetBSD: Makefile,v 1.5 2023/06/22 22:39:23 christos Exp $
 
 WARNS?=        2       # XXX -Wextra
 
@@ -22,3 +22,6 @@ SRCS= verify_krb5_conf.c
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/libexec/Makefile.inc
--- a/crypto/external/bsd/heimdal/libexec/Makefile.inc  Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/Makefile.inc  Thu Jun 22 22:39:22 2023 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.7 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/22 22:39:37 christos Exp $
 
 BINDIR=/usr/libexec
 
-PROGDPLIBS+= ${DPLIBKRB5} ${DPLIBHEIMNTLM} ${DPLIBROKEN} ${DPLIBVERS}
+PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHX509} ${DPLIBASN1} ${DPLIBCOM_ERR}
+PROGDPLIBS += ${DPLIBWIND} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/libexec/digest-service/Makefile
--- a/crypto/external/bsd/heimdal/libexec/digest-service/Makefile       Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/digest-service/Makefile       Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -14,9 +14,10 @@ CPPFLAGS+=                           \
        -I${HEIMDIST}/lib/krb5          \
        -I${HEIMDIST}/lib/ipc
 
-PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKDC} ${DPLIBHDB}
-LDADD+=-lcrypto
-DPADD+=${LIBCRYPTO}
+PROGDPLIBS+= ${DPLIBKDC} ${DPLIBHDB} ${DPLIBHEIMNTLM}
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/libexec/hpropd/Makefile
--- a/crypto/external/bsd/heimdal/libexec/hpropd/Makefile       Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/hpropd/Makefile       Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -18,3 +18,6 @@ PROGDPLIBS+= ${DPLIBHDB}
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
diff -r 16621a4f2a2e -r c418fb0e2ade crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
--- a/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile        Thu Jun 22 20:36:24 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile        Thu Jun 22 22:39:22 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
 
 .include <bsd.own.mk>