summaryrefslogtreecommitdiffstats
path: root/secure
diff options
context:
space:
mode:
Diffstat (limited to 'secure')
-rw-r--r--secure/Makefile.inc2
-rw-r--r--secure/lib/libssh/Makefile10
-rw-r--r--secure/libexec/sftp-server/Makefile4
-rw-r--r--secure/usr.bin/scp/Makefile1
-rw-r--r--secure/usr.bin/sftp/Makefile1
-rw-r--r--secure/usr.bin/ssh-add/Makefile1
-rw-r--r--secure/usr.bin/ssh-agent/Makefile1
-rw-r--r--secure/usr.bin/ssh-keygen/Makefile1
-rw-r--r--secure/usr.bin/ssh-keyscan/Makefile1
-rw-r--r--secure/usr.bin/ssh-keysign/Makefile1
-rw-r--r--secure/usr.bin/ssh/Makefile3
-rw-r--r--secure/usr.sbin/sshd/Makefile10
12 files changed, 24 insertions, 12 deletions
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 0f19a7b..faf7be0 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -20,5 +20,5 @@ CFLAGS+= -DNO_IDEA
.endif
.if !defined(NO_OPENSSH)
-SSHDIR= ${.CURDIR}/../../../crypto/openssh
+SSHDIR= ${.CURDIR}/../../../crypto/openssh-portable
.endif
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index e5146bb..7bfbdc3 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -8,8 +8,12 @@ SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
key.c dispatch.c kex.c mac.c uuencode.c misc.c \
rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
- scard.c monitor_wrap.c monitor_fdpass.c msg.c \
- uidswap.c version.c
+ scard.c monitor_wrap.c monitor_fdpass.c msg.c
+# Portability layer
+SRCS+= bsd-misc.c entropy.c
+# FreeBSD additions
+SRCS+= version.c
+CFLAGS+=-I${SSHDIR}
.if defined(COMPAT_GETADDRINFO)
SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
@@ -20,4 +24,4 @@ LDADD= -lcrypto -lz
.include <bsd.lib.mk>
-.PATH: ${SSHDIR} ${SSHDIR}/lib
+.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index c527ccf..1b046ad 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,12 +1,12 @@
# $FreeBSD$
-#
PROG= sftp-server
SRCS= sftp-server.c sftp-common.c
MAN= sftp-server.8
+CFLAGS+=-I${SSHDIR}
-LDADD+= -lssh -lcrypto
DPADD+= ${LIBSSH} ${LIBCRYPTO}
+LDADD+= -lssh -lcrypto
.include <bsd.prog.mk>
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index 2264e39..03f3316 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= scp
+CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH}
LDADD= -lssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 0f85afd..32fa7cd 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -2,6 +2,7 @@
PROG= sftp
SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
+CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO}
LDADD= -lssh -lcrypto
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index 6540575..ab4a2b4 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= ssh-add
+CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO}
LDADD= -lssh -lcrypto
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index c79fd24..0fbd96d 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= ssh-agent
+CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO}
LDADD= -lssh -lcrypto
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index 99d1fb9..8140cde 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= ssh-keygen
+CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO}
LDADD= -lssh -lcrypto
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
index 45e63d9..6c9be5e 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= ssh-keyscan
+CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypto -lz
diff --git a/secure/usr.bin/ssh-keysign/Makefile b/secure/usr.bin/ssh-keysign/Makefile
index 0e1166b..5fdd672 100644
--- a/secure/usr.bin/ssh-keysign/Makefile
+++ b/secure/usr.bin/ssh-keysign/Makefile
@@ -2,6 +2,7 @@
PROG= ssh-keysign
MAN= ssh-keysign.8
+CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypto -lz
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 82a8d00..d9ba6a7 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -2,6 +2,7 @@
#
PROG= ssh
+CFLAGS+=-I${SSHDIR}
.if defined(ENABLE_SUID_SSH)
BINMODE=4555
.endif
@@ -21,7 +22,7 @@ DPADD+= ${LIBKRB} ${LIBCOM_ERR}
.if defined(MAKE_KERBEROS5)
DISTRIBUTION=krb5
-CFLAGS+= -DKRB5
+CFLAGS+= -DKRB5 -DHEIMDAL
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
.endif
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 4987cef..6cc3478 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -9,10 +9,11 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
auth-skey.c auth-bsdauth.c monitor_mm.c monitor.c \
auth2-none.c auth2-passwd.c auth2-pubkey.c \
auth2-hostbased.c auth2-kbdint.c \
- auth-pam.c auth2-pam.c
+ auth-pam.c auth2-pam.c auth2-pam-freebsd.c
+# Portability layer
+SRCS+= loginrec.c
MAN= sshd.8 sshd_config.5
-
-CFLAGS+= -DLIBWRAP -DHAVE_LOGIN_CAP -DUSE_PAM -DHAVE_PAM_GETENVLIST
+CFLAGS+=-I${SSHDIR}
.if defined(MAKE_KERBEROS4)
DISTRIBUTION=krb4
@@ -24,13 +25,12 @@ DPADD+= ${LIBKRB} ${LIBCOM_ERR}
.if defined(MAKE_KERBEROS5)
DISTRIBUTION=krb5
-CFLAGS+= -DKRB5
+CFLAGS+= -DKRB5 -DHEIMDAL
SRCS+= auth-krb5.c
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken
DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD}
.endif
-CFLAGS+= -DSKEY
LDADD+= -lopie -lmd
DPADD+= ${LIBOPIE} ${LIBMD}
OpenPOWER on IntegriCloud