Module Name: src
Committed By: mrg
Date: Sun Feb 25 00:16:49 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/bin: Makefile.inc
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/external/bsd/bind: Makefile.inc
src/external/bsd/dhcp: Makefile.inc
src/external/gpl2/xcvs/bin/xcvs: Makefile
src/libexec/ftpd: Makefile
src/libexec/telnetd: Makefile
src/share/mk: bsd.prog.mk
src/usr.bin/login: Makefile
src/usr.bin/passwd: Makefile
src/usr.bin/su: Makefile
src/usr.bin/telnet: Makefile
src/usr.sbin/racoon: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/dhcp/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/bin/xcvs/Makefile
cvs rdiff -u -r1.64 -r1.65 src/libexec/ftpd/Makefile
cvs rdiff -u -r1.52 -r1.53 src/libexec/telnetd/Makefile
cvs rdiff -u -r1.310 -r1.311 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/login/Makefile
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/passwd/Makefile
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/su/Makefile
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/racoon/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/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.3 src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.4
--- src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.3 Sat Jan 28 21:31:43 2017
+++ src/crypto/external/bsd/heimdal/bin/Makefile.inc Sun Feb 25 00:16:48 2018
@@ -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}
Index: src/crypto/external/bsd/heimdal/libexec/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.5 src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.6
--- src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.5 Sun Jan 29 22:09:06 2017
+++ src/crypto/external/bsd/heimdal/libexec/Makefile.inc Sun Feb 25 00:16:48 2018
@@ -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}
Index: src/crypto/external/bsd/heimdal/sbin/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.4 src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.5
--- src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.4 Sun Jan 29 22:09:06 2017
+++ src/crypto/external/bsd/heimdal/sbin/Makefile.inc Sun Feb 25 00:16:48 2018
@@ -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}
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.12 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.13
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.12 Sat Oct 7 19:39:19 2017
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Sun Feb 25 00:16:48 2018
@@ -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 @@ MLINKS= ssh.1 slogin.1
.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>
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.15 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.16
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.15 Sat Jan 28 23:38:48 2017
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Sun Feb 25 00:16:48 2018
@@ -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 @@ LDADD+= -lkafs
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")
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.29 src/external/bsd/bind/Makefile.inc:1.30
--- src/external/bsd/bind/Makefile.inc:1.29 Wed Feb 14 12:47:43 2018
+++ src/external/bsd/bind/Makefile.inc Sun Feb 25 00:16:48 2018
@@ -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 @@ CPPFLAGS+=-DGSSAPI
.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
Index: src/external/bsd/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.18 src/external/bsd/dhcp/Makefile.inc:1.19
--- src/external/bsd/dhcp/Makefile.inc:1.18 Sun May 21 15:28:39 2017
+++ src/external/bsd/dhcp/Makefile.inc Sun Feb 25 00:16:48 2018
@@ -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+=-Wl,-Bstatic
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
Index: src/external/gpl2/xcvs/bin/xcvs/Makefile
diff -u src/external/gpl2/xcvs/bin/xcvs/Makefile:1.5 src/external/gpl2/xcvs/bin/xcvs/Makefile:1.6
--- src/external/gpl2/xcvs/bin/xcvs/Makefile:1.5 Sun Jan 29 00:01:48 2017
+++ src/external/gpl2/xcvs/bin/xcvs/Makefile Sun Feb 25 00:16:48 2018
@@ -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 @@ LDADD+= ${LIBDIFF} ${LIBCVS}
.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}
Index: src/libexec/ftpd/Makefile
diff -u src/libexec/ftpd/Makefile:1.64 src/libexec/ftpd/Makefile:1.65
--- src/libexec/ftpd/Makefile:1.64 Sun Jan 25 15:53:49 2015
+++ src/libexec/ftpd/Makefile Sun Feb 25 00:16:48 2018
@@ -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 @@ ftpd.o ftpcmd.o: version.h
#
#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
Index: src/libexec/telnetd/Makefile
diff -u src/libexec/telnetd/Makefile:1.52 src/libexec/telnetd/Makefile:1.53
--- src/libexec/telnetd/Makefile:1.52 Sat Feb 10 19:34:34 2018
+++ src/libexec/telnetd/Makefile Sun Feb 25 00:16:48 2018
@@ -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 @@ LIBTELNETDIR!= cd ${.CURDIR}/../../lib/l
.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 @@ DPADD+=${LIBDES} ${LIBCRYPTO} ${LIBCRYPT
.if (${USE_PAM} != "no")
LDADD+= -lpam ${PAM_STATIC_LDADD}
-DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
+DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
.endif
.include <bsd.prog.mk>
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.310 src/share/mk/bsd.prog.mk:1.311
--- src/share/mk/bsd.prog.mk:1.310 Mon Dec 11 13:08:47 2017
+++ src/share/mk/bsd.prog.mk Sun Feb 25 00:16:48 2018
@@ -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 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
.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
Index: src/usr.bin/login/Makefile
diff -u src/usr.bin/login/Makefile:1.56 src/usr.bin/login/Makefile:1.57
--- src/usr.bin/login/Makefile:1.56 Sun Aug 11 06:32:13 2013
+++ src/usr.bin/login/Makefile Sun Feb 25 00:16:49 2018
@@ -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 $
# @(#)Makefile 8.1 (Berkeley) 7/19/93
.include <bsd.own.mk>
@@ -23,11 +23,8 @@ CPPFLAGS+=-DLOGIN_CAP -DSUPPORT_UTMP -DS
.if (${USE_KERBEROS} != "no")
SRCS+= k5login.c
CPPFLAGS+=-DKERBEROS5
-DPADD+= ${LIBKRB5} ${LIBASN1}
-LDADD+= -lkrb5 -lasn1
-
-DPADD+= ${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}
-LDADD+= -lcrypto -lroken -lcom_err
+LDADD+= ${LIBKRB5_LDADD}
+DPADD+= ${LIBKRB5_DPADD}
.endif
.if (${USE_SKEY} != "no")
Index: src/usr.bin/passwd/Makefile
diff -u src/usr.bin/passwd/Makefile:1.45 src/usr.bin/passwd/Makefile:1.46
--- src/usr.bin/passwd/Makefile:1.45 Sat Jan 28 23:44:51 2017
+++ src/usr.bin/passwd/Makefile Sun Feb 25 00:16:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/01/28 23:44:51 christos Exp $
+# $NetBSD: Makefile,v 1.46 2018/02/25 00:16:49 mrg Exp $
# from: @(#)Makefile 8.3 (Berkeley) 4/2/94
.include <bsd.own.mk>
@@ -13,14 +13,14 @@ CPPFLAGS+=-I${.CURDIR} -DLOGIN_CAP
.if (${USE_YP} != "no")
SRCS+= yp_passwd.c
CPPFLAGS+=-DYP
-DPADD+= ${LIBRPCSVC}
LDADD+= -lrpcsvc
+DPADD+= ${LIBRPCSVC}
LINKS+= ${BINDIR}/passwd ${BINDIR}/yppasswd
MAN+= yppasswd.1
.endif
-DPADD+= ${LIBCRYPT} ${LIBUTIL}
LDADD+= -lcrypt -lutil
+DPADD+= ${LIBCRYPT} ${LIBUTIL}
BINOWN= root
BINMODE=4555
@@ -29,10 +29,8 @@ BINMODE=4555
CPPFLAGS+= -DKERBEROS5
SRCS+= krb5_passwd.c
-DPADD+= ${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
-DPADD+= ${LIBSQLITE3}
-LDADD+= -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lcrypt
-LDADD+= -lsqlite3
+LDADD+= ${LIBKRB5_LDADD}
+DPADD+= ${LIBKRB5_DPADD}
.ifdef OVERRIDE_HEIMDAL_KPASSWD
LINKS+= ${BINDIR}/passwd ${BINDIR}/kpasswd
MAN+= kpasswd.1
Index: src/usr.bin/su/Makefile
diff -u src/usr.bin/su/Makefile:1.50 src/usr.bin/su/Makefile:1.51
--- src/usr.bin/su/Makefile:1.50 Sun Apr 24 21:42:06 2011
+++ src/usr.bin/su/Makefile Sun Feb 25 00:16:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2011/04/24 21:42:06 elric Exp $
+# $NetBSD: Makefile,v 1.51 2018/02/25 00:16:49 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 7/19/93
.include <bsd.own.mk>
@@ -27,8 +27,8 @@ SRCS=su_pam.c grutil.c suutil.c
SRCS=su.c grutil.c suutil.c
-DPADD+= ${LIBCRYPT} ${LIBUTIL}
LDADD+= -lcrypt -lutil
+DPADD+= ${LIBCRYPT} ${LIBUTIL}
# Uncomment the following line to change the group that may su root to "sugroup"
#
@@ -41,22 +41,19 @@ LDADD+= -lcrypt -lutil
.if (${USE_KERBEROS} != "no")
.ifdef AFS
-DPADD+= ${LIBKAFS}
LDADD+= -lkafs
+DPADD+= ${LIBKAFS}
.endif
CPPFLAGS+=-DKERBEROS5
-DPADD+= ${LIBKRB5} ${LIBASN1}
-LDADD+= -lkrb5 -lasn1
-
-DPADD+= ${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}
-LDADD+= -lcrypto -lroken -lcom_err
+LDADD+= ${LIBKRB5_LDADD}
+DPADD+= ${LIBKRB5_DPADD}
.endif
.if (${USE_SKEY} != "no")
CPPFLAGS+=-DSKEY
-DPADD+= ${LIBSKEY}
LDADD+= -lskey
+DPADD+= ${LIBSKEY}
.endif
.ifdef SU_ROOTAUTH
Index: src/usr.bin/telnet/Makefile
diff -u src/usr.bin/telnet/Makefile:1.52 src/usr.bin/telnet/Makefile:1.53
--- src/usr.bin/telnet/Makefile:1.52 Sun May 21 15:28:43 2017
+++ src/usr.bin/telnet/Makefile Sun Feb 25 00:16:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2017/05/21 15:28:43 riastradh Exp $
+# $NetBSD: Makefile,v 1.53 2018/02/25 00:16:49 mrg Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -65,8 +65,8 @@ LIBTELNETDIR!= cd ${.CURDIR}/../../lib/l
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-DKRB5 -DFORWARD
-LDADD+= -lkrb5 -lasn1 -lcom_err -lroken -lsqlite3
-DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3}
+LDADD+= ${LIBKRB5_LDADD}
+DPADD+= ${LIBKRB5_DPADD}
.endif
CPPFLAGS+=-DAUTHENTICATION -DENCRYPTION
Index: src/usr.sbin/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.33 src/usr.sbin/racoon/Makefile:1.34
--- src/usr.sbin/racoon/Makefile:1.33 Fri Feb 9 02:51:32 2018
+++ src/usr.sbin/racoon/Makefile Sun Feb 25 00:16:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2018/02/09 02:51:32 christos Exp $
+# $NetBSD: Makefile,v 1.34 2018/02/25 00:16:49 mrg Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -50,10 +50,8 @@ DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
.endif
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-DHAVE_GSSAPI
-LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lcom_err \
- -lroken -lasn1 -lsqlite3
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBCOM_ERR} \
- ${LIBROKEN} ${LIBASN1} ${LIBSQLITE3}
+LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
+DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
.endif
CPPFLAGS+=-DHAVE_OPENSSL_IDEA_H
.if (${USE_INET6} != "no")
