svn commit: r296856 - stable/9/crypto/openssh

[Dag-Erling Smørgrav]

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"