Sat Jan 28 23:38:48 2017 UTC ()
krb5 needs sqlite3 now


(christos)
diff -r1.10 -r1.11 src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -r1.14 -r1.15 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs diff -r1.10 -r1.11 src/crypto/external/bsd/openssh/bin/ssh/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/bin/ssh/Makefile 2016/08/02 13:45:12 1.10
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile 2017/01/28 23:38:48 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.10 2016/08/02 13:45:12 christos Exp $ 1# $NetBSD: Makefile,v 1.11 2017/01/28 23:38:48 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5BINDIR = /usr/bin 5BINDIR = /usr/bin
6 6
7PROG= ssh 7PROG= ssh
8SRCS= ssh.c readconf.c clientloop.c sshtty.c \ 8SRCS= ssh.c readconf.c clientloop.c sshtty.c \
9 sshconnect.c sshconnect1.c sshconnect2.c mux.c auth.c 9 sshconnect.c sshconnect1.c sshconnect2.c mux.c auth.c
10 10
11COPTS.auth.c= -DHOST_ONLY 11COPTS.auth.c= -DHOST_ONLY
12COPTS.sshconnect1.c= -fno-strict-aliasing 12COPTS.sshconnect1.c= -fno-strict-aliasing
13COPTS.mux.c= -Wno-pointer-sign 13COPTS.mux.c= -Wno-pointer-sign
14COPTS.sshconnect2.c= -Wno-pointer-sign 14COPTS.sshconnect2.c= -Wno-pointer-sign
@@ -19,18 +19,18 @@ MLINKS= ssh.1 slogin.1 @@ -19,18 +19,18 @@ MLINKS= ssh.1 slogin.1
19 19
20.if (${USE_KERBEROS} != "no") 20.if (${USE_KERBEROS} != "no")
21# this is not entirely true, libgssapi might be independent of krb5 21# this is not entirely true, libgssapi might be independent of krb5
22SRCS += gss-genr.c 22SRCS += gss-genr.c
23LDADD+= -lgssapi -lheimntlm 23LDADD+= -lgssapi -lheimntlm
24DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} 24DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM}
25 25
26LDADD+= -lkrb5 -lhx509 -lheimbase -lwind 26LDADD+= -lkrb5 -lhx509 -lheimbase -lwind
27DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBHEIMBASE} ${LIBWIND} 27DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBHEIMBASE} ${LIBWIND}
28 28
29LDADD+= -lkafs -lasn1 -lcrypt 29LDADD+= -lkafs -lasn1 -lcrypt
30DPADD+= ${LIBKAFS} ${LIBASN1} ${LIBCRYPT} 30DPADD+= ${LIBKAFS} ${LIBASN1} ${LIBCRYPT}
31 31
32LDADD+= -lcom_err -lroken -lutil 32LDADD+= -lcom_err -lroken -lsqlite3 -lutil
33DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBUTIL} 33DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3} ${LIBUTIL}
34.endif 34.endif
35 35
36.include <bsd.prog.mk> 36.include <bsd.prog.mk>
cvs diff -r1.14 -r1.15 src/crypto/external/bsd/openssh/bin/sshd/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/bin/sshd/Makefile 2016/12/25 00:07:46 1.14
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile 2017/01/28 23:38:48 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2016/12/25 00:07:46 christos Exp $ 1# $NetBSD: Makefile,v 1.15 2017/01/28 23:38:48 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= sshd 5PROG= sshd
6MAN= sshd.8 sshd_config.5 moduli.5 6MAN= sshd.8 sshd_config.5 moduli.5
7 7
8BINDIR= /usr/sbin 8BINDIR= /usr/sbin
9 9
10SRCS= sshd.c auth-rhosts.c auth-passwd.c \ 10SRCS= sshd.c auth-rhosts.c auth-passwd.c \
11 sshpty.c sshlogin.c servconf.c serverloop.c \ 11 sshpty.c sshlogin.c servconf.c serverloop.c \
12 auth.c auth2.c auth-options.c session.c \ 12 auth.c auth2.c auth-options.c session.c \
13 auth-krb5.c auth2-chall.c groupaccess.c \ 13 auth-krb5.c auth2-chall.c groupaccess.c \
14 auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \ 14 auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
@@ -41,28 +41,28 @@ DPADD+= ${LIBSKEY} @@ -41,28 +41,28 @@ DPADD+= ${LIBSKEY}
41 41
42.if (${USE_KERBEROS} != "no") 42.if (${USE_KERBEROS} != "no")
43SRCS+= gss-genr.c auth2-gss.c gss-serv.c gss-serv-krb5.c 43SRCS+= gss-genr.c auth2-gss.c gss-serv.c gss-serv-krb5.c
44LDADD+= -lgssapi -lheimntlm 44LDADD+= -lgssapi -lheimntlm
45DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} 45DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM}
46 46
47LDADD+= -lkafs 47LDADD+= -lkafs
48DPADD+= ${LIBKAFS} 48DPADD+= ${LIBKAFS}
49 49
50SRCS+= auth2-krb5.c 50SRCS+= auth2-krb5.c
51LDADD+= -lkrb5 -lasn1 51LDADD+= -lkrb5 -lasn1
52DPADD+= ${LIBKRB5} ${LIBASN1} 52DPADD+= ${LIBKRB5} ${LIBASN1}
53 53
54LDADD+= -lcom_err -lroken 54LDADD+= -lcom_err -lroken -lsqlite3
55DPADD+= ${LIBCOM_ERR} ${LIBROKEN} 55DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3}
56.endif 56.endif
57 57
58.if (${USE_LDAP} != "no") 58.if (${USE_LDAP} != "no")
59SRCS+= ldapauth.c 59SRCS+= ldapauth.c
60LDADD+= -lldap -lssl -llber 60LDADD+= -lldap -lssl -llber
61DPADD+= ${LIBLDAP} ${LIBSSL} ${LIBLBER} 61DPADD+= ${LIBLDAP} ${LIBSSL} ${LIBLBER}
62.endif 62.endif
63 63
64.include <bsd.prog.mk> 64.include <bsd.prog.mk>
65 65
66LDADD+= -lcrypt -lutil 66LDADD+= -lcrypt -lutil
67DPADD+= ${LIBCRYPT} ${LIBUTIL} 67DPADD+= ${LIBCRYPT} ${LIBUTIL}
68 68