From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- net-libs/libssh/files/libssh-0.5.0-tests.patch | 11 ++++++++ .../libssh-0.7.5-fix-config-buffer-underflow.patch | 25 +++++++++++++++++ .../files/libssh-0.7.5-fix-config-parsing.patch | 32 ++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 net-libs/libssh/files/libssh-0.5.0-tests.patch create mode 100644 net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch create mode 100644 net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch (limited to 'net-libs/libssh/files') diff --git a/net-libs/libssh/files/libssh-0.5.0-tests.patch b/net-libs/libssh/files/libssh-0.5.0-tests.patch new file mode 100644 index 000000000000..dde770ce5b2a --- /dev/null +++ b/net-libs/libssh/files/libssh-0.5.0-tests.patch @@ -0,0 +1,11 @@ +--- a/tests/unittests/torture_misc.c ++++ b/tests/unittests/torture_misc.c +@@ -195,7 +195,7 @@ + #ifdef _WIN32 + unit_test(torture_path_expand_tilde_win), + #else +- unit_test(torture_path_expand_tilde_unix), ++ //unit_test(torture_path_expand_tilde_unix), + #endif + unit_test_setup_teardown(torture_path_expand_escape, setup, teardown), + unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown), diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch b/net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch new file mode 100644 index 000000000000..7ff03263d198 --- /dev/null +++ b/net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch @@ -0,0 +1,25 @@ +From 0cffb88b80b1e8b7e292646b955e9b9ca02315c4 Mon Sep 17 00:00:00 2001 +From: Aris Adamantiadis +Date: Thu, 8 Jun 2017 00:22:02 +0200 +Subject: config: fix buffer underflow with unrecognized opcodes + +--- + src/config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/config.c b/src/config.c +index 519926e7..6187c90f 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -218,7 +218,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line, + } + + opcode = ssh_config_get_opcode(keyword); +- if (*parsing == 1 && opcode != SOC_HOST) { ++ if (*parsing == 1 && opcode != SOC_HOST && opcode != SOC_UNSUPPORTED) { + if (seen[opcode] != 0) { + return 0; + } +-- +cgit v1.1 + diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch b/net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch new file mode 100644 index 000000000000..3596cf02105d --- /dev/null +++ b/net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch @@ -0,0 +1,32 @@ +From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" +Date: Sun, 4 Jun 2017 11:54:55 +0300 +Subject: config: Bugfix: Don't skip unseen opcodes + +libssh fails to read the configuration from a config file due to a +wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's +effectively skipping every opcode (and therefore every option) from +the file. The change fixes that behaviour. + +Signed-off-by: Artyom V. Poptsov +Reviewed-by: Andreas Schneider +--- + src/config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/config.c b/src/config.c +index 6478fc5f..519926e7 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line, + + opcode = ssh_config_get_opcode(keyword); + if (*parsing == 1 && opcode != SOC_HOST) { +- if (seen[opcode] == 0) { ++ if (seen[opcode] != 0) { + return 0; + } + seen[opcode] = 1; +-- +cgit v1.1 + -- cgit v1.2.3