Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ab28e40607cc490ea6781f528f9e24819e84aae
commit 3ab28e40607cc490ea6781f528f9e24819e84aae Author: crazy <[email protected]> Date: Sat Nov 25 22:25:06 2017 +0100 libssh-0.7.5-2-x86_64 * added fix for bug #260 diff --git a/source/lib/libssh/FrugalBuild b/source/lib/libssh/FrugalBuild index 9deba33..e21f451 100644 --- a/source/lib/libssh/FrugalBuild +++ b/source/lib/libssh/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libssh pkgver=0.7.5 -pkgrel=1 +pkgrel=2 pkgdesc="The SSH library" url="http://www.libssh.org/"; depends=('openssl>=1.0.2-8' 'zlib>=1.2.8-8' 'libgcrypt>=1.7.3-2') @@ -12,8 +12,9 @@ groups=('lib') archs=("x86_64") up2date="Flasttar https://red.libssh.org/projects/libssh/files"; #up2date="lynx -dump http://www.libssh.org/ | grep -a -m1 '^\[.*]' | sed 's/.*h \(.*\) (.*/\1/'" -source=(http://git.libssh.org/projects/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('b9f587a4d2309a73ecca363a797a60b84eb8b537') +source=(http://git.libssh.org/projects/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2 bug-260.patch) +sha1sums=('b9f587a4d2309a73ecca363a797a60b84eb8b537' \ + '8d3067031b6d12880b12fff87922d8d6db1edd43') _F_cmake_confopts="-DWITH_SSH1=ON -DWITH_GCRYPT=ON -DWITH_INTERNAL_DOC=ON" Finclude cmake diff --git a/source/lib/libssh/bug-260.patch b/source/lib/libssh/bug-260.patch new file mode 100644 index 0000000..3596cf0 --- /dev/null +++ b/source/lib/libssh/bug-260.patch @@ -0,0 +1,32 @@ +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 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
