Hello community, here is the log from the commit of package libssh for openSUSE:Factory checked in at 2018-01-01 22:09:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libssh (Old) and /work/SRC/openSUSE:Factory/.libssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libssh" Mon Jan 1 22:09:11 2018 rev:46 rq:560272 version:0.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/libssh/libssh.changes 2017-10-02 16:50:56.681837014 +0200 +++ /work/SRC/openSUSE:Factory/.libssh.new/libssh.changes 2018-01-01 22:09:13.800836532 +0100 @@ -1,0 +2,6 @@ +Sun Dec 24 14:41:46 UTC 2017 - [email protected] + +- Add patch to fix parsing of config files (boo#1067782): + * 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch + +------------------------------------------------------------------- New: ---- 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libssh.spec ++++++ --- /var/tmp/diff_new_pack.3rV0Ex/_old 2018-01-01 22:09:19.514928836 +0100 +++ /var/tmp/diff_new_pack.3rV0Ex/_new 2018-01-01 22:09:19.518927501 +0100 @@ -38,6 +38,8 @@ Patch6: 0001-threads-Use-new-API-call-for-OpenSSL-CRYPTO-THREADID.patch Patch7: 0001-cmake-Use-configure-check-for-CRYPTO_ctr128_encrypt.patch # END of OpenSSL 1.1 support patches +# PATCH-FIX-UPSTREAM Fix parsing of config files (boo#1067782) +Patch10: 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ @@ -98,6 +100,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch10 -p1 %build %cmake \ ++++++ 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch ++++++ >From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" <[email protected]> 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 <[email protected]> Reviewed-by: Andreas Schneider <[email protected]> --- 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
