summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-01-22 20:21:33 +1100
committerDamien Miller <djm@mindrot.org>2011-01-22 20:21:33 +1100
commitad4b1adf95ff50e7066ef59abd1edc46cb35843a (patch)
treeed92012bfddd040e05fd6429df48a54d97eb0813
parent79241377df7fdd34a05d0565c7c5fb48ef6492a5 (diff)
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2011/01/22 09:18:53 [version.h] crank to OpenSSH-5.7
-rw-r--r--ChangeLog4
-rw-r--r--version.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 78196a7c2..25b0df643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 RSA_get_default_method() for the benefit of openssl versions that don't 3 RSA_get_default_method() for the benefit of openssl versions that don't
4 have it (at least openssl-engine-0.9.6b). Found and tested by Kevin Brott, 4 have it (at least openssl-engine-0.9.6b). Found and tested by Kevin Brott,
5 ok djm@. 5 ok djm@.
6 - OpenBSD CVS Sync
7 - djm@cvs.openbsd.org 2011/01/22 09:18:53
8 [version.h]
9 crank to OpenSSH-5.7
6 10
720110119 1120110119
8 - (tim) [contrib/caldera/openssh.spec] Use CFLAGS from Makefile instead 12 - (tim) [contrib/caldera/openssh.spec] Use CFLAGS from Makefile instead
diff --git a/version.h b/version.h
index 67d78dcc3..202e0dec2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.59 2010/08/08 16:26:42 djm Exp $ */ 1/* $OpenBSD: version.h,v 1.60 2011/01/22 09:18:53 djm Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_5.6" 3#define SSH_VERSION "OpenSSH_5.7"
4 4
5#define SSH_PORTABLE "p1" 5#define SSH_PORTABLE "p1"
6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE 6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE