pool/libssh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating link to change in openSUSE:Factory/libssh revision 46.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libssh?expand=0&rev=4a566d7154a80f2dd805e46876147468
This commit is contained in:
OBS User buildservice-autocommit 2018-01-01 21:09:11 +00:00 committed by Git OBS Bridge
parent df995a003d
commit ff8b37ee68
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-config-Bugfix-Dont-skip-unseen-opcodes.patch Normal file
View File

@ -0,0 +1,32 @@
From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
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 <poptsov.artyom@gmail.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
---
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

6
libssh.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Dec 24 14:41:46 UTC 2017 - fabian@ritter-vogt.de
- Add patch to fix parsing of config files (boo#1067782):
* 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch
-------------------------------------------------------------------
Fri Sep 15 08:31:32 UTC 2017 - vcizek@suse.com

3
libssh.spec
View File

@ -38,6 +38,8 @@ Patch5: 0001-pki_crypto-Use-getters-and-setters-for-opaque-keys-a.patch
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 @@ Documentation for libssh development.
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch10 -p1
%build
%cmake \