Merge branch 'vendor/OPENSSH'
authorPeter Avalos <pavalos@theshell.com>
Sat, 20 Jun 2009 18:21:37 +0000 (08:21 -1000)
committerPeter Avalos <pavalos@theshell.com>
Sat, 20 Jun 2009 18:21:37 +0000 (08:21 -1000)
34 files changed:
1  2 
crypto/openssh/README.DELETED
crypto/openssh/README.DRAGONFLY
crypto/openssh/README.compromised-keys
crypto/openssh/auth-rh-rsa.c
crypto/openssh/auth-rsa.c
crypto/openssh/auth2-hostbased.c
crypto/openssh/auth2-pubkey.c
crypto/openssh/auth2.c
crypto/openssh/authfile.c
crypto/openssh/authfile.h
crypto/openssh/loginrec.c
crypto/openssh/moduli.5
crypto/openssh/openbsd-compat/bsd-arc4random.c
crypto/openssh/openbsd-compat/port-tun.c
crypto/openssh/pathnames.h
crypto/openssh/readconf.c
crypto/openssh/servconf.c
crypto/openssh/servconf.h
crypto/openssh/session.c
crypto/openssh/ssh-agent.c
crypto/openssh/ssh-vulnkey.1
crypto/openssh/ssh-vulnkey.c
crypto/openssh/ssh.1
crypto/openssh/ssh.c
crypto/openssh/ssh_config
crypto/openssh/ssh_config.5
crypto/openssh/ssh_namespace.h
crypto/openssh/sshconnect2.c
crypto/openssh/sshd.8
crypto/openssh/sshd.c
crypto/openssh/sshd_config
crypto/openssh/sshd_config.5
lib/pam_module/pam_ssh/Makefile
secure/Makefile.ssh.common

index dcf4cae,0000000..dcf4cae
mode 100644,000000..100644
--- /dev/null
index 3ee9a89,0000000..fb6c650
mode 100644,000000..100644
--- /dev/null
@@@ -1,28 -1,0 +1,25 @@@
- CVS import hint:
- cvs import src/crypto/openssh-5 OPENSSH v5_?p1
 +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.
 +
 +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/
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 41de104,0000000..41de104
mode 100644,000000..100644
--- /dev/null
index 3297c43,0000000..3297c43
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
index 518b7b2,0000000..518b7b2
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index d3e5371,0000000..bcdee48
mode 100644,000000..100644
--- /dev/null
@@@ -1,13 -1,0 +1,13 @@@
- SSHDIR=               ${.CURDIR}/../../../crypto/openssh-5
 +# $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
 +CFLAGS+=      -I${SSHDIR} -include ssh_namespace.h
 +
 +.include <bsd.lib.mk>
index f583b3c,0000000..6123f9a
mode 100644,000000..100644
--- /dev/null
@@@ -1,17 -1,0 +1,17 @@@
- SSHDIR=               ${.CURDIR}/../../../crypto/openssh-5
 +# $DragonFly: src/secure/Makefile.ssh.common,v 1.4 2008/04/07 01:20:18 pavalos Exp $
 +
++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}