[src/trunk]: src/crypto/external/bsd/heimdal Adjust the build to include ui.c...

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

details:   https://anonhg.NetBSD.org/src/rev/d06d05f5740f
branches:  trunk
changeset: 376477:d06d05f5740f
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jun 19 23:11:43 2023 +0000

description:
Adjust the build to include ui.c from hcrypto.

diffstat:

 crypto/external/bsd/heimdal/bin/kpasswd/Makefile            |   8 +++++---
 crypto/external/bsd/heimdal/bin/kvno/Makefile               |   8 ++++----
 crypto/external/bsd/heimdal/bin/string2key/Makefile         |   8 +++++---
 crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile   |   8 +++++---
 crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile       |   4 +++-
 crypto/external/bsd/heimdal/libexec/digest-service/Makefile |   9 +++++----
 crypto/external/bsd/heimdal/libexec/hpropd/Makefile         |   9 +++++----
 crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile  |   8 +++++---
 crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile   |   7 ++++---
 crypto/external/bsd/heimdal/libexec/kadmind/Makefile        |  12 +++++++++---
 crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile       |   7 ++++---
 crypto/external/bsd/heimdal/sbin/iprop-log/Makefile         |  10 ++++++----
 crypto/external/bsd/heimdal/sbin/kadmin/Makefile            |   6 ++++--
 crypto/external/bsd/heimdal/sbin/kstash/Makefile            |   8 +++++---
 crypto/external/bsd/heimdal/sbin/ktutil/Makefile            |   8 +++++---
 15 files changed, 74 insertions(+), 46 deletions(-)

diffs (truncated from 404 to 300 lines):

diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/bin/kpasswd/Makefile
--- a/crypto/external/bsd/heimdal/bin/kpasswd/Makefile  Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kpasswd/Makefile  Mon Jun 19 23:11:43 2023 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:43 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
 USE_FORT?= yes # cryptographic software
 
-.PATH: ${HEIMDIST}/kpasswd
+.PATH: ${HEIMDIST}/kpasswd ${HEIMDIST}/lib/hcrypto
+
+CPPFLAGS+=-I${HEIMDIST}/lib
 
 PROG= kpasswd
-SRCS= kpasswd.c
+SRCS= kpasswd.c ui.c
 
 LDADD+= -lkafs -lsl -lheimntlm
 DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/bin/kvno/Makefile
--- a/crypto/external/bsd/heimdal/bin/kvno/Makefile     Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kvno/Makefile     Mon Jun 19 23:11:43 2023 +0000
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.1 2014/04/01 21:38:44 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/19 23:11:43 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
 USE_FORT?= yes # cryptographic software
 
-.PATH: ${HEIMDIST}/kuser
+.PATH: ${HEIMDIST}/kuser ${HEIMDIST}/lib/hcrypto
 
 PROG= kvno
 
 
 #HEIMSRCS= kcc-commands.in
 
-SRCS=  kvno.c
+SRCS=  kvno.c ui.c
 MAN= kvno.1
 
-CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+= -I${DESTDIR}/usr/include/krb5 -I${HEIMDIST}/lib
 COPTS.kvno.c+= -Wno-deprecated-declarations
 
 LDADD+= -lkafs -lsl
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/bin/string2key/Makefile
--- a/crypto/external/bsd/heimdal/bin/string2key/Makefile       Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/string2key/Makefile       Mon Jun 19 23:11:43 2023 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
 USE_FORT?= yes # cryptographic software
 
-.PATH: ${HEIMDIST}/kdc
+.PATH: ${HEIMDIST}/kdc ${HEIMDIST}/lib/hcrypto
+
+CPPFLAGS+=-I${HEIMDIST}/lib
 
 PROG= string2key
-SRCS= string2key.c
+SRCS= string2key.c ui.c
 MAN=  string2key.8
 
 CPPFLAGS+=                             \
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
--- a/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile Mon Jun 19 23:11:43 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
+#      $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
 
 WARNS?=        2       # XXX -Wextra
 
@@ -7,12 +7,14 @@ NOLINT= # defined
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
-.PATH: ${HEIMDIST}/lib/krb5
+.PATH: ${HEIMDIST}/lib/krb5 ${HEIMDIST}/lib/hcrypto
+
+CPPFLAGS+=-I${HEIMDIST}/lib
 
 PROG= verify_krb5_conf
 MAN= verify_krb5_conf.8
 
-SRCS= verify_krb5_conf.c
+SRCS= verify_krb5_conf.c ui.c
 
 #CPPFLAGS+= -I.                                        \
 #      -I${DIST}/heimdal/lib/asn1              \
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
--- a/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile     Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile     Mon Jun 19 23:11:43 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:09 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/19 23:11:44 christos Exp $
 
 USE_FORT?= yes # network protocol library
 
@@ -18,6 +18,8 @@ LIBDPLIBS+=   krb5    ${.CURDIR}/../libkrb5 \
 
 HEIMSRCS=      kadm5_err.et
 
+CPPFLAGS+= -I${HEIMDIST}/lib/krb5
+
 SRCS =                 \
        ad.c            \
        chpass_c.c      \
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/libexec/digest-service/Makefile
--- a/crypto/external/bsd/heimdal/libexec/digest-service/Makefile       Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/digest-service/Makefile       Mon Jun 19 23:11:43 2023 +0000
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
-.PATH:         ${HEIMDIST}/kdc
+.PATH:         ${HEIMDIST}/kdc ${HEIMDIST}/lib/hcrypto
 
 PROG=  digest-service
