[remmina-plugins] Fix nx plugin (#753792) Rebuild against libvncserver 0.9.8.2

[Christoph Wickert]

commit 2f5803623c09f689f77229435d8b4a7bc5c30d12
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Dec 31 12:07:52 2011 +0100

    Fix nx plugin (#753792)
    Rebuild against libvncserver 0.9.8.2

 ...ins-0.9.2-add-another-ssh_seet_fd_towrite.patch |   24 ++++++++++++++++++++
 ...lugins-0.9.2-fix-libssh-0.5-compatibility.patch |   24 ++++++++++++++++++++
 remmina-plugins.spec                               |   18 ++++++++++++++-
 3 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/remmina-plugins-0.9.2-add-another-ssh_seet_fd_towrite.patch b/remmina-plugins-0.9.2-add-another-ssh_seet_fd_towrite.patch
new file mode 100644
index 0000000..bc34327
--- /dev/null
+++ b/remmina-plugins-0.9.2-add-another-ssh_seet_fd_towrite.patch
@@ -0,0 +1,24 @@
+From 3f6c309ffabd09ad40c87c922944fe5ad0351a22 Mon Sep 17 00:00:00 2001
+From: Vic Lee <llyzs at 163.com>
+Date: Thu, 1 Sep 2011 15:23:12 +0800
+Subject: [PATCH] NX: add another ssh_seet_fd_towrite.
+
+---
+ remmina-plugins/nx/remminanxsession.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/remmina-plugins/nx/remminanxsession.c b/remmina-plugins/nx/remminanxsession.c
+index 2e57541..37b981d 100644
+--- a/remmina-plugins/nx/remminanxsession.c
++++ b/remmina-plugins/nx/remminanxsession.c
+@@ -840,6 +840,7 @@ remmina_nx_session_tunnel_main_thread (gpointer data)
+             {
+                 for (ptr = buffer, lenw = 0; len > 0; len -= lenw, ptr += lenw)
+                 {
++                    ssh_set_fd_towrite (nx->session);
+                     lenw = channel_write (channels[0], (char*) ptr, len);
+                     if (lenw <= 0)
+                     {
+-- 
+1.7.4.1
+
diff --git a/remmina-plugins-0.9.2-fix-libssh-0.5-compatibility.patch b/remmina-plugins-0.9.2-fix-libssh-0.5-compatibility.patch
new file mode 100644
index 0000000..78db9c0
--- /dev/null
+++ b/remmina-plugins-0.9.2-fix-libssh-0.5-compatibility.patch
@@ -0,0 +1,24 @@
+From 3a512f55481e3fa579f1556bbb2a6bf566f4f927 Mon Sep 17 00:00:00 2001
+From: Vic Lee <llyzs at 163.com>
+Date: Thu, 1 Sep 2011 15:14:03 +0800
+Subject: [PATCH] nx: fix libssh 0.5 compatibility.
+
+---
+ remmina-plugins/nx/remminanxsession.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/remmina-plugins/nx/remminanxsession.c b/remmina-plugins/nx/remminanxsession.c
+index c702be5..2e57541 100644
+--- a/remmina-plugins/nx/remminanxsession.c
++++ b/remmina-plugins/nx/remminanxsession.c
+@@ -516,6 +516,7 @@ remmina_nx_session_send_command (RemminaNXSession *nx, const gchar *cmdfmt, ...)
+     channel_write (nx->channel, cmd, strlen (cmd));
+     g_free (cmd);
+ 
++    ssh_set_fd_towrite (nx->session);
+     channel_write (nx->channel, "\n", 1);
+ }
+ 
+-- 
+1.7.4.1
+
diff --git a/remmina-plugins.spec b/remmina-plugins.spec
index ea998ba..2ecafff 100644
--- a/remmina-plugins.spec
+++ b/remmina-plugins.spec
@@ -2,14 +2,21 @@
 
 Name:           remmina-plugins
 Version:        0.9.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plugins for Remmina Remote Desktop Client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://remmina.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/remmina/%{name}-%{version}.tar.gz
+# from https://bugzilla.redhat.com/show_bug.cgi?id=656120
 Patch0:         remmina-plugins-0.9.2-32bpp.patch
+# taken from http://remmina.git.sourceforge.net/git/gitweb.cgi?p=remmina/remmina;a=commit;h=3a512f55
+# fixes https://bugzilla.redhat.com/show_bug.cgi?id=753792
+Patch1:         remmina-plugins-0.9.2-fix-libssh-0.5-compatibility.patch
+# Taken from http://remmina.git.sourceforge.net/git/gitweb.cgi?p=remmina/remmina;a=commit;h=3f6c309f
+# fixes https://bugzilla.redhat.com/show_bug.cgi?id=753792
+Patch2:         remmina-plugins-0.9.2-add-another-ssh_seet_fd_towrite.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool, 
@@ -125,6 +132,11 @@ client.
 %setup -q
 %patch0 -p1 -b .32bpp
 
+%if 0%{?fedora} >= 16
+%patch1 -p2 -b .fix-libssh-0.5-compatibility
+%patch2 -p2 -b .add-another-ssh_seet_fd_towrite
+%endif
+
 
 %build
 %configure --disable-static --enable-vnc=dl
@@ -180,6 +192,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 31 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-4
+- Fix nx plugin (#753792)
+- Rebuild against libvncserver 0.9.8.2
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.9.2-3
 - Rebuild for new libpng