summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-08-31 11:13:10 +1100
committerDamien Miller <djm@mindrot.org>2000-08-31 11:13:10 +1100
commitb5c42d98b308d2c0c8590f23bb903159299ce262 (patch)
tree43e948929e59999770f3b2ff98649f8e4255c95a
parent238a9fa8d04dca849201b8f664cb447f2f841c5d (diff)
- (djm) Pick up new version (2.2.0) from OpenBSD CVS
-rw-r--r--ChangeLog1
-rw-r--r--INSTALL2
-rw-r--r--version.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b23ff702..902e9ee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
20000831
- (djm) Workaround SIGPIPE problems on SCO. Fix from Aran Cox
<acox@cv.telegroup.com>
+ - (djm) Pick up new version (2.2.0) from OpenBSD CVS
20000830
- (djm) Compile warning fixes from Mark Miller <markm@swoon.net>
diff --git a/INSTALL b/INSTALL
index d95ea4e4..4824ada6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -156,7 +156,7 @@ If you need to pass special options to the compiler or linker, you
can specify these as environment variables before running ./configure.
For example:
-CFLAGS="-O -m486" LFLAGS="-s" LIBS="-lrubbish" LD="/usr/foo/ld" ./configure
+CFLAGS="-O -m486" LDFLAGS="-s" LIBS="-lrubbish" LD="/usr/foo/ld" ./configure
3. Configuration
----------------
diff --git a/version.h b/version.h
index 6b17a676..9fb86ab7 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define SSH_VERSION "OpenSSH_2.1.1p5"
+#define SSH_VERSION "OpenSSH_2.2.0p1"