merged OpenSSH 5.1p1 to trunk

[gssapi-openssh.git] / openssh / version.h

diff --git a/openssh/version.h b/openssh/version.h
index 07e578a483c9ee874c7560495d7450636633ed64..c9027d56f12454d6fab09008f60ce96699bfb07a 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.h,v 1.43 2005/03/08 23:49:48 djm Exp $ */
+/* $OpenBSD: version.h,v 1.54 2008/07/21 08:19:07 djm Exp $ */
 
 #ifdef GSI
 #define GSI_VERSION    " GSI"
@@ -18,8 +18,11 @@
 #define MGLUE_VERSION  ""
 #endif
 
-#define SSH_VERSION    "OpenSSH_4.0"
+#define NCSA_VERSION   " NCSA_GSSAPI_20080727"
+
+#define SSH_VERSION    "OpenSSH_5.1"
+
 #define SSH_PORTABLE   "p1"
-#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE \
-                       " NCSA_GSSAPI_20050312" \
-                       GSI_VERSION KRB5_VERSION MGLUE_VERSION
+#define SSH_HPN         "-hpn13v1"
+#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE SSH_HPN \
+            NCSA_VERSION GSI_VERSION KRB5_VERSION MGLUE_VERSION