libssh: patch ssh_channel_poll_timeout for compatibility with libnetconf2

Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>

diff --git a/libs/libssh/Makefile b/libs/libssh/Makefile
index 89890e4a040a9094c0ea4ee2b161af84f747249a..ae20994309478cc76476d6e5e8a2cd53d0e48d95 100644 (file)
--- a/libs/libssh/Makefile
+++ b/libs/libssh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libssh
 PKG_VERSION:=0.9.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.libssh.org/files/0.9/

diff --git a/libs/libssh/patches/0004-channels-Avoid-returning-SSH_AGAIN-from-ssh_channel_.patch b/libs/libssh/patches/0004-channels-Avoid-returning-SSH_AGAIN-from-ssh_channel_.patch
new file mode 100644 (file)
index 0000000..8dd50ba
--- /dev/null
+++ b/libs/libssh/patches/0004-channels-Avoid-returning-SSH_AGAIN-from-ssh_channel_.patch
@@ -0,0 +1,41 @@
+From 6417f5a3cac8537ac6f6ff7fc1642dfaa0917fb4 Mon Sep 17 00:00:00 2001
+From: Jakub Jelen <jjelen@redhat.com>
+Date: Thu, 16 Apr 2020 11:13:34 +0200
+Subject: [PATCH] channels: Avoid returning SSH_AGAIN from
+ ssh_channel_poll_timeout()
+
+This addresses a regression introduced in 3bad0607, partially fixed in 022409e9,
+but the function was still able to return SSH_AGAIN, which was not expected by
+callers.
+
+Based on discussion in [1] and [2]
+
+[1] https://gitlab.com/libssh/libssh-mirror/-/merge_requests/101
+[2] https://www.libssh.org/archive/libssh/2020-03/0000029.html
+
+Signed-off-by: Jakub Jelen <jjelen@redhat.com>
+Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
+---
+ src/channels.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/channels.c b/src/channels.c
+index bcc1c207..9fe309d0 100644
+--- a/src/channels.c
++++ b/src/channels.c
+@@ -3116,6 +3116,12 @@ int ssh_channel_poll_timeout(ssh_channel channel, int timeout, int is_stderr)
+         session->session_state == SSH_SESSION_STATE_ERROR) {
+         rc = SSH_ERROR;
+         goto out;
++    } else if (rc == SSH_AGAIN) {
++        /* If the above timeout expired, it is ok and we do not need to
++         * attempt to check the read buffer. The calling functions do not
++         * expect us to return SSH_AGAIN either here. */
++        rc = SSH_OK;
++        goto out;
+     }
+     len = ssh_buffer_get_len(stdbuf);
+     if (len > 0) {
+-- 
+2.26.2
+