diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 19:20:44 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 19:20:44 +0000 |
| commit | 7cec36c2876610cbfb5a8238b107ed0de479f978 (patch) | |
| tree | b237d6222e5beb8049ffd77850037281edbde353 /system/libssh2/test-sshd.patch | |
| parent | 551b3650fcb5c065ca18f99fe8f2318ecad0209c (diff) | |
| parent | 48545ebadf2369ca84622698234df68b8b36dba6 (diff) | |
| download | packages-7cec36c2876610cbfb5a8238b107ed0de479f978.tar.gz packages-7cec36c2876610cbfb5a8238b107ed0de479f978.tar.bz2 packages-7cec36c2876610cbfb5a8238b107ed0de479f978.tar.xz packages-7cec36c2876610cbfb5a8238b107ed0de479f978.zip | |
Merge branch 'auto-system' into 'master'
Fixes for auto-building system/, part one
See merge request adelie/packages!339
Diffstat (limited to 'system/libssh2/test-sshd.patch')
| -rw-r--r-- | system/libssh2/test-sshd.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/system/libssh2/test-sshd.patch b/system/libssh2/test-sshd.patch new file mode 100644 index 000000000..6cc6d711e --- /dev/null +++ b/system/libssh2/test-sshd.patch @@ -0,0 +1,33 @@ +--- libssh2-1.9.0/tests/ssh2.sh 2010-10-25 17:15:14.000000000 -0500 ++++ libssh2-1.9.0/tests/ssh2.sh 2019-09-11 18:52:25.932354801 -0500 +@@ -28,6 +28,7 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host + -o 'UsePrivilegeSeparation no' \ + -o 'StrictModes no' \ + -D \ ++ -e \ + $libssh2_sshd_params & + sshdpid=$! + +--- libssh2-1.9.0/tests/ssh2.c 2019-03-26 08:08:54.000000000 -0500 ++++ libssh2-1.9.0/tests/ssh2.c 2019-09-11 19:38:03.782403778 -0500 +@@ -143,20 +143,6 @@ int main(int argc, char *argv[]) + */ + libssh2_channel_setenv(channel, "FOO", "bar"); + +- /* Request a terminal with 'vanilla' terminal emulation +- * See /etc/termcap for more options +- */ +- if(libssh2_channel_request_pty(channel, "vanilla")) { +- fprintf(stderr, "Failed requesting pty\n"); +- goto skip_shell; +- } +- +- /* Open a SHELL on that pty */ +- if(libssh2_channel_shell(channel)) { +- fprintf(stderr, "Unable to request shell on allocated pty\n"); +- goto shutdown; +- } +- + ec = 0; + + skip_shell: |