From 9e0ce57f43d6d1dbfd54212a531fa37c033d6a1b Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jples...@redhat.com>
Date: Mon, 12 Oct 2015 09:20:04 +0200
Subject: 0.56 bump

---
 .gitignore         | 1 +
 perl-Net-SSH2.spec | 5 ++++-
 sources            | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3a2877..58fa97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ Net-SSH2-0.28.tar.gz
 /Net-SSH2-0.52.tar.gz
 /Net-SSH2-0.53.tar.gz
 /Net-SSH2-0.55.tar.gz
+/Net-SSH2-0.56.tar.gz
diff --git a/perl-Net-SSH2.spec b/perl-Net-SSH2.spec
index 728a416..a426f6b 100644
--- a/perl-Net-SSH2.spec
+++ b/perl-Net-SSH2.spec
@@ -1,5 +1,5 @@
 Name:           perl-Net-SSH2
-Version:        0.55
+Version:        0.56
 Release:        1%{?dist}
 Summary:        Support for the SSH 2 protocol via libSSH2
 License:        GPL+ or Artistic
@@ -82,6 +82,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 12 2015 Jitka Plesnikova <jples...@redhat.com> - 0.56-1
+- 0.56 bump
+
 * Tue Sep 29 2015 Petr Šabata <con...@redhat.com> - 0.55-1
 - 0.55 bump
 - Source URL updated
diff --git a/sources b/sources
index b90f80e..869aa85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca80c31a1f8b7fc33d846fc2ca5ecc22  Net-SSH2-0.55.tar.gz
+f0bc18b49ee9fe07273c639dd135a67f  Net-SSH2-0.56.tar.gz
-- 
cgit v0.11.2


From a18381c9ed9e3fa0447ce4049b0eff8ff6f0a516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <con...@redhat.com>
Date: Mon, 7 Dec 2015 17:46:22 +0100
Subject: Work around a libssh2 agent bug (#1288774)

---
 ...workaround-bug-on-libssh2_agent_disconnec.patch | 35 ++++++++++++++++++++++
 perl-Net-SSH2.spec                                 |  8 ++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 
Net-SSH2-auth_agent-workaround-bug-on-libssh2_agent_disconnec.patch

diff --git 
a/Net-SSH2-auth_agent-workaround-bug-on-libssh2_agent_disconnec.patch 
b/Net-SSH2-auth_agent-workaround-bug-on-libssh2_agent_disconnec.patch
new file mode 100644
index 0000000..09ac354
--- /dev/null
+++ b/Net-SSH2-auth_agent-workaround-bug-on-libssh2_agent_disconnec.patch
@@ -0,0 +1,35 @@
+From 54ae30a67b59cc6d411b7026897e58300a4b030d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Salvador=20Fandi=C3=B1o?= <sfand...@yahoo.com>
+Date: Sat, 5 Dec 2015 21:35:27 +0100
+Subject: [PATCH 1/6] auth_agent: workaround bug on libssh2_agent_disconnect
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libssh2_agent_disconnect was being called twice, once directly and
+other under the hood by libssh2_agent_free. Unfortunatelly, due to a
+bug (reported!) on libssh2, that resulted in trying to close an
+already closed file descriptor.
+
+This patch removes the useless explicit call.
+
+Signed-off-by: Petr Šabata <con...@redhat.com>
+---
+ SSH2.xs | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/SSH2.xs b/SSH2.xs
+index 2fc0ea2..28dab4a 100644
+--- a/SSH2.xs
++++ b/SSH2.xs
+@@ -1212,7 +1212,6 @@ CODE:
+                     }
+                 }
+             }
+-            libssh2_agent_disconnect(agent);
+         }
+         libssh2_agent_free(agent);
+     }
+-- 
+2.5.0
+
diff --git a/perl-Net-SSH2.spec b/perl-Net-SSH2.spec
index a426f6b..0f0b6cc 100644
--- a/perl-Net-SSH2.spec
+++ b/perl-Net-SSH2.spec
@@ -1,11 +1,13 @@
 Name:           perl-Net-SSH2
 Version:        0.56
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Support for the SSH 2 protocol via libSSH2
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Net-SSH2/
 Source0:        
http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Net-SSH2-%{version}.tar.gz
+# gh@28, rhbz#1288774
+Patch0:         
Net-SSH2-auth_agent-workaround-bug-on-libssh2_agent_disconnec.patch
 # Build
 BuildRequires:  findutils
 BuildRequires:  libgcrypt-devel
@@ -60,6 +62,7 @@ all of the key exchanges, ciphers, and compression of libssh2.
 %prep
 %setup -q -n Net-SSH2-%{version}
 perl -pi -e 's|^#!perl|#!%{__perl}|' example/*
+%patch0 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1
@@ -82,6 +85,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 07 2015 Petr Šabata <con...@redhat.com> - 0.56-2
+- Work around a libssh2 agent bug (#1288774)
+
 * Mon Oct 12 2015 Jitka Plesnikova <jples...@redhat.com> - 0.56-1
 - 0.56 bump
 
-- 
cgit v0.11.2


        
http://pkgs.fedoraproject.org/cgit/perl-Net-SSH2.git/commit/?h=f23&id=ec51b278bdcbada95abc9c1d70e7d6f2c2b01731
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org

Reply via email to