| 1 | diff -u -r ../openssh-6.4p1/config.h.in ./config.h.in |
| 2 | --- ../openssh-6.4p1/config.h.in 2013-11-08 02:41:08.000000000 +0100 |
| 3 | +++ ./config.h.in 2014-02-03 04:32:13.000000000 +0100 |
| 4 | @@ -336,7 +336,7 @@ |
| 5 | #undef HAVE_DES_CRYPT |
| 6 | |
| 7 | /* Define if you have /dev/ptmx */ |
| 8 | -#undef HAVE_DEV_PTMX |
| 9 | +#define HAVE_DEV_PTMX 1 |
| 10 | |
| 11 | /* Define if you have /dev/ptc */ |
| 12 | #undef HAVE_DEV_PTS_AND_PTC |
| 13 | diff -u -r ../openssh-6.4p1/openbsd-compat/bsd-openpty.c ./openbsd-compat/bsd-openpty.c |
| 14 | --- ../openssh-6.4p1/openbsd-compat/bsd-openpty.c 2006-08-24 11:52:30.000000000 +0200 |
| 15 | +++ ./openbsd-compat/bsd-openpty.c 2014-02-03 04:33:42.000000000 +0100 |
| 16 | @@ -121,15 +121,17 @@ |
| 17 | return (-1); |
| 18 | } |
| 19 | |
| 20 | +# ifndef __ANDROID__ |
| 21 | /* |
| 22 | * Try to push the appropriate streams modules, as described |
| 23 | * in Solaris pts(7). |
| 24 | */ |
| 25 | ioctl(*aslave, I_PUSH, "ptem"); |
| 26 | ioctl(*aslave, I_PUSH, "ldterm"); |
| 27 | -# ifndef __hpux |
| 28 | +# ifndef __hpux |
| 29 | ioctl(*aslave, I_PUSH, "ttcompat"); |
| 30 | -# endif /* __hpux */ |
| 31 | +# endif /* __hpux */ |
| 32 | +# endif /* __ANDROID__ */ |
| 33 | |
| 34 | return (0); |
| 35 | |