Date: Monday, August 6, 2018 @ 21:47:55 Author: eworm Revision: 369940
fix libssh patch Added: mysql-workbench/trunk/0004-libssh-fix-read-config.patch Modified: mysql-workbench/trunk/PKGBUILD -----------------------------------+ 0004-libssh-fix-read-config.patch | 29 +++++++++++++++++++++++++++++ PKGBUILD | 6 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) Added: 0004-libssh-fix-read-config.patch =================================================================== --- 0004-libssh-fix-read-config.patch (rev 0) +++ 0004-libssh-fix-read-config.patch 2018-08-06 21:47:55 UTC (rev 369940) @@ -0,0 +1,29 @@ +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; Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-06 21:45:51 UTC (rev 369939) +++ PKGBUILD 2018-08-06 21:47:55 UTC (rev 369940) @@ -32,10 +32,10 @@ "http://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz"; "https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2"; "https://www.libssh.org/files/${_libssh_version%.*}/libssh-${_libssh_version}.tar."{xz,asc} - 'libssh-fix-read-config.patch::https://git.libssh.org/projects/libssh.git/patch/?id=5333be59' '0001-mysql-workbench-no-check-for-updates.patch' '0002-disable-unsupported-operating-system-warning.patch' '0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch' + '0004-libssh-fix-read-config.patch' 'arch_linux_profile.xml') sha256sums=('0241586c95026a7d4d1b552ba2e33d8e66f6826e8f7e1a692b78c405f80cd334' 'SKIP' @@ -47,10 +47,10 @@ '2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba' '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095' 'SKIP' - 'c39bed86f34a377015fb6d6552700a3838c5cae1a4a83b3e859539785aeabdba' 'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f' '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18' 'f15d8c8b3cc74d2d0b792316834648620fc2299ce103c6419f4c562f759ad755' + 'fe877d6be0b6e97361d8d841b3cbf9dc36b34d3ba92d5ba50af0f23487ac786a' '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af') prepare() { @@ -57,7 +57,7 @@ cd "${srcdir}/libssh-${_libssh_version}" # from libssh package - patch -Np1 < "${srcdir}"/libssh-fix-read-config.patch + patch -Np1 < "${srcdir}"/0004-libssh-fix-read-config.patch # required for mysql-workbench # TODO: drop bundled libssh when this is merged upstream and hits our package patch -Np1 < "${srcdir}"/0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
