diff --git a/community/mysql-workbench/0004-libssh-fix-read-config.patch b/community/mysql-workbench/0004-libssh-fix-read-config.patch new file mode 100644 index 000000000..b6fec1195 --- /dev/null +++ b/community/mysql-workbench/0004-libssh-fix-read-config.patch @@ -0,0 +1,29 @@ +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; diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index d03130840..f29abe420 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -14,7 +14,7 @@ buildarch=28 pkgname=mysql-workbench pkgver=8.0.12 -pkgrel=1 +pkgrel=2 _mysql_version=8.0.12 _connector_version=8.0.12 _gdal_version=2.3.1 @@ -25,12 +25,11 @@ arch=('x86_64') url='https://www.mysql.com/products/workbench/' license=('GPL2') depends=('cairo' 'ctemplate' 'desktop-file-utils' 'freetype2' 'gtkmm3' - 'hicolor-icon-theme' 'libgl' 'libgnome-keyring' 'libiodbc' 'libxml2' + 'hicolor-icon-theme' 'libgl' 'libsecret' 'libiodbc' 'libxml2' 'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo' 'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++' 'proj' 'json-c' 'antlr4-runtime') -optdepends=('gnome-keyring: store SSH/MySQL passwords in GNOME password manager' - 'python2-pyodbc: database migration') +optdepends=('python2-pyodbc: database migration') makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick' 'antlr4') validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5' # MySQL Release Engineering '8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider (for libssh) @@ -40,10 +39,10 @@ source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community "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' '0004-fix-build-for-i686.patch' 'atomic.patch' 'arch_linux_profile.xml') @@ -69,7 +68,7 @@ prepare() { 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