[src/trunk]: src add LIBKRB5_LDADD/LIBKRB5_DPADD and their static counterparts

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

details:   https://anonhg.NetBSD.org/src/rev/45f8d4002899
branches:  trunk
changeset: 830061:45f8d4002899
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 25 00:16:48 2018 +0000

description:
add LIBKRB5_LDADD/LIBKRB5_DPADD and their static counterparts
to bsd.prog.mk.  use them instead of hard coding various lists
of libraries for krb5.

this fixes static builds.

diffstat:

 crypto/external/bsd/heimdal/bin/Makefile.inc     |  12 +++------
 crypto/external/bsd/heimdal/libexec/Makefile.inc |  16 +++--------
 crypto/external/bsd/heimdal/sbin/Makefile.inc    |  14 +++------
 crypto/external/bsd/openssh/bin/ssh/Makefile     |  15 ++---------
 crypto/external/bsd/openssh/bin/sshd/Makefile    |   9 ++----
 external/bsd/bind/Makefile.inc                   |   8 ++---
 external/bsd/dhcp/Makefile.inc                   |   8 ++---
 external/gpl2/xcvs/bin/xcvs/Makefile             |  32 ++---------------------
 libexec/ftpd/Makefile                            |   9 ++----
 libexec/telnetd/Makefile                         |   8 +++---
 share/mk/bsd.prog.mk                             |  18 ++++++++++++-
 usr.bin/login/Makefile                           |   9 ++----
 usr.bin/passwd/Makefile                          |  12 +++-----
 usr.bin/su/Makefile                              |  15 ++++------
 usr.bin/telnet/Makefile                          |   6 ++--
 usr.sbin/racoon/Makefile                         |   8 ++---
 16 files changed, 73 insertions(+), 126 deletions(-)

diffs (truncated from 444 to 300 lines):

diff -r 862842119fea -r 45f8d4002899 crypto/external/bsd/heimdal/bin/Makefile.inc
--- a/crypto/external/bsd/heimdal/bin/Makefile.inc      Sat Feb 24 21:51:22 2018 +0000
+++ b/crypto/external/bsd/heimdal/bin/Makefile.inc      Sun Feb 25 00:16:48 2018 +0000
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.3 2017/01/28 21:31:43 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2018/02/25 00:16:48 mrg Exp $
 
 BINDIR=/usr/bin
 
-LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lwind
-LDADD+= -lheimbase ${LIBVERS}
-LDADD+= -lcrypto -lcrypt
-LDADD+= -lsqlite3
+LDADD+= ${LIBKRB5_LDADD}
+DPADD+= ${LIBKRB5_DPADD}
 
-DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBWIND}
+LDADD+= -lheimbase ${LIBVERS}
 DPADD+= ${LIBHEIMBASE} ${LIBVERS}
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-DPADD+= ${LIBSQLITE3}
diff -r 862842119fea -r 45f8d4002899 crypto/external/bsd/heimdal/libexec/Makefile.inc
--- a/crypto/external/bsd/heimdal/libexec/Makefile.inc  Sat Feb 24 21:51:22 2018 +0000
+++ b/crypto/external/bsd/heimdal/libexec/Makefile.inc  Sun Feb 25 00:16:48 2018 +0000
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.5 2017/01/29 22:09:06 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2018/02/25 00:16:48 mrg Exp $
 
 BINDIR=/usr/libexec
 
-LDADD+= -lheimntlm -lkrb5 -lhx509 -lheimbase
-LDADD+= -lasn1 -lcom_err -lroken ${LIBVERS}
-LDADD+= -lwind
-LDADD+= -lcrypto -lcrypt
-LDADD+= -lsqlite3 -lutil
+LDADD+= ${LIBKRB5_LDADD}
+DPADD+= ${LIBKRB5_DPADD}
 
-DPADD+= ${LIBKRB5} ${LIBHX509}
-DPADD+= ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBVERS}
-DPADD+= ${LIBHEIMBASE} ${LIBHEIMNTLM} ${LIBWIND}
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-DPADD+= ${LIBSQLITE3} ${LIBUTIL}
+LDADD+= -lheimntlm ${LIBVERS}
+DPADD+= ${LIBHEIMNTLM} ${LIBVERS}
diff -r 862842119fea -r 45f8d4002899 crypto/external/bsd/heimdal/sbin/Makefile.inc
--- a/crypto/external/bsd/heimdal/sbin/Makefile.inc     Sat Feb 24 21:51:22 2018 +0000
+++ b/crypto/external/bsd/heimdal/sbin/Makefile.inc     Sun Feb 25 00:16:48 2018 +0000
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.4 2017/01/29 22:09:06 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2018/02/25 00:16:48 mrg Exp $
 
 BINDIR=/usr/sbin
 
-LDADD+= -lkrb5 -lhx509 -lasn1 -lwind
-LDADD+= -lcom_err -lroken -lheimbase ${LIBVERS}
-LDADD+= -lcrypto -lcrypt
-LDADD+= -lsqlite3 -lutil
+LDADD+= ${LIBKRB5_LDADD}
+DPADD+= ${LIBKRB5_DPADD}
 
-DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBWIND}
-DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBHEIMBASE} ${LIBVERS}
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-DPADD+= ${LIBSQLITE3} ${LIBUTIL}
+LDADD+= -lheimbase ${LIBVERS}
+DPADD+= ${LIBHEIMBASE} ${LIBVERS}
diff -r 862842119fea -r 45f8d4002899 crypto/external/bsd/openssh/bin/ssh/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh/Makefile      Sat Feb 24 21:51:22 2018 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh/Makefile      Sun Feb 25 00:16:48 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2017/10/07 19:39:19 christos Exp $
+#      $NetBSD: Makefile,v 1.13 2018/02/25 00:16:48 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,17 +19,8 @@
 .if (${USE_KERBEROS} != "no")
 # this is not entirely true, libgssapi might be independent of krb5
 SRCS +=        gss-genr.c
-LDADD+=        -lgssapi -lheimntlm
-DPADD+=        ${LIBGSSAPI} ${LIBHEIMNTLM}
-
-LDADD+=        -lkrb5 -lhx509 -lheimbase -lwind
-DPADD+=        ${LIBKRB5} ${LIBHX509} ${LIBHEIMBASE} ${LIBWIND}
-
-LDADD+=        -lkafs -lasn1 -lcrypt
-DPADD+=        ${LIBKAFS} ${LIBASN1} ${LIBCRYPT}
-
-LDADD+=        -lcom_err -lroken -lsqlite3 -lutil
-DPADD+=        ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3} ${LIBUTIL}
+LDADD+=        -lgssapi -lheimntlm ${LIBKRB5_LDADD}
+DPADD+=        ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
 .endif
 
 .include <bsd.prog.mk>
diff -r 862842119fea -r 45f8d4002899 crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile     Sat Feb 24 21:51:22 2018 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile     Sun Feb 25 00:16:48 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2017/01/28 23:38:48 christos Exp $
+#      $NetBSD: Makefile,v 1.16 2018/02/25 00:16:48 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -48,11 +48,8 @@
 DPADD+= ${LIBKAFS}
 
 SRCS+= auth2-krb5.c
-LDADD+=        -lkrb5 -lasn1
-DPADD+=        ${LIBKRB5} ${LIBASN1}
-
-LDADD+=        -lcom_err -lroken -lsqlite3
-DPADD+=        ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3}
+LDADD+= ${LIBKRB5_LDADD}
+DPADD+= ${LIBKRB5_DPADD}
 .endif
 
 .if (${USE_LDAP} != "no")
diff -r 862842119fea -r 45f8d4002899 external/bsd/bind/Makefile.inc
--- a/external/bsd/bind/Makefile.inc    Sat Feb 24 21:51:22 2018 +0000
+++ b/external/bsd/bind/Makefile.inc    Sun Feb 25 00:16:48 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.29 2018/02/14 12:47:43 ryoon Exp $
+#      $NetBSD: Makefile.inc,v 1.30 2018/02/25 00:16:48 mrg Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -96,10 +96,8 @@
 .endif
 .if ${MKKERBEROS} != "no"
 .if !defined (LIB) || empty(LIB)
