- (djm) Pick up new version (2.2.0) from OpenBSD CVS

diff --git a/ChangeLog b/ChangeLog
index b23ff702a9e21f3cedae9c8361249f0cd37d4821..902e9ee5f8cf0f3c3b216b1274a3d7d3f0d049d0 100644 (file)
--- 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 d95ea4e49e131e3a42c43bc0cf05ba69a7fa3839..4824ada63e3ba523356f982e87d3e79e4c5729c6 100644 (file)
--- 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 6b17a676c2c7a0ed063d7b62bafc54e9d95ce208..9fb86ab7c92851b173d4bfcbc7b05c226c7f2cc4 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define SSH_VERSION    "OpenSSH_2.1.1p5"
+#define SSH_VERSION    "OpenSSH_2.2.0p1"