From 73c976878e56b13845f958d35fd254a0e670a6ba Mon Sep 17 00:00:00 2001
From: Balu Gajjala <bagajjal@microsoft.com>
Date: Tue, 15 Mar 2022 13:13:19 -0700
Subject: [PATCH] Crank V8.9

---
 contrib/win32/openssh/version.rc   | 8 ++++----
 contrib/win32/win32compat/signal.c | 1 -
 session.c                          | 2 +-
 sftp-client.c                      | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/win32/openssh/version.rc b/contrib/win32/openssh/version.rc
index 0c0a511ab..361ee79ec 100644
--- a/contrib/win32/openssh/version.rc
+++ b/contrib/win32/openssh/version.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,6,0,0
- PRODUCTVERSION 8,6,0,0
+ FILEVERSION 8,9,0,0
+ PRODUCTVERSION 8,9,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -67,9 +67,9 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "FileVersion", "8.6.0.0"
+            VALUE "FileVersion", "8.9.0.0"
             VALUE "ProductName", "OpenSSH for Windows"
-            VALUE "ProductVersion", "OpenSSH_8.6p1 for Windows"
+            VALUE "ProductVersion", "OpenSSH_8.9p1 for Windows"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/contrib/win32/win32compat/signal.c b/contrib/win32/win32compat/signal.c
index 7aa1546d3..046751b90 100644
--- a/contrib/win32/win32compat/signal.c
+++ b/contrib/win32/win32compat/signal.c
@@ -337,7 +337,6 @@ sigaction(int signum, const struct sigaction * act, struct sigaction * oldact)
 	}
 	
 	if (signum >= W32_SIGMAX) {
-		error_f("Invalid signum:%d", signum);
 		errno = EINVAL;
 		return r;
 	}
diff --git a/session.c b/session.c
index 3790f0486..ec5f9ed7e 100644
--- a/session.c
+++ b/session.c
@@ -1192,7 +1192,7 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
 
 	if (debug_flag) {
 		/* dump the environment */
-		fprintf(stderr, "Environment:");
+		fprintf(stderr, "Environment:\n");
 		for (i = 0; env[i]; i++)
 			fprintf(stderr, "  %.200s\n", env[i]);
 	}
diff --git a/sftp-client.c b/sftp-client.c
index 037e318bd..d622c8426 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -64,6 +64,7 @@
 #include "sftp.h"
 #include "sftp-common.h"
 #include "sftp-client.h"
+
 extern volatile sig_atomic_t interrupted;
 extern int showprogress;