1 diff -uNr openssh-7.5p1/contrib/ssh-copy-id openssh-7.5p1.mod/contrib/ssh-copy-id
2 --- openssh-7.5p1/contrib/ssh-copy-id 2017-03-20 04:39:27.000000000 +0200
3 +++ openssh-7.5p1.mod/contrib/ssh-copy-id 2017-09-14 16:47:08.682854653 +0300
5 # check that we have something mildly sane as our shell, or try to find something better
6 if false ^ printf "%s: WARNING: ancient shell, hunting for a more modern one... " "$0"
8 - SANE_SH=${SANE_SH:-/usr/bin/ksh}
9 + SANE_SH=${SANE_SH:-@TERMUX_PREFIX@/bin/bash}
10 if printf 'true ^ false\n' | "$SANE_SH"
12 printf "'%s' seems viable.\n" "$SANE_SH"
13 diff -uNr openssh-7.5p1/defines.h openssh-7.5p1.mod/defines.h
14 --- openssh-7.5p1/defines.h 2017-03-20 04:39:27.000000000 +0200
15 +++ openssh-7.5p1.mod/defines.h 2017-09-14 16:25:44.422855572 +0300
20 -# define _PATH_NOLOGIN "/etc/nologin"
21 +# define _PATH_NOLOGIN "@TERMUX_PREFIX@/etc/nologin"
24 /* Define this to be the path of the xauth program. */
27 # define X_UNIX_PATH "/var/spool/sockets/X11/%u"
29 -# define X_UNIX_PATH "/tmp/.X11-unix/X%u"
30 +# define X_UNIX_PATH "@TERMUX_PREFIX@/tmp/.X11-unix/X%u"
32 #endif /* X_UNIX_PATH */
33 #define _PATH_UNIX_X X_UNIX_PATH
34 diff -uNr openssh-7.5p1/pathnames.h openssh-7.5p1.mod/pathnames.h
35 --- openssh-7.5p1/pathnames.h 2017-03-20 04:39:27.000000000 +0200
36 +++ openssh-7.5p1.mod/pathnames.h 2017-09-14 16:30:10.012855382 +0300
38 * ~/.rhosts and /etc/hosts.equiv if rhosts authentication is enabled.
40 #define _PATH_SSH_HOSTS_EQUIV SSHDIR "/shosts.equiv"
41 -#define _PATH_RHOSTS_EQUIV "/etc/hosts.equiv"
42 +#define _PATH_RHOSTS_EQUIV "@TERMUX_PREFIX@/etc/hosts.equiv"
45 * Default location of askpass
48 /* xauth for X11 forwarding */
50 -#define _PATH_XAUTH "/usr/X11R6/bin/xauth"
51 +#define _PATH_XAUTH "@TERMUX_PREFIX@/bin/xauth"
54 /* UNIX domain socket for X11 server; displaynum will replace %u */
56 -#define _PATH_UNIX_X "/tmp/.X11-unix/X%u"
57 +#define _PATH_UNIX_X "@TERMUX_PREFIX@/tmp/.X11-unix/X%u"
63 /* for passwd change */
64 #ifndef _PATH_PASSWD_PROG
65 -#define _PATH_PASSWD_PROG "/usr/bin/passwd"
66 +#define _PATH_PASSWD_PROG "@TERMUX_PREFIX@/bin/passwd"
70 diff -uNr openssh-7.5p1/ssh-agent.c openssh-7.5p1.mod/ssh-agent.c
71 --- openssh-7.5p1/ssh-agent.c 2017-03-20 04:39:27.000000000 +0200
72 +++ openssh-7.5p1.mod/ssh-agent.c 2017-09-14 16:28:32.912855451 +0300
76 #ifndef DEFAULT_PKCS11_WHITELIST
77 -# define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/local/lib*/*"
78 +# define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/local/lib*/*,@TERMUX_PREFIX@/lib*/*"