merged OpenSSH 5.2p1 to trunk

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

diff --git a/openssh/version.h b/openssh/version.h
index ca56a7d47477c2c98f931426f8ea6029799c15cc..b39d6f4abc54fba171ee93a2b56bee9a7bbfe610 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.h,v 1.41 2004/03/20 10:40:59 markus Exp $ */
+/* $OpenBSD: version.h,v 1.55 2009/02/23 00:06:15 djm Exp $ */
 
 #ifdef GSI
 #define GSI_VERSION    " GSI"
@@ -18,6 +18,11 @@
 #define MGLUE_VERSION  ""
 #endif
 
-#define SSH_VERSION    "OpenSSH_3.8.1p1"       \
-                       " NCSA_GSSAPI_20040423" \
-                       GSI_VERSION KRB5_VERSION MGLUE_VERSION
+#define NCSA_VERSION   " GLOBUS_GSSAPI_20090225"
+
+#define SSH_VERSION    "OpenSSH_5.2"
+
+#define SSH_PORTABLE   "p1"
+#define SSH_HPN         "-hpn13v5"
+#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE SSH_HPN \
+            NCSA_VERSION GSI_VERSION KRB5_VERSION MGLUE_VERSION