From owner-svn-src-stable@freebsd.org Mon Mar 14 13:13:09 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4740EACDEBC; Mon, 14 Mar 2016 13:13:09 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 045E49F9; Mon, 14 Mar 2016 13:13:08 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2EDD88b081996; Mon, 14 Mar 2016 13:13:08 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2EDD7g9081991; Mon, 14 Mar 2016 13:13:07 GMT (envelope-from des@FreeBSD.org) Message-Id: <201603141313.u2EDD7g9081991@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Mon, 14 Mar 2016 13:13:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r296856 - stable/9/crypto/openssh X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2016 13:13:09 -0000 Author: des Date: Mon Mar 14 13:13:07 2016 New Revision: 296856 URL: https://svnweb.freebsd.org/changeset/base/296856 Log: Belatedly bump VersionAddendum for the xauth bugfix. Modified: stable/9/crypto/openssh/ssh_config stable/9/crypto/openssh/ssh_config.5 stable/9/crypto/openssh/sshd_config stable/9/crypto/openssh/sshd_config.5 stable/9/crypto/openssh/version.h Modified: stable/9/crypto/openssh/ssh_config ============================================================================== --- stable/9/crypto/openssh/ssh_config Mon Mar 14 13:09:58 2016 (r296855) +++ stable/9/crypto/openssh/ssh_config Mon Mar 14 13:13:07 2016 (r296856) @@ -47,4 +47,4 @@ # VisualHostKey no # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h -# VersionAddendum FreeBSD-20140420 +# VersionAddendum FreeBSD-20160314 Modified: stable/9/crypto/openssh/ssh_config.5 ============================================================================== --- stable/9/crypto/openssh/ssh_config.5 Mon Mar 14 13:09:58 2016 (r296855) +++ stable/9/crypto/openssh/ssh_config.5 Mon Mar 14 13:13:07 2016 (r296856) @@ -1420,7 +1420,7 @@ See also VERIFYING HOST KEYS in Specifies a string to append to the regular version string to identify OS- or site-specific modifications. The default is -.Dq FreeBSD-20140420 . +.Dq FreeBSD-20160314 . The value .Dq none may be used to disable this. Modified: stable/9/crypto/openssh/sshd_config ============================================================================== --- stable/9/crypto/openssh/sshd_config Mon Mar 14 13:09:58 2016 (r296855) +++ stable/9/crypto/openssh/sshd_config Mon Mar 14 13:13:07 2016 (r296856) @@ -120,7 +120,7 @@ #MaxStartups 10:30:100 #PermitTunnel no #ChrootDirectory none -#VersionAddendum FreeBSD-20140420 +#VersionAddendum FreeBSD-20160314 # no default banner path #Banner none Modified: stable/9/crypto/openssh/sshd_config.5 ============================================================================== --- stable/9/crypto/openssh/sshd_config.5 Mon Mar 14 13:09:58 2016 (r296855) +++ stable/9/crypto/openssh/sshd_config.5 Mon Mar 14 13:13:07 2016 (r296856) @@ -1253,7 +1253,7 @@ restrictions. Optionally specifies additional text to append to the SSH protocol banner sent by the server upon connection. The default is -.Dq FreeBSD-20140420 . +.Dq FreeBSD-20160314 . The value .Dq none may be used to disable this. Modified: stable/9/crypto/openssh/version.h ============================================================================== --- stable/9/crypto/openssh/version.h Mon Mar 14 13:09:58 2016 (r296855) +++ stable/9/crypto/openssh/version.h Mon Mar 14 13:13:07 2016 (r296856) @@ -6,5 +6,5 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20140420" +#define SSH_VERSION_FREEBSD "FreeBSD-20160314" #define SSH_VERSION_HPN "_hpn13v11"