Module Name: src Committed By: christos Date: Mon Jun 19 23:11:45 UTC 2023
Modified Files: 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 src/crypto/external/bsd/heimdal/lib/libkadm5clnt: Makefile src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile src/crypto/external/bsd/heimdal/sbin/kstash: Makefile src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile Log Message: Adjust the build to include ui.c from hcrypto. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kvno/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/bin/string2key/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/ktutil/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/kpasswd/Makefile diff -u src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.3 --- src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.2 Wed May 25 15:21:17 2011 +++ src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile Mon Jun 19 19:11:43 2023 @@ -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} Index: src/crypto/external/bsd/heimdal/bin/kvno/Makefile diff -u src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.2 --- src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.1 Tue Apr 1 17:38:44 2014 +++ src/crypto/external/bsd/heimdal/bin/kvno/Makefile Mon Jun 19 19:11:43 2023 @@ -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 Index: src/crypto/external/bsd/heimdal/bin/string2key/Makefile diff -u src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.3 --- src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.2 Wed May 25 15:21:17 2011 +++ src/crypto/external/bsd/heimdal/bin/string2key/Makefile Mon Jun 19 19:11:44 2023 @@ -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+= \ Index: src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile diff -u src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.3 --- src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.2 Wed May 25 15:21:17 2011 +++ src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile Mon Jun 19 19:11:44 2023 @@ -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 \ Index: src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile diff -u src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.4 --- src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.3 Wed Sep 11 19:04:09 2013 +++ src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile Mon Jun 19 19:11:44 2023 @@ -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 \ Index: src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.2 src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.3 --- src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.2 Wed May 25 15:21:18 2011 +++ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile Mon Jun 19 19:11:44 2023 @@ -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} Index: src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.2 src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.3 --- src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.2 Wed May 25 15:21:18 2011 +++ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile Mon Jun 19 19:11:44 2023 @@ -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} Index: src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.2 src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.3 --- src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.2 Wed May 25 15:21:18 2011 +++ src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile Mon Jun 19 19:11:44 2023 @@ -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 Index: src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.2 src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.3 --- src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.2 Wed May 25 15:21:18 2011 +++ src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile Mon Jun 19 19:11:44 2023 @@ -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 Index: src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.2 src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.3 --- src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.2 Wed May 25 15:21:18 2011 +++ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile Mon Jun 19 19:11:44 2023 @@ -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 . Index: src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile diff -u src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.2 src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.3 --- src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.2 Wed May 25 15:21:18 2011 +++ src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile Mon Jun 19 19:11:44 2023 @@ -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} Index: src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile diff -u src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.2 src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.3 --- src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.2 Wed May 25 15:21:19 2011 +++ src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile Mon Jun 19 19:11:45 2023 @@ -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 Index: src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile diff -u src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.3 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.4 --- src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.3 Sat Jan 28 16:31:53 2017 +++ src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile Mon Jun 19 19:11:45 2023 @@ -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 \ Index: src/crypto/external/bsd/heimdal/sbin/kstash/Makefile diff -u src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.2 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.3 --- src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.2 Wed May 25 15:21:19 2011 +++ src/crypto/external/bsd/heimdal/sbin/kstash/Makefile Mon Jun 19 19:11:45 2023 @@ -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 \ Index: src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile diff -u src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.3 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.4 --- src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.3 Sat Jan 28 16:31:53 2017 +++ src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile Mon Jun 19 19:11:45 2023 @@ -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}