diff options
| author | christos <christos@NetBSD.org> | 2023-06-22 22:39:22 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2023-06-22 22:39:22 +0000 |
| commit | 9118ab78f56888cb5f4288e16fb0c8b9883f1129 (patch) | |
| tree | c5b0e257922fd7b1112b0e6b7e526454bf5a12a2 /crypto | |
| parent | 21b18fa1a8ce157f7eb179f6fb8a50b236552009 (diff) | |
fix sun2
Diffstat (limited to 'crypto')
29 files changed, 121 insertions, 84 deletions
diff --git a/crypto/external/bsd/heimdal/Makefile.inc b/crypto/external/bsd/heimdal/Makefile.inc index c3fdf33255f..6c5a08cfbe0 100644 --- a/crypto/external/bsd/heimdal/Makefile.inc +++ b/crypto/external/bsd/heimdal/Makefile.inc @@ -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/libroken 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 --git a/crypto/external/bsd/heimdal/bin/Makefile.inc b/crypto/external/bsd/heimdal/bin/Makefile.inc index e6033451fb2..54b037acf93 100644 --- a/crypto/external/bsd/heimdal/bin/Makefile.inc +++ b/crypto/external/bsd/heimdal/bin/Makefile.inc @@ -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 --git a/crypto/external/bsd/heimdal/bin/gsstool/Makefile b/crypto/external/bsd/heimdal/bin/gsstool/Makefile index b9234adc492..92ab5be4e35 100644 --- a/crypto/external/bsd/heimdal/bin/gsstool/Makefile +++ b/crypto/external/bsd/heimdal/bin/gsstool/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/bin/hxtool/Makefile b/crypto/external/bsd/heimdal/bin/hxtool/Makefile index fe90577af35..ebee0a04b92 100644 --- a/crypto/external/bsd/heimdal/bin/hxtool/Makefile +++ b/crypto/external/bsd/heimdal/bin/hxtool/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/bin/kcc/Makefile b/crypto/external/bsd/heimdal/bin/kcc/Makefile index c445849d243..c7d1cf6a7db 100644 --- a/crypto/external/bsd/heimdal/bin/kcc/Makefile +++ b/crypto/external/bsd/heimdal/bin/kcc/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/bin/kdestroy/Makefile b/crypto/external/bsd/heimdal/bin/kdestroy/Makefile index 71d9c1e4126..d4b9748c7b8 100644 --- a/crypto/external/bsd/heimdal/bin/kdestroy/Makefile +++ b/crypto/external/bsd/heimdal/bin/kdestroy/Makefile @@ -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} ${DPLIBHEIMNTLM} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= ${KRB5LDADD} +DPADD+= ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/bin/kgetcred/Makefile b/crypto/external/bsd/heimdal/bin/kgetcred/Makefile index 4dd73c55362..57df28e2454 100644 --- a/crypto/external/bsd/heimdal/bin/kgetcred/Makefile +++ b/crypto/external/bsd/heimdal/bin/kgetcred/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/bin/kinit/Makefile b/crypto/external/bsd/heimdal/bin/kinit/Makefile index 889a93408d9..2fca372b1e4 100644 --- a/crypto/external/bsd/heimdal/bin/kinit/Makefile +++ b/crypto/external/bsd/heimdal/bin/kinit/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/bin/kpasswd/Makefile b/crypto/external/bsd/heimdal/bin/kpasswd/Makefile index 80a4cddc917..5fcab36706b 100644 --- a/crypto/external/bsd/heimdal/bin/kpasswd/Makefile +++ b/crypto/external/bsd/heimdal/bin/kpasswd/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/bin/kvno/Makefile b/crypto/external/bsd/heimdal/bin/kvno/Makefile index b2d4b40f441..367e578bee9 100644 --- a/crypto/external/bsd/heimdal/bin/kvno/Makefile +++ b/crypto/external/bsd/heimdal/bin/kvno/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/bin/string2key/Makefile b/crypto/external/bsd/heimdal/bin/string2key/Makefile index 5a22503fb97..f9ee44f1e72 100644 --- a/crypto/external/bsd/heimdal/bin/string2key/Makefile +++ b/crypto/external/bsd/heimdal/bin/string2key/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile b/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile index 543253b16de..770280c9da8 100644 --- a/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile +++ b/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/libexec/Makefile.inc b/crypto/external/bsd/heimdal/libexec/Makefile.inc index ae0b55ccbc4..95192b2f647 100644 --- a/crypto/external/bsd/heimdal/libexec/Makefile.inc +++ b/crypto/external/bsd/heimdal/libexec/Makefile.inc @@ -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 --git a/crypto/external/bsd/heimdal/libexec/digest-service/Makefile b/crypto/external/bsd/heimdal/libexec/digest-service/Makefile index c3c27725224..74a31b047be 100644 --- a/crypto/external/bsd/heimdal/libexec/digest-service/Makefile +++ b/crypto/external/bsd/heimdal/libexec/digest-service/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/libexec/hpropd/Makefile b/crypto/external/bsd/heimdal/libexec/hpropd/Makefile index 25215b0ebcf..35006dfb799 100644 --- a/crypto/external/bsd/heimdal/libexec/hpropd/Makefile +++ b/crypto/external/bsd/heimdal/libexec/hpropd/Makefile @@ -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 --git a/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile b/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile index f82dc9d010f..4bb81fbf677 100644 --- a/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile +++ b/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile @@ -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> @@ -21,8 +21,9 @@ CPPFLAGS+= \ -I${DESTDIR}/usr/include/kadm5 PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB} -LDADD+= -lutil -DPADD+= ${LIBUTIL} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -lutil ${KRB5LDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile b/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile index 4e680f941d8..aa125941f80 100644 --- a/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile +++ b/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile @@ -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,8 +18,9 @@ CPPFLAGS+= \ -I${DESTDIR}/usr/include/kadm5 PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB} -LDADD+= -lutil -DPADD+= ${LIBUTIL} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -lutil ${KRB5LDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/libexec/kadmind/Makefile b/crypto/external/bsd/heimdal/libexec/kadmind/Makefile index 6c530d571f1..76a687b6b59 100644 --- a/crypto/external/bsd/heimdal/libexec/kadmind/Makefile +++ b/crypto/external/bsd/heimdal/libexec/kadmind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2023/06/20 17:23:03 christos Exp $ +# $NetBSD: Makefile,v 1.7 2023/06/22 22:39:37 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -18,9 +18,10 @@ CPPFLAGS+= \ -I${HEIMDIST}/lib/asn1 \ -I${HEIMBASE}/include/krb5 -PROGDPLIBS+= ${DPLIBGSSAPI} ${DPLIBKADM5SRV} ${DPLIBHDB} -LDADD+= -lutil -DPADD+= ${LIBUTIL} +PROGDPLIBS+= ${DPLIBGSSAPI} ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBHEIMNTLM} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -lutil ${KRB5LDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile b/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile index 6390531a707..029e93a66f8 100644 --- a/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile +++ b/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile @@ -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:38 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -13,8 +13,9 @@ CPPFLAGS+= -DINETD_SUPPORT CPPFLAGS+= -I${HEIMDIST}/lib PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKADM5SRV} ${DPLIBHDB} -LDADD+= -lcrypto -lutil -DPADD+= ${LIBCRYPTO} ${LIBUTIL} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -lutil ${KRB5LDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/sbin/Makefile.inc b/crypto/external/bsd/heimdal/sbin/Makefile.inc index 4c6f579f416..d67f15c5f64 100644 --- a/crypto/external/bsd/heimdal/sbin/Makefile.inc +++ b/crypto/external/bsd/heimdal/sbin/Makefile.inc @@ -1,5 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.6 2023/06/20 17:23:04 christos Exp $ +# $NetBSD: Makefile.inc,v 1.7 2023/06/22 22:39:38 christos Exp $ BINDIR=/usr/sbin -PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS} +PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHX509} ${DPLIBASN1} ${DPLIBCOM_ERR} +PROGDPLIBS += ${DPLIBWIND} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS} diff --git a/crypto/external/bsd/heimdal/sbin/hprop/Makefile b/crypto/external/bsd/heimdal/sbin/hprop/Makefile index 2984fa8463e..0a85885750a 100644 --- a/crypto/external/bsd/heimdal/sbin/hprop/Makefile +++ b/crypto/external/bsd/heimdal/sbin/hprop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $ +# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -21,8 +21,9 @@ CPPFLAGS+= \ -I${HEIMDIST}/lib/krb5 \ PROGDPLIBS+= ${DPLIBHDB} -LDADD+= -lutil -DPADD+= ${LIBUTIL} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -lutil ${KRB5LDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile b/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile index 5f9313635ed..e299bd05f1c 100644 --- a/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile +++ b/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $ +# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -13,8 +13,9 @@ HEIMSRCS= iprop-log.c iprop-commands.in CPPFLAGS+= -I${DESTDIR}/usr/include/kadm5 -I${HEIMDIST}/lib/krb5 PROGDPLIBS += ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBSL} -LDADD+= -ledit -lterminfo -DPADD+= ${LIBEDIT} ${LIBTERMINFO} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -ledit -lterminfo ${KRB5LDADD} +DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/sbin/kadmin/Makefile b/crypto/external/bsd/heimdal/sbin/kadmin/Makefile index 38673911263..d9f5e5d1ec9 100644 --- a/crypto/external/bsd/heimdal/sbin/kadmin/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kadmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:04 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:38 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -39,10 +39,7 @@ CPPFLAGS+= \ -I${HEIMBASE}/lib/libwind \ -I${DESTDIR}/usr/include/kadm5 -PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBKADM5CLNT} -PROGDPLIBS+= ${DPLIBSL} -LDADD+= -lcrypto -lutil -ledit -lterminfo -DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} +PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBKADM5CLNT} ${DPLIBSL} kadmin.8: kadmin.1 @${TOOL_SED} -e 's/KADMIN 1/KADMIN 8/' < ${.ALLSRC} > ${.TARGET} @@ -51,3 +48,6 @@ CLEANFILES+=kadmin.8 .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -lutil -ledit -lterminfo ${KRB5LDADD} +DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/sbin/kcm/Makefile b/crypto/external/bsd/heimdal/sbin/kcm/Makefile index c5fb4a03720..c691ebe38af 100644 --- a/crypto/external/bsd/heimdal/sbin/kcm/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kcm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $ +# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -29,8 +29,9 @@ CPPFLAGS+= \ -I${HEIMDIST}/lib/ipc PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBHEIMNTLM} -LDADD+= -lcrypto -lutil -DPADD+= ${LIBCRYPTO} ${LIBUTIL} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -lutil ${KRB5LDADD} +DPADD+= ${LIBCRYPTO} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/sbin/kdc/Makefile b/crypto/external/bsd/heimdal/sbin/kdc/Makefile index ddfaa541401..5b0b3869edf 100644 --- a/crypto/external/bsd/heimdal/sbin/kdc/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kdc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $ +# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -20,10 +20,11 @@ CPPFLAGS+= \ -I${HEIMDIST}/lib PROGDPLIBS+= ${DPLIBKDC} ${DPLIBHDB} ${DPLIBHEIMNTLM} -LDADD+= -lutil -DPADD+= ${LIBUTIL} MAN= kdc.8 .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -lutil ${KRB5LDADD} +DPADD+= ${LIBUTIL} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/sbin/kdigest/Makefile b/crypto/external/bsd/heimdal/sbin/kdigest/Makefile index 9c2b1015c32..26fa6ed9532 100644 --- a/crypto/external/bsd/heimdal/sbin/kdigest/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kdigest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:05 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:38 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -11,8 +11,9 @@ MAN= kdigest.8 HEIMSRCS+= kdigest.c kdigest-commands.in PROGDPLIBS+= ${DPLIBHEIMNTLM} ${DPLIBSL} -LDADD+= -lcrypto -lutil -ledit -lterminfo -DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -lutil -ledit -lterminfo ${KRB5LDADD} +DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile b/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile index ad61afdb8fc..ed054c5e33e 100644 --- a/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:05 christos Exp $ +# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -9,7 +9,10 @@ PROG= kimpersonate SRCS= kimpersonate.c MAN= kimpersonate.8 -PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBHEIMNTLM} +PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBHEIMNTLM} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= ${KRB5LDADD} +DPADD+= ${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/sbin/kstash/Makefile b/crypto/external/bsd/heimdal/sbin/kstash/Makefile index da2ef963eb0..1bf4e3fd759 100644 --- a/crypto/external/bsd/heimdal/sbin/kstash/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kstash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:05 christos Exp $ +# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:39 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -23,8 +23,9 @@ CPPFLAGS+= -I${HEIMDIST}/lib/krb5 -I${DESTDIR}/usr/include/krb5 # -DHAVE_CONFIG_H PROGDPLIBS+= ${DPLIBHDB} -LDADD+=-lcrypto -DPADD+=${LIBCRYPTO} .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+=${KRB5LDADD} +DPADD+=${KRB5DPADD} diff --git a/crypto/external/bsd/heimdal/sbin/ktutil/Makefile b/crypto/external/bsd/heimdal/sbin/ktutil/Makefile index ba64f4e8cd1..7640fb82b19 100644 --- a/crypto/external/bsd/heimdal/sbin/ktutil/Makefile +++ b/crypto/external/bsd/heimdal/sbin/ktutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:05 christos Exp $ +# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:39 christos Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -27,8 +27,6 @@ SRCS= \ rename.c 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} @@ -37,3 +35,6 @@ CLEANFILES+=ktutil.8 .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> + +LDADD+= -ledit -lterminfo -lutil ${KRB5LDADD} +DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${LIBUTIL} ${KRB5DPADD} |
