Received: by mail.netbsd.org (Postfix, from userid 605) id DD2E919DDA0; Sun, 21 Nov 2010 17:06:14 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 5A14C19DA3A for ; Sun, 21 Nov 2010 17:06:13 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 4CF6A175DD; Sun, 21 Nov 2010 17:06:13 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Sun, 21 Nov 2010 17:06:13 +0000 From: "Adam Ciarcinski" Subject: CVS commit: src/crypto/external/bsd/openssh/dist To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20101121170613.4CF6A175DD@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Adam Ciarcinski" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: adam Date: Sun Nov 21 17:06:13 UTC 2010 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13101 Log Message: Imported openssh-5.6 Status: Vendor Tag: OPENSSH Release Tags: v56-20101121 C src/crypto/external/bsd/openssh/dist/addrmatch.c U src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/auth-chall.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c C src/crypto/external/bsd/openssh/dist/auth-options.c C src/crypto/external/bsd/openssh/dist/auth-options.h U src/crypto/external/bsd/openssh/dist/auth-passwd.c C src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c C src/crypto/external/bsd/openssh/dist/auth-rhosts.c C src/crypto/external/bsd/openssh/dist/auth-rsa.c C src/crypto/external/bsd/openssh/dist/auth.c C src/crypto/external/bsd/openssh/dist/auth.h C src/crypto/external/bsd/openssh/dist/auth1.c U src/crypto/external/bsd/openssh/dist/auth2-chall.c U src/crypto/external/bsd/openssh/dist/auth2-gss.c C src/crypto/external/bsd/openssh/dist/auth2-hostbased.c U src/crypto/external/bsd/openssh/dist/auth2-jpake.c U src/crypto/external/bsd/openssh/dist/auth2-kbdint.c C src/crypto/external/bsd/openssh/dist/auth2-none.c U src/crypto/external/bsd/openssh/dist/auth2.c U src/crypto/external/bsd/openssh/dist/auth2-passwd.c C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c C src/crypto/external/bsd/openssh/dist/authfd.c C src/crypto/external/bsd/openssh/dist/authfd.h C src/crypto/external/bsd/openssh/dist/authfile.c C src/crypto/external/bsd/openssh/dist/authfile.h C src/crypto/external/bsd/openssh/dist/bufaux.c U src/crypto/external/bsd/openssh/dist/bufbn.c C src/crypto/external/bsd/openssh/dist/buffer.c C src/crypto/external/bsd/openssh/dist/buffer.h C src/crypto/external/bsd/openssh/dist/canohost.c U src/crypto/external/bsd/openssh/dist/canohost.h C src/crypto/external/bsd/openssh/dist/channels.c C src/crypto/external/bsd/openssh/dist/channels.h U src/crypto/external/bsd/openssh/dist/cipher-3des1.c U src/crypto/external/bsd/openssh/dist/cipher-bf1.c U src/crypto/external/bsd/openssh/dist/cipher-ctr.c U src/crypto/external/bsd/openssh/dist/cipher.c U src/crypto/external/bsd/openssh/dist/cipher.h U src/crypto/external/bsd/openssh/dist/cleanup.c C src/crypto/external/bsd/openssh/dist/clientloop.c C src/crypto/external/bsd/openssh/dist/clientloop.h U src/crypto/external/bsd/openssh/dist/compat.c U src/crypto/external/bsd/openssh/dist/compat.h U src/crypto/external/bsd/openssh/dist/compress.c U src/crypto/external/bsd/openssh/dist/compress.h U src/crypto/external/bsd/openssh/dist/crc32.c U src/crypto/external/bsd/openssh/dist/crc32.h U src/crypto/external/bsd/openssh/dist/deattack.c U src/crypto/external/bsd/openssh/dist/deattack.h C src/crypto/external/bsd/openssh/dist/dh.c U src/crypto/external/bsd/openssh/dist/dh.h U src/crypto/external/bsd/openssh/dist/dispatch.c U src/crypto/external/bsd/openssh/dist/dispatch.h C src/crypto/external/bsd/openssh/dist/dns.c C src/crypto/external/bsd/openssh/dist/dns.h U src/crypto/external/bsd/openssh/dist/fatal.c U src/crypto/external/bsd/openssh/dist/groupaccess.c U src/crypto/external/bsd/openssh/dist/groupaccess.h U src/crypto/external/bsd/openssh/dist/gss-genr.c U src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c U src/crypto/external/bsd/openssh/dist/gss-serv.c C src/crypto/external/bsd/openssh/dist/hostfile.c C src/crypto/external/bsd/openssh/dist/hostfile.h C src/crypto/external/bsd/openssh/dist/jpake.c U src/crypto/external/bsd/openssh/dist/jpake.h C src/crypto/external/bsd/openssh/dist/kex.c C src/crypto/external/bsd/openssh/dist/kex.h U src/crypto/external/bsd/openssh/dist/kexdh.c U src/crypto/external/bsd/openssh/dist/kexdhc.c C src/crypto/external/bsd/openssh/dist/kexdhs.c U src/crypto/external/bsd/openssh/dist/kexgex.c U src/crypto/external/bsd/openssh/dist/kexgexc.c C src/crypto/external/bsd/openssh/dist/kexgexs.c C src/crypto/external/bsd/openssh/dist/key.c C src/crypto/external/bsd/openssh/dist/key.h U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/log.c U src/crypto/external/bsd/openssh/dist/log.h U src/crypto/external/bsd/openssh/dist/mac.c U src/crypto/external/bsd/openssh/dist/mac.h U src/crypto/external/bsd/openssh/dist/match.c C src/crypto/external/bsd/openssh/dist/match.h C src/crypto/external/bsd/openssh/dist/misc.c C src/crypto/external/bsd/openssh/dist/misc.h U src/crypto/external/bsd/openssh/dist/moduli.c C src/crypto/external/bsd/openssh/dist/monitor.c U src/crypto/external/bsd/openssh/dist/monitor.h C src/crypto/external/bsd/openssh/dist/monitor_fdpass.c U src/crypto/external/bsd/openssh/dist/monitor_fdpass.h U src/crypto/external/bsd/openssh/dist/monitor_mm.c U src/crypto/external/bsd/openssh/dist/monitor_mm.h C src/crypto/external/bsd/openssh/dist/monitor_wrap.c U src/crypto/external/bsd/openssh/dist/monitor_wrap.h U src/crypto/external/bsd/openssh/dist/msg.c U src/crypto/external/bsd/openssh/dist/msg.h C src/crypto/external/bsd/openssh/dist/mux.c C src/crypto/external/bsd/openssh/dist/nchan.c C src/crypto/external/bsd/openssh/dist/myproposal.h U src/crypto/external/bsd/openssh/dist/nchan.ms U src/crypto/external/bsd/openssh/dist/nchan2.ms U src/crypto/external/bsd/openssh/dist/OVERVIEW C src/crypto/external/bsd/openssh/dist/packet.c U src/crypto/external/bsd/openssh/dist/packet.h C src/crypto/external/bsd/openssh/dist/pathnames.h N src/crypto/external/bsd/openssh/dist/pkcs11.h U src/crypto/external/bsd/openssh/dist/progressmeter.c U src/crypto/external/bsd/openssh/dist/progressmeter.h U src/crypto/external/bsd/openssh/dist/PROTOCOL U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent N src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys N src/crypto/external/bsd/openssh/dist/PROTOCOL.mux C src/crypto/external/bsd/openssh/dist/readconf.c C src/crypto/external/bsd/openssh/dist/readconf.h U src/crypto/external/bsd/openssh/dist/README U src/crypto/external/bsd/openssh/dist/readpass.c U src/crypto/external/bsd/openssh/dist/roaming.h N src/crypto/external/bsd/openssh/dist/roaming_client.c C src/crypto/external/bsd/openssh/dist/roaming_common.c U src/crypto/external/bsd/openssh/dist/roaming_dummy.c N src/crypto/external/bsd/openssh/dist/roaming_serv.c U src/crypto/external/bsd/openssh/dist/rsa.c U src/crypto/external/bsd/openssh/dist/rsa.h U src/crypto/external/bsd/openssh/dist/schnorr.c U src/crypto/external/bsd/openssh/dist/schnorr.h C src/crypto/external/bsd/openssh/dist/scp.1 C src/crypto/external/bsd/openssh/dist/scp.c C src/crypto/external/bsd/openssh/dist/servconf.c C src/crypto/external/bsd/openssh/dist/servconf.h U src/crypto/external/bsd/openssh/dist/serverloop.c U src/crypto/external/bsd/openssh/dist/serverloop.h C src/crypto/external/bsd/openssh/dist/session.c U src/crypto/external/bsd/openssh/dist/session.h C src/crypto/external/bsd/openssh/dist/sftp-client.c C src/crypto/external/bsd/openssh/dist/sftp-client.h C src/crypto/external/bsd/openssh/dist/sftp-common.c C src/crypto/external/bsd/openssh/dist/sftp-common.h U src/crypto/external/bsd/openssh/dist/sftp-glob.c U src/crypto/external/bsd/openssh/dist/sftp-server-main.c C src/crypto/external/bsd/openssh/dist/sftp-server.8 C src/crypto/external/bsd/openssh/dist/sftp-server.c C src/crypto/external/bsd/openssh/dist/sftp.1 C src/crypto/external/bsd/openssh/dist/sftp.c U src/crypto/external/bsd/openssh/dist/sftp.h C src/crypto/external/bsd/openssh/dist/ssh-add.1 C src/crypto/external/bsd/openssh/dist/ssh-add.c C src/crypto/external/bsd/openssh/dist/ssh-agent.1 C src/crypto/external/bsd/openssh/dist/ssh-agent.c C src/crypto/external/bsd/openssh/dist/ssh-dss.c U src/crypto/external/bsd/openssh/dist/ssh-gss.h C src/crypto/external/bsd/openssh/dist/ssh-keygen.1 C src/crypto/external/bsd/openssh/dist/ssh-keygen.c C src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 C src/crypto/external/bsd/openssh/dist/ssh-keyscan.c C src/crypto/external/bsd/openssh/dist/ssh-keysign.8 C src/crypto/external/bsd/openssh/dist/ssh-keysign.c N src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c N src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 N src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c N src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c N src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h C src/crypto/external/bsd/openssh/dist/ssh-rsa.c C src/crypto/external/bsd/openssh/dist/ssh.1 C src/crypto/external/bsd/openssh/dist/ssh.c C src/crypto/external/bsd/openssh/dist/ssh.h U src/crypto/external/bsd/openssh/dist/ssh1.h C src/crypto/external/bsd/openssh/dist/ssh2.h C src/crypto/external/bsd/openssh/dist/ssh_config C src/crypto/external/bsd/openssh/dist/ssh_config.5 C src/crypto/external/bsd/openssh/dist/sshconnect.c U src/crypto/external/bsd/openssh/dist/sshconnect.h U src/crypto/external/bsd/openssh/dist/sshconnect1.c C src/crypto/external/bsd/openssh/dist/sshconnect2.c C src/crypto/external/bsd/openssh/dist/sshd.8 C src/crypto/external/bsd/openssh/dist/sshd.c C src/crypto/external/bsd/openssh/dist/sshd_config C src/crypto/external/bsd/openssh/dist/sshd_config.5 U src/crypto/external/bsd/openssh/dist/sshlogin.c U src/crypto/external/bsd/openssh/dist/sshlogin.h U src/crypto/external/bsd/openssh/dist/sshpty.c C src/crypto/external/bsd/openssh/dist/sshpty.h C src/crypto/external/bsd/openssh/dist/sshtty.c U src/crypto/external/bsd/openssh/dist/ttymodes.c U src/crypto/external/bsd/openssh/dist/ttymodes.h U src/crypto/external/bsd/openssh/dist/uidswap.c U src/crypto/external/bsd/openssh/dist/uidswap.h U src/crypto/external/bsd/openssh/dist/umac.c U src/crypto/external/bsd/openssh/dist/umac.h U src/crypto/external/bsd/openssh/dist/uuencode.c U src/crypto/external/bsd/openssh/dist/uuencode.h C src/crypto/external/bsd/openssh/dist/version.h U src/crypto/external/bsd/openssh/dist/xmalloc.c U src/crypto/external/bsd/openssh/dist/xmalloc.h N src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper/Makefile 90 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENSSH:yesterday -jOPENSSH src/crypto/external/bsd/openssh/dist