From: Peter Avalos Date: Sat, 20 Jun 2009 18:21:37 +0000 (-1000) Subject: Merge branch 'vendor/OPENSSH' X-Git-Tag: v2.3.2~124^2~5 X-Git-Url: https://gitweb.dragonflybsd.org/~uqs/games.git/commitdiff_plain/d7aa84d55a24d7d64f09725586be77a4777741f6 Merge branch 'vendor/OPENSSH' --- d7aa84d55a24d7d64f09725586be77a4777741f6 diff --cc crypto/openssh/README.DELETED index dcf4caee56,0000000000..dcf4caee56 mode 100644,000000..100644 --- a/crypto/openssh/README.DELETED +++ b/crypto/openssh/README.DELETED diff --cc crypto/openssh/README.DRAGONFLY index 3ee9a89a95,0000000000..fb6c65027d mode 100644,000000..100644 --- a/crypto/openssh/README.DRAGONFLY +++ b/crypto/openssh/README.DRAGONFLY @@@ -1,28 -1,0 +1,25 @@@ +Original source can be downloaded from OpenBSD at +ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ + +A list of deleted files is in README.DELETED. + - CVS import hint: - cvs import src/crypto/openssh-5 OPENSSH v5_?p1 - +Upgrading notes: +./configure --prefix=/usr --sysconfdir=/etc/ssh \ + --with-pam --with-tcp-wrappers --with-libedit + +Update config.h and version.h in secure/lib/libssh. +Update ssh{,d}_config and ssh{,d}_config.5. + +Used in: +lib/pam_module/pam_ssh/ +secure/lib/libssh/ +secure/libexec/sftp-server/ +secure/libexec/ssh-keysign/ +secure/usr.bin/scp/ +secure/usr.bin/sftp/ +secure/usr.bin/ssh/ +secure/usr.bin/ssh-add/ +secure/usr.bin/ssh-agent/ +secure/usr.bin/ssh-keygen/ +secure/usr.bin/ssh-keyscan/ +secure/usr.sbin/sshd/ diff --cc crypto/openssh/README.compromised-keys index c3e6cbbf2c,0000000000..c3e6cbbf2c mode 100644,000000..100644 --- a/crypto/openssh/README.compromised-keys +++ b/crypto/openssh/README.compromised-keys diff --cc crypto/openssh/openbsd-compat/bsd-arc4random.c index 9d4c8690eb,0000000000..9d4c8690eb mode 100644,000000..100644 --- a/crypto/openssh/openbsd-compat/bsd-arc4random.c +++ b/crypto/openssh/openbsd-compat/bsd-arc4random.c diff --cc crypto/openssh/ssh-vulnkey.1 index 41de104dea,0000000000..41de104dea mode 100644,000000..100644 --- a/crypto/openssh/ssh-vulnkey.1 +++ b/crypto/openssh/ssh-vulnkey.1 diff --cc crypto/openssh/ssh-vulnkey.c index 3297c431a7,0000000000..3297c431a7 mode 100644,000000..100644 --- a/crypto/openssh/ssh-vulnkey.c +++ b/crypto/openssh/ssh-vulnkey.c diff --cc crypto/openssh/ssh_namespace.h index 518b7b22ec,0000000000..518b7b22ec mode 100644,000000..100644 --- a/crypto/openssh/ssh_namespace.h +++ b/crypto/openssh/ssh_namespace.h diff --cc lib/pam_module/pam_ssh/Makefile index d3e53716ef,0000000000..bcdee48fed mode 100644,000000..100644 --- a/lib/pam_module/pam_ssh/Makefile +++ b/lib/pam_module/pam_ssh/Makefile @@@ -1,13 -1,0 +1,13 @@@ +# $DragonFly: src/lib/pam_module/pam_ssh/Makefile,v 1.3 2008/04/07 01:20:18 pavalos Exp $ + +LIB= pam_ssh +SRCS= pam_ssh.c +MAN= pam_ssh.8 + +LDADD= -lssh -lcrypto -lcrypt +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} + - SSHDIR= ${.CURDIR}/../../../crypto/openssh-5 ++SSHDIR= ${.CURDIR}/../../../crypto/openssh +CFLAGS+= -I${SSHDIR} -include ssh_namespace.h + +.include diff --cc secure/Makefile.ssh.common index f583b3ca98,0000000000..6123f9a404 mode 100644,000000..100644 --- a/secure/Makefile.ssh.common +++ b/secure/Makefile.ssh.common @@@ -1,17 -1,0 +1,17 @@@ +# $DragonFly: src/secure/Makefile.ssh.common,v 1.4 2008/04/07 01:20:18 pavalos Exp $ + - SSHDIR= ${.CURDIR}/../../../crypto/openssh-5 ++SSHDIR= ${.CURDIR}/../../../crypto/openssh + +CFLAGS+= -I${.CURDIR}/../../lib/libssh -I${SSHDIR} -include ssh_namespace.h + +NOLINT= true + +.if ${.CURDIR:T} != "libssh" +DPADD+= ${LIBSSH} +LDADD+= -lssh +.endif + +DPADD+= ${LIBCRYPTO} +LDADD+= -lcrypto + +.PATH: ${SSHDIR}