diff options
| -rw-r--r-- | gnu/usr.bin/cvs/configure | 2 | ||||
| -rw-r--r-- | usr.bin/passwd/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/telnet/Makefile | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/gnu/usr.bin/cvs/configure b/gnu/usr.bin/cvs/configure index ce567e6333c..7feddf064b6 100644 --- a/gnu/usr.bin/cvs/configure +++ b/gnu/usr.bin/cvs/configure @@ -4021,7 +4021,7 @@ EOF includeopt="${includeopt} -I$GSSAPI/include/kerberosV" # FIXME: This is ugly, but these things don't seem to be standardized. if test "$ac_cv_header_gssapi_h" = "yes"; then - LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lcrypto -lheimbase -lhx509 -lasn1 -lwind -lroken -lcom_err -lheimntlm -lpthread" + LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lheimbase -lwind -lroken -lcom_err -lheimntlm -lpthread" else LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err" fi diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index c8bd9a19ea3..770afda57ef 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2013/06/17 19:23:33 robert Exp $ +# $OpenBSD: Makefile,v 1.34 2013/06/18 20:27:20 miod Exp $ .include <bsd.own.mk> @@ -21,8 +21,8 @@ CFLAGS+=-DYP -I${.CURDIR}/../../lib/libc/yp SRCS+= krb5_passwd.c CFLAGS+= -DKRB5 DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} -LDADD+= -lkrb5 -lasn1 -lcrypto -LDADD+= -lhx509 -lwind -lroken -lcom_err -lpthread -lheimbase +LDADD+= -lkrb5 -lhx509 -lasn1 -lcrypto +LDADD+= -lwind -lroken -lcom_err -lpthread -lheimbase .endif BINMODE=4555 diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index 1865aec39e0..fd4a7e7899b 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.58 2013/06/17 19:23:33 robert Exp $ +# $OpenBSD: Makefile,v 1.59 2013/06/18 20:27:20 miod Exp $ .PATH: ${.CURDIR}/.. @@ -26,8 +26,8 @@ CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV -DGSSAPI .if (${KERBEROS5:L} == "yes") DPADD+= ${LIBGSSAPI} ${LIBKRB5} -LDADD+= -lgssapi -lkrb5 -lasn1 -lheimntlm -LDADD+= -lhx509 -lwind -lroken -lcom_err -lpthread -lheimbase +LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lheimntlm +LDADD+= -lwind -lroken -lcom_err -lpthread -lheimbase .endif # KERBEROS5 DPADD+= ${LIBCRYPTO} ${LIBZ} diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 2e8bb2a54f5..800b849e441 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.74 2013/06/17 19:23:33 robert Exp $ +# $OpenBSD: Makefile,v 1.75 2013/06/18 20:27:20 miod Exp $ .PATH: ${.CURDIR}/.. @@ -28,8 +28,8 @@ SRCS+= auth-krb5.c auth2-gss.c gss-serv.c gss-serv-krb5.c .include <bsd.prog.mk> .if (${KERBEROS5:L} == "yes") -LDADD+= -lgssapi -lkrb5 -lasn1 -lheimntlm -LDADD+= -lhx509 -lwind -lroken -lcom_err -lpthread -lheimbase -lkafs5 +LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lheimntlm +LDADD+= -lwind -lroken -lcom_err -lpthread -lheimbase -lkafs DPADD+= ${LIBGSSAPI} ${LIBKRB5} .endif diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 152e1caadac..16ab684bc44 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2013/06/17 19:23:33 robert Exp $ +# $OpenBSD: Makefile,v 1.26 2013/06/18 20:27:20 miod Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -46,8 +46,8 @@ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ .if (${KERBEROS5:L} == "yes") CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5 -DDES_ENCRYPTION DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} -LDADD+= -lkrb5 -lasn1 -lcrypto -LDADD+= -lhx509 -lwind -lroken -lcom_err -lpthread -lheimbase +LDADD+= -lkrb5 -lhx509 -lasn1 -lcrypto +LDADD+= -lwind -lroken -lcom_err -lpthread -lheimbase SRCS+= kerberos5.c enc_des.c .endif |