summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2023-06-19 23:11:43 +0000
committerchristos <christos@NetBSD.org>2023-06-19 23:11:43 +0000
commit6c3668670c8d272d783d1cd7ac2260ab7fcda52e (patch)
tree14a704c06dbc61f597ac1a47d3222dea0be897a3 /crypto
parenta770fd0016f55c2566b15c092d249257d8c1097f (diff)
Adjust the build to include ui.c from hcrypto.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/external/bsd/heimdal/bin/kpasswd/Makefile8
-rw-r--r--crypto/external/bsd/heimdal/bin/kvno/Makefile8
-rw-r--r--crypto/external/bsd/heimdal/bin/string2key/Makefile8
-rw-r--r--crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile8
-rw-r--r--crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile4
-rw-r--r--crypto/external/bsd/heimdal/libexec/digest-service/Makefile9
-rw-r--r--crypto/external/bsd/heimdal/libexec/hpropd/Makefile9
-rw-r--r--crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile8
-rw-r--r--crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile7
-rw-r--r--crypto/external/bsd/heimdal/libexec/kadmind/Makefile12
-rw-r--r--crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile7
-rw-r--r--crypto/external/bsd/heimdal/sbin/iprop-log/Makefile10
-rw-r--r--crypto/external/bsd/heimdal/sbin/kadmin/Makefile6
-rw-r--r--crypto/external/bsd/heimdal/sbin/kstash/Makefile8
-rw-r--r--crypto/external/bsd/heimdal/sbin/ktutil/Makefile8
15 files changed, 74 insertions, 46 deletions
diff --git a/crypto/external/bsd/heimdal/bin/kpasswd/Makefile b/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
index bf207d43236..eb9546e6c2b 100644
--- a/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
+++ b/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
@@ -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 --git a/crypto/external/bsd/heimdal/bin/kvno/Makefile b/crypto/external/bsd/heimdal/bin/kvno/Makefile
index 0491ede66ed..46b30513dba 100644
--- a/crypto/external/bsd/heimdal/bin/kvno/Makefile
+++ b/crypto/external/bsd/heimdal/bin/kvno/Makefile
@@ -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 --git a/crypto/external/bsd/heimdal/bin/string2key/Makefile b/crypto/external/bsd/heimdal/bin/string2key/Makefile
index 331ffbe6107..c31a0008211 100644
--- a/crypto/external/bsd/heimdal/bin/string2key/Makefile
+++ b/crypto/external/bsd/heimdal/bin/string2key/Makefile
@@ -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 --git a/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile b/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
index d3bf5449807..fc044e045f0 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.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 --git a/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile b/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
index 7c2f77c33ea..513ed4e7e38 100644
--- a/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
+++ b/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
@@ -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 --git a/crypto/external/bsd/heimdal/libexec/digest-service/Makefile b/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
index fdfb8b515ee..720fcb7b8b3 100644
--- a/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
+++ b/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
@@ -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 --git a/crypto/external/bsd/heimdal/libexec/hpropd/Makefile b/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
index fa9fe48f83a..d7b8f40a865 100644
--- a/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
+++ b/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
@@ -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 --git a/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile b/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
index 1dd357ad7b3..272b7795145 100644
--- a/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
+++ b/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
@@ -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 --git a/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile b/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
index 9aaeb9da83d..626e1d2ad5f 100644
--- a/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
+++ b/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
@@ -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 --git a/crypto/external/bsd/heimdal/libexec/kadmind/Makefile b/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
index 68b76d2bf22..1fcc9c94939 100644
--- a/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
+++ b/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
@@ -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} ${LIBHDB} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+CLEANFILES+=hcrypto
+
+.BEGIN:
+ @ln -sf ${HEIMDIST}/lib/hcrypto .
diff --git a/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile b/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
index 2f3104fdd7e..a9fea5fdca5 100644
--- a/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
+++ b/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
@@ -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 --git a/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile b/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
index 77920f8dec2..c22429bb16e 100644
--- a/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
+++ b/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
@@ -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
PROG= iprop-log
MAN= iprop-log.8
-HEIMSRCS= iprop-log.c iprop-commands.in
+CPPFLAGS+=-I${HEIMDIST}/lib
-CPPFLAGS+= -I${DESTDIR}/usr/include/kadm5
+HEIMSRCS= iprop-log.c iprop-commands.in ui.c
+
+CPPFLAGS+= -I${DESTDIR}/usr/include/kadm5 -I${HEIMDIST}/lib/krb5
LDADD+= -lkadm5srv -lhdb -lsl
LDADD+= -ledit -lterminfo
diff --git a/crypto/external/bsd/heimdal/sbin/kadmin/Makefile b/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
index 4e6ba0bd0ef..10c573aabaa 100644
--- a/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
+++ b/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:53 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/19 23:11:45 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
USE_FORT?= yes # network client
-.PATH: ${HEIMDIST}/kadmin
+.PATH: ${HEIMDIST}/kadmin ${HEIMDIST}/lib/hcrypto
PROG= kadmin
MAN= kadmin.8
@@ -29,10 +29,12 @@ 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 \
diff --git a/crypto/external/bsd/heimdal/sbin/kstash/Makefile b/crypto/external/bsd/heimdal/sbin/kstash/Makefile
index 1c8b80b7944..9645634381e 100644
--- a/crypto/external/bsd/heimdal/sbin/kstash/Makefile
+++ b/crypto/external/bsd/heimdal/sbin/kstash/Makefile
@@ -1,17 +1,19 @@
-# $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>
USE_FORT?= yes # cryptographic software
-.PATH: ${HEIMDIST}/kdc
+.PATH: ${HEIMDIST}/kdc ${HEIMDIST}/lib/hcrypto
PROG= kstash
-SRCS= kstash.c
+SRCS= kstash.c ui.c
MAN= kstash.8
+
CPPFLAGS+= -I${HEIMDIST}/lib/krb5 -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+= -I${HEIMDIST}/lib
# -I${HEIMBASE}/include \
# -I${HEIMDIST}/base \
diff --git a/crypto/external/bsd/heimdal/sbin/ktutil/Makefile b/crypto/external/bsd/heimdal/sbin/ktutil/Makefile
index d77c0504fe3..ee87da28832 100644
--- a/crypto/external/bsd/heimdal/sbin/ktutil/Makefile
+++ b/crypto/external/bsd/heimdal/sbin/ktutil/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:53 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/19 23:11:45 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
USE_FORT?= yes # network client
-.PATH: ${HEIMDIST}/admin
+.PATH: ${HEIMDIST}/admin ${HEIMDIST}/lib/hcrypto
PROG= ktutil
MAN= ktutil.8
HEIMSRCS= ktutil-commands.in
+CPPFLAGS+=-I${HEIMDIST}/lib
SRCS= \
add.c \
@@ -24,7 +25,8 @@ SRCS= \
list.c \
purge.c \
remove.c \
- rename.c
+ rename.c \
+ ui.c
LDADD+= -lkadm5clnt -lsl -ledit -lterminfo -lutil
DPADD+= ${LIBKADM5CLNT} ${LIBSL} ${LIBEDIT} ${LIBTERMINFO} ${LIBUTIL}