Module Name: src
Committed By: christos
Date: Thu Jun 22 22:39:23 UTC 2023
Modified Files:
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
Log Message:
fix sun2
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/bin/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kvno/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/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/bin/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.5 src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.6
--- src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.5 Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/bin/Makefile.inc Thu Jun 22 18:39:22 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.3 Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/bin/gsstool/Makefile Thu Jun 22 18:39:22 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.5 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.6
--- src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.5 Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/bin/hxtool/Makefile Thu Jun 22 18:39:22 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/kcc/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.5 src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.6
--- src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.5 Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/bin/kcc/Makefile Thu Jun 22 18:39:22 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.4 Tue Jun 20 13:23:02 2023
+++ src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile Thu Jun 22 18:39:23 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.4 Tue Jun 20 13:23:02 2023
+++ src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile Thu Jun 22 18:39:23 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/kinit/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.4 Tue Jun 20 13:23:02 2023
+++ src/crypto/external/bsd/heimdal/bin/kinit/Makefile Thu Jun 22 18:39:23 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.4 Tue Jun 20 13:23:02 2023
+++ src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile Thu Jun 22 18:39:23 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/kvno/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.3 Tue Jun 20 13:23:02 2023
+++ src/crypto/external/bsd/heimdal/bin/kvno/Makefile Thu Jun 22 18:39:23 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/string2key/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.4 Tue Jun 20 13:23:02 2023
+++ src/crypto/external/bsd/heimdal/bin/string2key/Makefile Thu Jun 22 18:39:23 2023
@@ -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}
Index: src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.4 Tue Jun 20 13:23:02 2023
+++ src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile Thu Jun 22 18:39:23 2023
@@ -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}