-SRCS=  digest-service.c
+SRCS=  digest-service.c ui.c
 MAN=
 
 CPPFLAGS+=                             \
        -I${HEIMBASE}/include/krb5      \
        -I${HEIMDIST}/lib/krb5          \
-       -I${HEIMDIST}/lib/ipc
+       -I${HEIMDIST}/lib/ipc           \
+       -I${HEIMDIST}/lib
 
 LDADD+= -lkdc -lhdb
 DPADD+= ${LIBKDC} ${LIBHDB}
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/libexec/hpropd/Makefile
--- a/crypto/external/bsd/heimdal/libexec/hpropd/Makefile       Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/hpropd/Makefile       Mon Jun 19 23:11:43 2023 +0000
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
-.PATH:         ${HEIMDIST}/kdc
+.PATH:         ${HEIMDIST}/kdc ${HEIMDIST}/lib/hcrypto
 
 PROG=  hpropd
-SRCS=  hpropd.c
+SRCS=  hpropd.c ui.c
 MAN=   hpropd.8
 
 CPPFLAGS+=                             \
        -I${HEIMBASE}/include/krb5      \
        -I${HEIMDIST}/lib/asn1          \
-       -I${HEIMDIST}/lib/krb5
+       -I${HEIMDIST}/lib/krb5          \
+       -I${HEIMDIST}/lib
 
 LDADD+= -lhdb
 DPADD+= ${LIBHDB}
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
--- a/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile        Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile        Mon Jun 19 23:11:43 2023 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
-.PATH:         ${HEIMDIST}/lib/kadm5
+.PATH:         ${HEIMDIST}/lib/kadm5 ${HEIMDIST}/lib/hcrypto
 
 PROG=          ipropd-master
 
@@ -13,11 +13,13 @@ MLINKS=     \
        iprop.8         ipropd-slave.8
 
 SRCS+=         ipropd_master.c                         \
-       ipropd_common.c
+       ipropd_common.c                         \
+       ui.c
 
 CPPFLAGS+=                             \
        -I${HEIMDIST}/lib/krb5          \
        -I${HEIMDIST}/lib/asn1          \
+       -I${HEIMDIST}/lib               \
        -I${DESTDIR}/usr/include/kadm5
 
 LDADD+= -lkadm5srv -lhdb -lutil
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
--- a/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile Mon Jun 19 23:11:43 2023 +0000
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
-.PATH:         ${HEIMDIST}/lib/kadm5
+.PATH:         ${HEIMDIST}/lib/kadm5 ${HEIMDIST}/lib/hcrypto
 
 PROG=          ipropd-slave
 
 # man page included with ipropd-master
 MAN=
 
-SRCS+=         ipropd_slave.c ipropd_common.c
+SRCS+=         ipropd_slave.c ipropd_common.c ui.c
 
 CPPFLAGS+=                             \
        -I${HEIMDIST}/lib/krb5          \
        -I${HEIMDIST}/lib/asn1          \
+       -I${HEIMDIST}/lib               \
        -I${DESTDIR}/usr/include/kadm5
 
 LDADD+= -lkadm5srv -lhdb -lutil
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/libexec/kadmind/Makefile
--- a/crypto/external/bsd/heimdal/libexec/kadmind/Makefile      Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/kadmind/Makefile      Mon Jun 19 23:11:43 2023 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
-.PATH:         ${HEIMDIST}/kadmin
+.PATH:         ${HEIMDIST}/kadmin ${HEIMDIST}/lib/hcrypto
 
 PROG=  kadmind
 MAN=   kadmind.8
@@ -11,7 +11,8 @@ MAN=  kadmind.8
 SRCS+=         kadmind.c       \
        rpc.c           \
        server.c        \
-       kadm_conn.c
+       kadm_conn.c     \
+       ui.c
 
 CPPFLAGS+=                             \
        -I${HEIMDIST}/lib/krb5          \
@@ -23,3 +24,8 @@ DPADD+= ${LIBGSSAPI} ${LIBKADM5SRV} ${LI
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.prog.mk>
+
+CLEANFILES+=hcrypto
+
+.BEGIN:
+       @ln -sf ${HEIMDIST}/lib/hcrypto .
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
--- a/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile     Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile     Mon Jun 19 23:11:43 2023 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
-.PATH:         ${HEIMDIST}/kpasswd
+.PATH:         ${HEIMDIST}/kpasswd ${HEIMDIST}/lib/hcrypto
 
 PROG=  kpasswdd
-SRCS=  kpasswdd.c
+SRCS=  kpasswdd.c ui.c
 MAN=   kpasswdd.8
 
 CPPFLAGS+= -DINETD_SUPPORT
+CPPFLAGS+= -I${HEIMDIST}/lib
 
 LDADD+= -lkadm5srv -lhdb -lutil
 DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBUTIL}
diff -r d62d401333ce -r d06d05f5740f crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
--- a/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile       Mon Jun 19 23:10:48 2023 +0000
+++ b/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile       Mon Jun 19 23:11:43 2023 +0000
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:45 christos Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
 
-.PATH: ${HEIMDIST}/lib/kadm5
+.PATH: ${HEIMDIST}/lib/kadm5 ${HEIMDIST}/lib/hcrypto