upstream commit

split client/server kex; only ssh-keygen needs
uuencode.o; only scp/sftp use progressmeter.o; ok djm@

OpenBSD-Commit-ID: f2c9feb26963615c4fece921906cf72e248b61ee
diff --git a/.skipped-commit-ids b/.skipped-commit-ids
index a73c3bf..836511b 100644
--- a/.skipped-commit-ids
+++ b/.skipped-commit-ids
@@ -1,5 +1,6 @@
 5317f294d63a876bfc861e19773b1575f96f027d	remove libssh from makefiles
 a337e886a49f96701ccbc4832bed086a68abfa85	Makefile changes
+f2c9feb26963615c4fece921906cf72e248b61ee	more Makefile
 
 Old upstream tree: