Module Name: src
Committed By: mrg
Date: Tue Jun 20 00:30:17 UTC 2023
Modified Files:
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/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile
Log Message:
XXX stop gap to fix the builds in a way that doesn't make them useless.
it does build "ui.c" a large number of times into individual places.
in the libraries, they're force to local symbols, and in the binaries
it doesn't really matter.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/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/hxtool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.3 Tue May 9 22:12:33 2023
+++ src/crypto/external/bsd/heimdal/bin/hxtool/Makefile Tue Jun 20 00:30:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/05/09 22:12:33 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -7,6 +7,8 @@ USE_FORT?= yes # cryptographic software
.PATH: ${HEIMDIST}/lib/hx509
+CPPFLAGS+=-I${HEIMDIST}/lib
+
PROG= hxtool
HEIMSRCS= hxtool.c hxtool-commands.in
Index: src/crypto/external/bsd/heimdal/bin/kcc/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.3 Sat Jan 28 21:31:43 2017
+++ src/crypto/external/bsd/heimdal/bin/kcc/Makefile Tue Jun 20 00:30:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:43 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -21,6 +21,7 @@ SRCS= copy_cred_cache.c \
CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
CPPFLAGS+= -I${HEIMDIST}/kuser
+CPPFLAGS+= -I${HEIMDIST}/lib
LDADD+= -lkafs -lsl
LDADD+= -ledit -lterminfo
Index: src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.2 Wed May 25 19:21:16 2011
+++ src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile Tue Jun 20 00:30:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -13,5 +13,7 @@ SRCS= kdestroy.c
LDADD+= -lkafs -lsl -lheimntlm
DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
+CPPFLAGS+= -I${HEIMDIST}/lib
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.2 Wed May 25 19:21:16 2011
+++ src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile Tue Jun 20 00:30:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -13,5 +13,7 @@ SRCS= kgetcred.c
LDADD+= -lkafs -lsl -lheimntlm
DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
+CPPFLAGS+= -I${HEIMDIST}/lib
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kinit/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.2 Wed May 25 19:21:17 2011
+++ src/crypto/external/bsd/heimdal/bin/kinit/Makefile Tue Jun 20 00:30:16 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/20 00:30:16 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,9 +11,16 @@ PROG= kinit
SRCS= kinit.c
CPPFLAGS+= -I${HEIMDIST}/lib/ntlm
+CPPFLAGS+= -I${HEIMDIST}/lib
LDADD+= -lkafs -lsl -lheimntlm
DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
+# XXX: Pull this in from hcrypto. Be sure to be last!
+SRCS+= ui.c
+.PATH: ${HEIMDIST}/lib/hcrypto
+CPPFLAGS.ui.c+= \
+ -I${HEIMDIST}/lib/hcrypto
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.9 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.10
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.9 Mon Jun 19 23:56:55 2023
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Tue Jun 20 00:30:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/06/19 23:56:55 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/20 00:30:16 mrg Exp $
NOLINT= # defined
@@ -91,5 +91,14 @@ COPTS.crypto-ec.c += -Wno-error=deprecat
COPTS.crypto.c += -Wno-error=deprecated-declarations
COPTS.ks_p11.c += -Wno-error=deprecated-declarations
+# XXX: Pull this in from hcrypto. Be sure to be last! This subdir
+# XXX: also has a "doxygen.c" in it, but the .PATH ordering ensures
+# XXX: that the lib/hx509 version is used here, not the lib/hcrypto
+# XXX: version.
+SRCS+= ui.c
+.PATH: ${HEIMDIST}/lib/hcrypto
+CPPFLAGS.ui.c+= \
+ -I${HEIMDIST}/lib/hcrypto
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.13 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.14
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.13 Mon Jun 19 23:56:56 2023
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Tue Jun 20 00:30:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/06/19 23:56:56 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2023/06/20 00:30:17 mrg Exp $
USE_FORT?= yes # network protocol library
@@ -560,6 +560,15 @@ COPTS.salt-des.c+= -Wno-error=deprecated
COPTS.salt-des3.c+= -Wno-error=deprecated-declarations
COPTS.sp800-108-kdf.c+= -Wno-error=deprecated-declarations
+# XXX: Pull this in from hcrypto. Be sure to be last! This subdir
+# XXX: also has a "doxygen.c" in it, but the .PATH ordering ensures
+# XXX: that the lib/krb5 version is used here, not the lib/hcrypto
+# XXX: version.
+SRCS+= ui.c
+.PATH: ${HEIMDIST}/lib/hcrypto
+CPPFLAGS.ui.c+= \
+ -I${HEIMDIST}/lib/hcrypto
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.lib.mk>
.include <bsd.info.mk>
Index: src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.2 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.3
--- src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.2 Wed May 25 19:21:19 2011
+++ src/crypto/external/bsd/heimdal/sbin/hprop/Makefile Tue Jun 20 00:30:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -18,10 +18,17 @@ CPPFLAGS+= \
-I${HEIMBASE}/lib/libkrb5 \
-I${HEIMDIST}/lib/asn1 \
-I${HEIMDIST}/lib/hdb \
- -I${HEIMDIST}/lib/krb5
+ -I${HEIMDIST}/lib/krb5 \
+ -I${HEIMDIST}/lib
LDADD+= -lhdb -lutil
DPADD+= ${LIBHDB} ${LIBUTIL}
+# XXX: Pull this in from hcrypto. Be sure to be last!
+SRCS+= ui.c
+.PATH: ${HEIMDIST}/lib/hcrypto
+CPPFLAGS.ui.c+= \
+ -I${HEIMDIST}/lib/hcrypto
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.2 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.3
--- src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.2 Wed May 25 19:21:19 2011
+++ src/crypto/external/bsd/heimdal/sbin/kcm/Makefile Tue Jun 20 00:30:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -25,10 +25,18 @@ SRCS= \
renew.c \
sessions.c
-CPPFLAGS+= -I${HEIMDIST}/lib/ipc
+CPPFLAGS+= \
+ -I${HEIMDIST}/lib/ipc \
+ -I${HEIMDIST}/lib
LDADD+= -lkafs -lheimntlm -lutil
DPADD+= ${LIBKAFS} ${LIBHEIMNTLM} ${LIBUTIL}
+# XXX: Pull this in from hcrypto. Be sure to be last!
+SRCS+= ui.c
+.PATH: ${HEIMDIST}/lib/hcrypto
+CPPFLAGS.ui.c+= \
+ -I${HEIMDIST}/lib/hcrypto
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.2 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.3
--- src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.2 Wed May 25 19:21:19 2011
+++ src/crypto/external/bsd/heimdal/sbin/kdc/Makefile Tue Jun 20 00:30:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -17,11 +17,18 @@ SRCS= connect.c config.c main.c
CPPFLAGS+= \
-I${HEIMDIST}/lib/krb5 \
-I${HEIMBASE}/include/krb5 \
+ -I${HEIMDIST}/lib
LDADD+= -lkdc -lhdb -lheimntlm -lutil
DPADD+= ${LIBKDC} ${LIBHDB} ${LIBHEIMNTLM} ${LIBUTIL}
MAN= kdc.8
+# XXX: Pull this in from hcrypto. Be sure to be last!
+SRCS+= ui.c
+.PATH: ${HEIMDIST}/lib/hcrypto
+CPPFLAGS.ui.c+= \
+ -I${HEIMDIST}/lib/hcrypto
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.3 src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.4
--- src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.3 Sat Nov 22 01:28:13 2014
+++ src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile Tue Jun 20 00:30:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/11/22 01:28:13 pettai Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:17 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,8 +10,17 @@ MAN= kdigest.8
HEIMSRCS+= kdigest.c kdigest-commands.in
+CPPFLAGS+= \
+ -I${HEIMDIST}/lib
+
LDADD+= -lheimntlm -lsl -lutil -ledit -lterminfo
DPADD+= ${LIBHEIMNTLM} ${LIBSL} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
+# XXX: Pull this in from hcrypto. Be sure to be last!
+SRCS+= ui.c
+.PATH: ${HEIMDIST}/lib/hcrypto
+CPPFLAGS.ui.c+= \
+ -I${HEIMDIST}/lib/hcrypto
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.2 src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.3
--- src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.2 Wed May 25 19:21:19 2011
+++ src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile Tue Jun 20 00:30:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -9,8 +9,17 @@ PROG= kimpersonate
SRCS= kimpersonate.c
MAN= kimpersonate.8
+CPPFLAGS+= \
+ -I${HEIMDIST}/lib
+
LDADD+= -lkafs -lheimntlm
DPADD+= ${LIBKAFS} ${LIBHEIMNTLM}
+# XXX: Pull this in from hcrypto. Be sure to be last!
+SRCS+= ui.c
+.PATH: ${HEIMDIST}/lib/hcrypto
+CPPFLAGS.ui.c+= \
+ -I${HEIMDIST}/lib/hcrypto
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
