Index: crypto/external/bsd/heimdal/bin/Makefile.inc =================================================================== RCS file: /cvsroot/src/crypto/external/bsd/heimdal/bin/Makefile.inc,v retrieving revision 1.3 diff -p -u -u -r1.3 Makefile.inc --- crypto/external/bsd/heimdal/bin/Makefile.inc 28 Jan 2017 21:31:43 -0000 1.3 +++ crypto/external/bsd/heimdal/bin/Makefile.inc 24 Feb 2018 23:11:06 -0000 @@ -2,12 +2,8 @@ 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: crypto/external/bsd/heimdal/libexec/Makefile.inc =================================================================== RCS file: /cvsroot/src/crypto/external/bsd/heimdal/libexec/Makefile.inc,v retrieving revision 1.5 diff -p -u -u -r1.5 Makefile.inc --- crypto/external/bsd/heimdal/libexec/Makefile.inc 29 Jan 2017 22:09:06 -0000 1.5 +++ crypto/external/bsd/heimdal/libexec/Makefile.inc 24 Feb 2018 23:11:06 -0000 @@ -2,14 +2,8 @@ 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: crypto/external/bsd/heimdal/sbin/Makefile.inc =================================================================== RCS file: /cvsroot/src/crypto/external/bsd/heimdal/sbin/Makefile.inc,v retrieving revision 1.4 diff -p -u -u -r1.4 Makefile.inc --- crypto/external/bsd/heimdal/sbin/Makefile.inc 29 Jan 2017 22:09:06 -0000 1.4 +++ crypto/external/bsd/heimdal/sbin/Makefile.inc 24 Feb 2018 23:11:06 -0000 @@ -2,12 +2,8 @@ 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: crypto/external/bsd/openssh/bin/ssh/Makefile =================================================================== RCS file: /cvsroot/src/crypto/external/bsd/openssh/bin/ssh/Makefile,v retrieving revision 1.12 diff -p -u -u -r1.12 Makefile --- crypto/external/bsd/openssh/bin/ssh/Makefile 7 Oct 2017 19:39:19 -0000 1.12 +++ crypto/external/bsd/openssh/bin/ssh/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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 Index: crypto/external/bsd/openssh/bin/sshd/Makefile =================================================================== RCS file: /cvsroot/src/crypto/external/bsd/openssh/bin/sshd/Makefile,v retrieving revision 1.15 diff -p -u -u -r1.15 Makefile --- crypto/external/bsd/openssh/bin/sshd/Makefile 28 Jan 2017 23:38:48 -0000 1.15 +++ crypto/external/bsd/openssh/bin/sshd/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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: external/bsd/bind/Makefile.inc =================================================================== RCS file: /cvsroot/src/external/bsd/bind/Makefile.inc,v retrieving revision 1.29 diff -p -u -u -r1.29 Makefile.inc --- external/bsd/bind/Makefile.inc 14 Feb 2018 12:47:43 -0000 1.29 +++ external/bsd/bind/Makefile.inc 24 Feb 2018 23:11:06 -0000 @@ -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: external/bsd/dhcp/Makefile.inc =================================================================== RCS file: /cvsroot/src/external/bsd/dhcp/Makefile.inc,v retrieving revision 1.18 diff -p -u -u -r1.18 Makefile.inc --- external/bsd/dhcp/Makefile.inc 21 May 2017 15:28:39 -0000 1.18 +++ external/bsd/dhcp/Makefile.inc 24 Feb 2018 23:11:06 -0000 @@ -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: external/gpl2/xcvs/bin/xcvs/Makefile =================================================================== RCS file: /cvsroot/src/external/gpl2/xcvs/bin/xcvs/Makefile,v retrieving revision 1.5 diff -p -u -u -r1.5 Makefile --- external/gpl2/xcvs/bin/xcvs/Makefile 29 Jan 2017 00:01:48 -0000 1.5 +++ external/gpl2/xcvs/bin/xcvs/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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: libexec/ftpd/Makefile =================================================================== RCS file: /cvsroot/src/libexec/ftpd/Makefile,v retrieving revision 1.64 diff -p -u -u -r1.64 Makefile --- libexec/ftpd/Makefile 25 Jan 2015 15:53:49 -0000 1.64 +++ libexec/ftpd/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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: libexec/telnetd/Makefile =================================================================== RCS file: /cvsroot/src/libexec/telnetd/Makefile,v retrieving revision 1.52 diff -p -u -u -r1.52 Makefile --- libexec/telnetd/Makefile 10 Feb 2018 19:34:34 -0000 1.52 +++ libexec/telnetd/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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 Index: share/mk/bsd.prog.mk =================================================================== RCS file: /cvsroot/src/share/mk/bsd.prog.mk,v retrieving revision 1.310 diff -p -u -u -r1.310 bsd.prog.mk --- share/mk/bsd.prog.mk 11 Dec 2017 13:08:47 -0000 1.310 +++ share/mk/bsd.prog.mk 24 Feb 2018 23:11:06 -0000 @@ -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: usr.bin/login/Makefile =================================================================== RCS file: /cvsroot/src/usr.bin/login/Makefile,v retrieving revision 1.56 diff -p -u -u -r1.56 Makefile --- usr.bin/login/Makefile 11 Aug 2013 06:32:13 -0000 1.56 +++ usr.bin/login/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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: usr.bin/passwd/Makefile =================================================================== RCS file: /cvsroot/src/usr.bin/passwd/Makefile,v retrieving revision 1.45 diff -p -u -u -r1.45 Makefile --- usr.bin/passwd/Makefile 28 Jan 2017 23:44:51 -0000 1.45 +++ usr.bin/passwd/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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: usr.bin/su/Makefile =================================================================== RCS file: /cvsroot/src/usr.bin/su/Makefile,v retrieving revision 1.50 diff -p -u -u -r1.50 Makefile --- usr.bin/su/Makefile 24 Apr 2011 21:42:06 -0000 1.50 +++ usr.bin/su/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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: usr.bin/telnet/Makefile =================================================================== RCS file: /cvsroot/src/usr.bin/telnet/Makefile,v retrieving revision 1.52 diff -p -u -u -r1.52 Makefile --- usr.bin/telnet/Makefile 21 May 2017 15:28:43 -0000 1.52 +++ usr.bin/telnet/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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: usr.sbin/racoon/Makefile =================================================================== RCS file: /cvsroot/src/usr.sbin/racoon/Makefile,v retrieving revision 1.33 diff -p -u -u -r1.33 Makefile --- usr.sbin/racoon/Makefile 9 Feb 2018 02:51:32 -0000 1.33 +++ usr.sbin/racoon/Makefile 24 Feb 2018 23:11:06 -0000 @@ -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")