d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No guts, no glory. Switch to OpenSSH-portable.

Browse Source 
Sponsored by:	DARPA, NAI Labs
This commit is contained in:
des 2002-06-25 19:10:09 +00:00
parent df105eba79
commit 513df53f59
12 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
secure/Makefile.inc
View File

@ -20,5 +20,5 @@ CFLAGS+= -DNO_IDEA
.endif .endif
.if !defined(NO_OPENSSH) .if !defined(NO_OPENSSH)
SSHDIR= ${.CURDIR}/../../../crypto/openssh SSHDIR= ${.CURDIR}/../../../crypto/openssh-portable
.endif .endif

10
secure/lib/libssh/Makefile
View File

@ -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 \ rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
key.c dispatch.c kex.c mac.c uuencode.c misc.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 \ rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
scard.c monitor_wrap.c monitor_fdpass.c msg.c \ scard.c monitor_wrap.c monitor_fdpass.c msg.c
uidswap.c version.c # Portability layer
SRCS+= bsd-misc.c entropy.c
# FreeBSD additions
SRCS+= version.c
CFLAGS+=-I${SSHDIR}
.if defined(COMPAT_GETADDRINFO) .if defined(COMPAT_GETADDRINFO)
SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
@ -20,4 +24,4 @@ LDADD= -lcrypto -lz
.include <bsd.lib.mk> .include <bsd.lib.mk>
.PATH: ${SSHDIR} ${SSHDIR}/lib .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat

4
secure/libexec/sftp-server/Makefile
View File

@ -1,12 +1,12 @@
# $FreeBSD$ # $FreeBSD$
#
PROG= sftp-server PROG= sftp-server
SRCS= sftp-server.c sftp-common.c SRCS= sftp-server.c sftp-common.c
MAN= sftp-server.8 MAN= sftp-server.8
CFLAGS+=-I${SSHDIR}
LDADD+= -lssh -lcrypto
DPADD+= ${LIBSSH} ${LIBCRYPTO} DPADD+= ${LIBSSH} ${LIBCRYPTO}
LDADD+= -lssh -lcrypto
.include <bsd.prog.mk> .include <bsd.prog.mk>

1
secure/usr.bin/scp/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PROG= scp PROG= scp
CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} DPADD= ${LIBSSH}
LDADD= -lssh LDADD= -lssh

1
secure/usr.bin/sftp/Makefile
View File

@ -2,6 +2,7 @@
PROG= sftp PROG= sftp
SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO} DPADD= ${LIBSSH} ${LIBCRYPTO}
LDADD= -lssh -lcrypto LDADD= -lssh -lcrypto

1
secure/usr.bin/ssh-add/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PROG= ssh-add PROG= ssh-add
CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO} DPADD= ${LIBSSH} ${LIBCRYPTO}
LDADD= -lssh -lcrypto LDADD= -lssh -lcrypto

1
secure/usr.bin/ssh-agent/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PROG= ssh-agent PROG= ssh-agent
CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO} DPADD= ${LIBSSH} ${LIBCRYPTO}
LDADD= -lssh -lcrypto LDADD= -lssh -lcrypto

1
secure/usr.bin/ssh-keygen/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PROG= ssh-keygen PROG= ssh-keygen
CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO} DPADD= ${LIBSSH} ${LIBCRYPTO}
LDADD= -lssh -lcrypto LDADD= -lssh -lcrypto

1
secure/usr.bin/ssh-keyscan/Makefile
View File

@ -1,6 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PROG= ssh-keyscan PROG= ssh-keyscan
CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypto -lz LDADD= -lssh -lcrypto -lz

1
secure/usr.bin/ssh-keysign/Makefile
View File

@ -2,6 +2,7 @@
PROG= ssh-keysign PROG= ssh-keysign
MAN= ssh-keysign.8 MAN= ssh-keysign.8
CFLAGS+=-I${SSHDIR}
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypto -lz LDADD= -lssh -lcrypto -lz

3
secure/usr.bin/ssh/Makefile
View File

@ -2,6 +2,7 @@
# #
PROG= ssh PROG= ssh
CFLAGS+=-I${SSHDIR}
.if defined(ENABLE_SUID_SSH) .if defined(ENABLE_SUID_SSH)
BINMODE=4555 BINMODE=4555
.endif .endif
@ -21,7 +22,7 @@ DPADD+= ${LIBKRB} ${LIBCOM_ERR}
.if defined(MAKE_KERBEROS5) .if defined(MAKE_KERBEROS5)
DISTRIBUTION=krb5 DISTRIBUTION=krb5
CFLAGS+= -DKRB5 CFLAGS+= -DKRB5 -DHEIMDAL
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT} DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
.endif .endif

10
secure/usr.sbin/sshd/Makefile
View File

@ -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 \ auth-skey.c auth-bsdauth.c monitor_mm.c monitor.c \
auth2-none.c auth2-passwd.c auth2-pubkey.c \ auth2-none.c auth2-passwd.c auth2-pubkey.c \
auth2-hostbased.c auth2-kbdint.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 MAN= sshd.8 sshd_config.5
CFLAGS+=-I${SSHDIR}
CFLAGS+= -DLIBWRAP -DHAVE_LOGIN_CAP -DUSE_PAM -DHAVE_PAM_GETENVLIST
.if defined(MAKE_KERBEROS4) .if defined(MAKE_KERBEROS4)
DISTRIBUTION=krb4 DISTRIBUTION=krb4
@ -24,13 +25,12 @@ DPADD+= ${LIBKRB} ${LIBCOM_ERR}
.if defined(MAKE_KERBEROS5) .if defined(MAKE_KERBEROS5)
DISTRIBUTION=krb5 DISTRIBUTION=krb5
CFLAGS+= -DKRB5 CFLAGS+= -DKRB5 -DHEIMDAL
SRCS+= auth-krb5.c SRCS+= auth-krb5.c
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken
DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD}
.endif .endif
CFLAGS+= -DSKEY
LDADD+= -lopie -lmd LDADD+= -lopie -lmd
DPADD+= ${LIBOPIE} ${LIBMD} DPADD+= ${LIBOPIE} ${LIBMD}