merging OPENSSH_5_2P1_SIMON_20090726_HPN13V6 to trunk:

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

diff --git a/openssh/version.h b/openssh/version.h
index 37ab787bef5b428ccb14b3f0ffa76f4cb46941c2..1c416ad9ef8971e3fd5440988027455774aabeeb 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.h,v 1.44 2005/03/16 21:17:39 markus Exp $ */
+/* $OpenBSD: version.h,v 1.55 2009/02/23 00:06:15 djm Exp $ */
 
 #ifdef GSI
 #define GSI_VERSION    " GSI"
@@ -18,9 +18,11 @@
 #define MGLUE_VERSION  ""
 #endif
 
-#define SSH_VERSION    "OpenSSH_4.1"
+#define NCSA_VERSION   " GLOBUS_GSSAPI_20090506"
+
+#define SSH_VERSION    "OpenSSH_5.2"
 
 #define SSH_PORTABLE   "p1"
-#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE \
-                       " NCSA_GSSAPI_20050526" \
-                       GSI_VERSION KRB5_VERSION MGLUE_VERSION
+#define SSH_HPN         "-hpn13v6"
+#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE SSH_HPN \
+            NCSA_VERSION GSI_VERSION KRB5_VERSION MGLUE_VERSION