From 38163679564700c810cbf4d14d8dd3fd9435ebdd Mon Sep 17 00:00:00 2001
From: des <des@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 14 Mar 2016 13:13:07 +0000
Subject: [PATCH] Belatedly bump VersionAddendum for the xauth bugfix.

git-svn-id: svn://svn.freebsd.org/base/stable/9@296856 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 crypto/openssh/ssh_config    | 2 +-
 crypto/openssh/ssh_config.5  | 2 +-
 crypto/openssh/sshd_config   | 2 +-
 crypto/openssh/sshd_config.5 | 2 +-
 crypto/openssh/version.h     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config
index 8288a398e..ec4041b10 100644
--- a/crypto/openssh/ssh_config
+++ b/crypto/openssh/ssh_config
@@ -47,4 +47,4 @@
 #   VisualHostKey no
 #   ProxyCommand ssh -q -W %h:%p gateway.example.com
 #   RekeyLimit 1G 1h
-#   VersionAddendum FreeBSD-20140420
+#   VersionAddendum FreeBSD-20160314
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5
index 6b41fcbb1..6f86f3efe 100644
--- a/crypto/openssh/ssh_config.5
+++ b/crypto/openssh/ssh_config.5
@@ -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.
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 9f927c79d..e6962e823 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -120,7 +120,7 @@
 #MaxStartups 10:30:100
 #PermitTunnel no
 #ChrootDirectory none
-#VersionAddendum FreeBSD-20140420
+#VersionAddendum FreeBSD-20160314
 
 # no default banner path
 #Banner none
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index 10a5bb194..6343dc224 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -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.
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index f62c52639..49bdf50b5 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -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"
-- 
2.45.0