summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b89e5ff4b..de61e1755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@
34 [monitor_fdpass.c] 34 [monitor_fdpass.c]
35 use a union to ensure alignment of the cmsg (pay attention: various other 35 use a union to ensure alignment of the cmsg (pay attention: various other
36 parts of the tree need this treatment too); ok djm 36 parts of the tree need this treatment too); ok djm
37 - deraadt@cvs.openbsd.org 2008/03/04 21:15:42
38 [version.h]
39 crank version; from djm
37 40
3820080302 4120080302
39 - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect 42 - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect
@@ -3694,4 +3697,4 @@
3694 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3697 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3695 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3698 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3696 3699
3697$Id: ChangeLog,v 1.4858 2008/03/07 07:35:26 djm Exp $ 3700$Id: ChangeLog,v 1.4859 2008/03/07 07:35:47 djm Exp $
diff --git a/version.h b/version.h
index 6fcd7e075..2db5f2a98 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.50 2007/08/15 08:16:49 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.51 2008/03/04 21:15:42 deraadt Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_4.7" 3#define SSH_VERSION "OpenSSH_4.8"
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