-LDADD+= -lgssapi -lheimntlm -lkrb5 -lhx509 -lheimbase \
-       -lcom_err  -lroken -lasn1 -lwind -lsqlite3
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
-       ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND} ${LIBSQLITE3}
+LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
+DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
 .else
 .for L in gssapi krb5 hx509 heimntlm heimbase com_err roken asn1 wind
 LIBDPLIBS+=    $L ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/lib$L
diff -r 862842119fea -r 45f8d4002899 external/bsd/dhcp/Makefile.inc
--- a/external/bsd/dhcp/Makefile.inc    Sat Feb 24 21:51:22 2018 +0000
+++ b/external/bsd/dhcp/Makefile.inc    Sun Feb 25 00:16:48 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2017/05/21 15:28:39 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.19 2018/02/25 00:16:48 mrg Exp $
 
 WARNS?=        1       # XXX -Wshadow -Wcast-qual -Wsign-compare
 
@@ -36,10 +36,8 @@
 LDADD+= -lirs -lisccfg -ldns -lisc
 LDADD+=-lpthread
 .if (${MKKERBEROS} != "no")
-LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
-       -lcom_err  -lroken -lasn1 -lwind -lsqlite3
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
-       ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND} ${LIBSQLITE3}
+LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
+DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM} ${LIBGSSAPI} ${LIBKRB5_STATIC_DPADD}
 .endif
 .if defined(PROG) && ${PROG} == "dhclient"
 LDADD+=-Wl,-Bdynamic
diff -r 862842119fea -r 45f8d4002899 external/gpl2/xcvs/bin/xcvs/Makefile
--- a/external/gpl2/xcvs/bin/xcvs/Makefile      Sat Feb 24 21:51:22 2018 +0000
+++ b/external/gpl2/xcvs/bin/xcvs/Makefile      Sun Feb 25 00:16:48 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2017/01/29 00:01:48 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2018/02/25 00:16:48 mrg Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
 PROG=  xcvs
@@ -25,35 +25,9 @@
 
 .if defined(USE_KERBEROS) && (${USE_KERBEROS} != "no")
 CPPFLAGS+= -DHAVE_GSSAPI -I${DESTDIR}/usr/include/krb5
-DPADD+= ${LIBGSSAPI} ${LIBKRB5}
+LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
+DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
 SRCS+= gssapi-client.c
-LDADD+= -lgssapi -lkrb5
-
-# libheimntlm is required by libgssapi
-DPADD+= ${LIBHEIMNTLM}
-LDADD+= -lheimntlm
-
-# libheimbase is required by libkrb5
-# libhx509 is required by libkrb5
-DPADD+= ${LIBHEIMBASE} ${LIBHX509}
-LDADD+= -lheimbase -lhx509
-
-# libasn1 is required by all the above libs
-DPADD+= ${LIBASN1}
-LDADD+= -lasn1
-
-# libcom_err is required by libasn1
-# libroken is required by libgssapi, libkrb5, libheimntlm, and libhx509
-# libcrypto is required by libgssapi, libkrb5, and libhx509
-# libwind is required by libhx509
-CPPFLAGS+= -DENCRYPTION
-DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBCRYPTO} ${LIBSQLITE3}
-LDADD+= -lcom_err -lroken -lwind -lcrypto -lsqlite3
-
-
-# libutil is required by libroken
-DPADD+= ${LIBUTIL}
-LDADD+= -lutil
 .endif
 
 DPADD+= ${LIBCRYPT} ${LIBZ}
diff -r 862842119fea -r 45f8d4002899 libexec/ftpd/Makefile
--- a/libexec/ftpd/Makefile     Sat Feb 24 21:51:22 2018 +0000
+++ b/libexec/ftpd/Makefile     Sun Feb 25 00:16:48 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.64 2015/01/25 15:53:49 christos Exp $
+#      $NetBSD: Makefile,v 1.65 2018/02/25 00:16:48 mrg Exp $
 #      @(#)Makefile    8.2 (Berkeley) 4/4/94
 
 .include <bsd.own.mk>
@@ -47,11 +47,8 @@
 #
 #SRCS+=        k5login.c
 #CPPFLAGS+=-DKERBEROS5
-#DPADD+=       ${LIBKRB5} ${LIBASN1}
-#LDADD+= -lkrb5 -lasn1
-#
-#DPADD+=       ${LIBCRYPTO} ${{LIBCRYPT} ${LIBROKEN} ${LIBCOM_ERR}
-#LDADD+=       -lcrypto -lcrypt -lroken -lcom_err
+#LDADD+= ${LIBKRB5_LDADD}
+#DPADD+= ${LIBKRB5_DPADD}
 #
 #.endif
 
diff -r 862842119fea -r 45f8d4002899 libexec/telnetd/Makefile
--- a/libexec/telnetd/Makefile  Sat Feb 24 21:51:22 2018 +0000
+++ b/libexec/telnetd/Makefile  Sun Feb 25 00:16:48 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.52 2018/02/10 19:34:34 christos Exp $
+#      $NetBSD: Makefile,v 1.53 2018/02/25 00:16:48 mrg Exp $
 #      from: @(#)Makefile      8.2 (Berkeley) 12/15/93
 
 WARNS?=        4               # XXX: const issues in sys_term.c
@@ -22,8 +22,8 @@
 
 .if (${USE_KERBEROS} != "no")
 CPPFLAGS+=-DKRB5
-LDADD+= -lkrb5 -lasn1 -lcom_err -lroken -lsqlite3
-DPADD+=        ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3}
+LDADD+= ${LIBKRB5_LDADD}
+DPADD+= ${LIBKRB5_DPADD}
 .endif
 
 CPPFLAGS+=-DAUTHENTICATION -DENCRYPTION
@@ -32,7 +32,7 @@
 
 .if (${USE_PAM} != "no")
 LDADD+= -lpam ${PAM_STATIC_LDADD}
-DPADD+=        ${LIBPAM} ${PAM_STATIC_DPADD}
+DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
 .endif
 
 .include <bsd.prog.mk>
diff -r 862842119fea -r 45f8d4002899 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Sat Feb 24 21:51:22 2018 +0000
+++ b/share/mk/bsd.prog.mk      Sun Feb 25 00:16:48 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.310 2017/12/11 13:08:47 christos Exp $
+#      $NetBSD: bsd.prog.mk,v 1.311 2018/02/25 00:16:48 mrg Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -210,6 +210,22 @@
 .endif
 .endfor
 
+.if (${MKKERBEROS} != "no")
+LIBKRB5_LDADD+= -lkrb5
+LIBKRB5_DPADD+= ${LIBKRB5}
+# Kerberos5 applications, if linked statically, need more libraries
+LIBKRB5_STATIC_LDADD+= \
+       -lhx509 -lcrypto -lasn1 -lcom_err -lroken \
+       -lwind -lheimbase -lsqlite3 -lcrypt -lutil
+LIBKRB5_STATIC_DPADD+= \
+       ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
+       ${LIBWIND} ${LIBHEIMBASE} ${LIBSQLITE3} ${LIBCRYPT}  ${LIBUTIL}
+. if (${MKPIC} == "no")
+LIBKRB5_LDADD+= ${LIBKRB5_STATIC_LDADD}
+LIBKRB5_DPADD+= ${LIBKRB5_STATIC_DPADD}
+. endif
+.endif
+
 # PAM applications, if linked statically, need more libraries
 .if (${MKPIC} == "no")
 PAM_STATIC_LDADD+= -lssh
diff -r 862842119fea -r 45f8d4002899 usr.bin/login/Makefile
--- a/usr.bin/login/Makefile    Sat Feb 24 21:51:22 2018 +0000
+++ b/usr.bin/login/Makefile    Sun Feb 25 00:16:48 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.56 2013/08/11 06:32:13 dholland Exp $
+#      $NetBSD: Makefile,v 1.57 2018/02/25 00:16:49 mrg Exp $