Call for testing: OpenSSH 6.1

Corinna Vinschen vinschen at redhat.com
Tue Aug 28 18:51:33 EST 2012


Hi Damien,

On Aug 21 21:10, Damien Miller wrote:
> Hi,
> 
> OpenSSH 6.1 is almost ready for release, so we would appreciate testing
> on as many platforms and systems as possible. This release contains a
> couple of new features and bug fixes.

Builds fine on Cygwin, all tests pass.

However, we're just about to change the w32api headers from the
Mingw.org based ones to the Mingw-w64 based ones.  With the new set of
Windows headers, there's a collision with definitions from the
wincrypt.h header.  It would be nice if we could get rid of the problem
even before the new headers are available.  The patch is simple:

Index: openbsd-compat/bsd-cygwin_util.h
===================================================================
RCS file: /cvs/openssh/openbsd-compat/bsd-cygwin_util.h,v
retrieving revision 1.14
diff -u -p -r1.14 bsd-cygwin_util.h
--- openbsd-compat/bsd-cygwin_util.h	30 Mar 2012 03:07:07 -0000	1.14
+++ openbsd-compat/bsd-cygwin_util.h	28 Aug 2012 08:38:35 -0000
@@ -36,6 +36,8 @@
 
 #undef ERROR
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <windows.h>
 #include <sys/cygwin.h>
 #include <io.h>

This is also compatible with the older Mingw.org header files.  Is it
still ok to put this into 6.1?


Thanks,
Corinna

-- 
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat


More information about the openssh-unix-dev mailing list