Date: Friday, August 17, 2018 @ 19:38:25
Author: eworm
Revision: 372543
upgpkg: mysql-workbench 8.0.12-4
use system libssh
Modified:
mysql-workbench/trunk/PKGBUILD
Deleted:
mysql-workbench/trunk/0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
mysql-workbench/trunk/0004-libssh-fix-read-config.patch
+
0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch | 146
--
0004-libssh-fix-read-config.patch | 29 -
PKGBUILD | 53 ---
3 files changed, 11 insertions(+), 217 deletions(-)
Deleted: 0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
===
--- 0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
2018-08-17 19:37:55 UTC (rev 372542)
+++ 0003-Fix-segfault-in-getIssueBanner-add-missing-wrappers.patch
2018-08-17 19:38:25 UTC (rev 372543)
@@ -1,146 +0,0 @@
-From 5ea81166bf885d0fd5d4bb232fc22633f5aaf3c4 Mon Sep 17 00:00:00 2001
-From: Marcin Szalowicz
-Date: Mon, 11 Jun 2018 11:25:43 +0200
-Subject: include: Fix segfault in getIssueBanner, add missing wrappers in
- libsshpp
-
-Also make some private properties protected
-
-Signed-off-by: Marcin Szalowicz
- include/libssh/libsshpp.hpp | 73 ++---
- 1 file changed, 62 insertions(+), 11 deletions(-)
-
-diff --git a/include/libssh/libsshpp.hpp b/include/libssh/libsshpp.hpp
-index 1ce72948..c324cead 100644
a/include/libssh/libsshpp.hpp
-+++ b/include/libssh/libsshpp.hpp
-@@ -194,6 +194,43 @@ public:
- ssh_throw(ret);
- return ret;
- }
-+
-+ /** @brief Authenticate through the "keyboard-interactive" method.
-+ * @param[in] The username to authenticate. You can specify NULL if
ssh_option_set_username() has been used. You cannot try two different logins in
a row.
-+ * @param[in] Undocumented. Set it to NULL.
-+ * @throws SshException on error
-+ * @returns SSH_AUTH_SUCCESS, SSH_AUTH_PARTIAL, SSH_AUTH_DENIED,
SSH_AUTH_ERROR, SSH_AUTH_INFO, SSH_AUTH_AGAIN
-+ * @see ssh_userauth_kbdint
-+ */
-+ int userauthKbdint(const char* username, const char* submethods){
-+int ret=ssh_userauth_kbdint(c_session,NULL,NULL);
-+ssh_throw(ret);
-+return ret;
-+ }
-+
-+ /** @brief Get the number of prompts (questions) the server has given.
-+ * @returns The number of prompts.
-+ * @see ssh_userauth_kbdint_getnprompts
-+ */
-+ int userauthKbdintGetNPrompts(){
-+return ssh_userauth_kbdint_getnprompts(c_session);
-+ }
-+
-+ /** @brief Set the answer for a question from a message block..
-+ * @param[in] index The number of the ith prompt.
-+ * @param[in] The answer to give to the server. The answer MUST be encoded
UTF-8. It is up to the server how to interpret the value and validate it.
However, if you read the answer in some other encoding, you MUST convert it to
UTF-8.
-+ * @throws SshException on error
-+ * @returns 0 on success, < 0 on error
-+ * @see ssh_userauth_kbdint_setanswer
-+ */
-+ int userauthKbdintSetAnswer(unsigned int i, const char* answer){
-+int ret=ssh_userauth_kbdint_setanswer(c_session, i, answer);
-+ssh_throw(ret);
-+return ret;
-+ }
-+
-+
-+
- /** @brief Authenticates using the password method.
-* @param[in] password password to use for authentication
-* @throws SshException on error
-@@ -228,8 +265,7 @@ public:
- ssh_throw(ret);
- return ret;
- }
-- int userauthPrivatekeyFile(const char *filename,
-- const char *passphrase);
-+
- /** @brief Returns the available authentication methods from the server
-* @throws SshException on error
-* @returns Bitfield of available methods.
-@@ -281,8 +317,12 @@ public:
-*/
- std::string getIssueBanner(){
- char *banner=ssh_get_issue_banner(c_session);
--std::string ret= std::string(banner);
--::free(banner);
-+std::string ret;
-+if (banner)
-+{
-+ ret= std::string(banner);
-+ ::free(banner);
-+}
- return ret;
- }
- /** @brief returns the OpenSSH version (server) if possible
-@@ -378,11 +418,14 @@ public:
- return_throwable;
- }
-
--private:
-- ssh_session c_session;
- ssh_session getCSession(){
- return c_session;
- }
-+
-+protected:
-+ ssh_session c_session;
-+
-+private:
- /* No copy constructor, no = operator */
- Session(const Session &);
- Session& operator=(const Session &);
-@@ -481,12 +524,12 @@ public:
- ssh_throw(err);
- return err;
- }
-- int read(void *dest, size_t count, bool is_stderr){
-+ int read(void *dest, size_t count){
- int err;
- /* handle int overflow */
- if(count > 0x7fff)
- count = 0x7fff;
--err=ssh_channel_read_timeout(channel,dest,count,is_stderr,-1);
-+err=ssh_channel_read_timeout(channel,dest,count,false,-1);
-
