Index: distinfo
===================================================================
--- distinfo	(revision 37)
+++ distinfo	(working copy)
@@ -7,7 +7,7 @@
 RMD160 (openssh-4.7.1-20070919/openssh-4.7p1.tar.gz) = b828e79d3d1a931cb77651ec7d7276cf3ba22d90
 Size (openssh-4.7.1-20070919/openssh-4.7p1.tar.gz) = 991119 bytes
 SHA1 (patch-aa) = 8b7a16e9a63cfff3b73d70b9cebb6627b96396e0
-SHA1 (patch-ab) = a105c238c8dc774ed6992791b131da56824869e9
+SHA1 (patch-ab) = 2f65494a88ac147fa59570a7ace4b16e260a21ca
 SHA1 (patch-ac) = dfb054ef02fbb5d206f6adaf82944f16da20eaf9
 SHA1 (patch-ad) = 7921e029b56c0e4769a7ada03dff3eb2e275db7d
 SHA1 (patch-ae) = 9585221f9e49b4ebea31c374066d70e11aa804a1
@@ -29,3 +29,7 @@
 SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f
 SHA1 (patch-av) = 00f54c3fae7318b278b16bd0b01881a90bd31365
 SHA1 (patch-aw) = 2a88b7563c6f52163c6c5f716e437ecaea613a30
+SHA1 (patch-ax) = 088419be2e6837f2247df0d0b2d5e4dc32cab1e1
+SHA1 (patch-ay) = ba6930a37529793a73dfdda2c5bcf7e2cfdd1712
+SHA1 (patch-az) = 6ba5a30be7ce134bed9bfed1d618cb6b2b8f6bf1
+SHA1 (patch-ba) = 9350342bd576d022ba229ab03f5955775b3de862
Index: patches/patch-ba
===================================================================
--- patches/patch-ba	(revision 0)
+++ patches/patch-ba	(revision 0)
@@ -0,0 +1,16 @@
+$NetBSD$
+
+On QNX the function poll() is defined in sys/poll.h and must therefore be included.
+
+--- atomicio.c.orig	2007-06-25 14:15:12.000000000 +0200
++++ atomicio.c
+@@ -35,6 +35,9 @@
+ #ifdef HAVE_POLL_H
+ #include <poll.h>
+ #endif
++#ifdef HAVE_SYS_POLL_H
++#include <sys/poll.h>
++#endif
+ #include <string.h>
+ #include <unistd.h>
+ 
Index: patches/patch-ab
===================================================================
--- patches/patch-ab	(revision 37)
+++ patches/patch-ab	(working copy)
@@ -25,7 +25,7 @@
  	esac
  	;;
 +*-*-interix3*)
-+        AC_DEFINE(HAVE_INTERIX)
++        AC_DEFINE(HAVE_INTERIX, 1, [Define if you are on Windows POSIX compatibility])
 +        AC_DEFINE(DISABLE_FD_PASSING)
 +        AC_DEFINE(DISABLE_SHADOW)
 +        AC_DEFINE(IP_TOS_IS_BROKEN)
Index: patches/patch-ax
===================================================================
--- patches/patch-ax	(revision 0)
+++ patches/patch-ax	(revision 0)
@@ -0,0 +1,14 @@
+$NetBSD$
+
+On QNX the function poll() is defined in sys/poll.h and must therefore be included.
+
+--- configure.orig	2007-08-10 06:36:12.000000000 +0200
++++ configure
+@@ -5654,6 +5658,7 @@ for ac_header in \
+	sys/dir.h \
+	sys/mman.h \
+	sys/ndir.h \
++	sys/poll.h \
+	sys/prctl.h \
+	sys/pstat.h \
+	sys/select.h \
Index: patches/patch-ay
===================================================================
--- patches/patch-ay	(revision 0)
+++ patches/patch-ay	(revision 0)
@@ -0,0 +1,14 @@
+$NetBSD$
+
+On QNX the function poll() is defined in sys/poll.h and must therefore be included.
+
+--- configure.ac.orig	2007-08-10 06:36:12.000000000 +0200
++++ configure.ac
+@@ -223,6 +227,7 @@ AC_CHECK_HEADERS( \
+ 	sys/dir.h \
+ 	sys/mman.h \
+ 	sys/ndir.h \
++	sys/poll.h \
+ 	sys/prctl.h \
+ 	sys/pstat.h \
+ 	sys/select.h \
Index: patches/patch-az
===================================================================
--- patches/patch-az	(revision 0)
+++ patches/patch-az	(revision 0)
@@ -0,0 +1,16 @@
+$NetBSD$
+
+On QNX the function poll() is defined in sys/poll.h and must therefore be included.
+
+--- config.h.in.orig	2007-09-04 08:50:04.000000000 +0200
++++ config.h.in
+@@ -636,6 +642,9 @@
+ /* Define to 1 if you have the <poll.h> header file. */
+ #undef HAVE_POLL_H
+ 
++/* Define to 1 if you have the <sys/poll.h> header file. */
++#undef HAVE_SYS_POLL_H
++
+ /* Define to 1 if you have the `prctl' function. */
+ #undef HAVE_PRCTL
+