[libssh2] Update to 1.4.0

[Paul Howarth]

commit d2c802f8e0119c41caf37c974c2dc299af83864d
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Feb 1 11:06:03 2012 +0000

    Update to 1.4.0
    
    - Update to 1.4.0
      - Added libssh2_session_supported_algs()
      - Added libssh2_session_banner_get()
      - Added libssh2_sftp_get_channel()
      - libssh2.h: bump the default window size to 256K
      - sftp-seek: clear EOF flag
      - userauth: provide more informations if ssh pub key extraction fails
      - ssh2_exec: skip error outputs for EAGAIN
      - LIBSSH2_SFTP_PACKET_MAXLEN: increase to 80000
      - knownhost_check(): don't dereference ext if NULL is passed
      - knownhost_add: avoid dereferencing uninitialized memory on error path
      - OpenSSL EVP: fix threaded use of structs
      - _libssh2_channel_read: react on errors from receive_window_adjust
      - sftp_read: cap the read ahead maximum amount
      - _libssh2_channel_read: fix non-blocking window adjusting
    - Add upstream patch fixing undefined function reference in libgcrypt backend
    - BR: /usr/bin/man for test suite

 .gitignore                 |    2 +-
 libssh2-1.4.0-c4a0e0.patch |   28 ++++++++++++++++++++++++++++
 libssh2.spec               |   28 ++++++++++++++++++++++++++--
 sources                    |    2 +-
 4 files changed, 56 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8846a13..0fc8c0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libssh2-1.3.0.tar.gz
+/libssh2-[0-9.]*.tar.gz
diff --git a/libssh2-1.4.0-c4a0e0.patch b/libssh2-1.4.0-c4a0e0.patch
new file mode 100644
index 0000000..6fb4c44
--- /dev/null
+++ b/libssh2-1.4.0-c4a0e0.patch
@@ -0,0 +1,28 @@
+From b3ade9a63e881e69b4c9cfe7b5dbad78dcc4a0e0 Mon Sep 17 00:00:00 2001
+From: Peter Stuge <peter at stuge.se>
+Date: Wed, 1 Feb 2012 09:53:44 +0100
+Subject: [PATCH] Fix undefined reference to _libssh_error in libgcrypt
+ backend
+
+Commit 209de22299b4b58e582891dfba70f57e1e0492db introduced a function
+call to a non-existing function, and since then the libgcrypt backend
+has not been buildable.
+---
+ src/libgcrypt.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/libgcrypt.c b/src/libgcrypt.c
+index 1bda5ee..5c2787b 100644
+--- a/src/libgcrypt.c
++++ b/src/libgcrypt.c
+@@ -581,7 +581,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
+                           const char *privatekey,
+                           const char *passphrase)
+ {
+-    return _libssh_error(session, LIBSSH2_ERROR_FILE,
++    return _libssh2_error(session, LIBSSH2_ERROR_FILE,
+                          "Unable to extract public key from private key file: "
+                          "Method unimplemented in libgcrypt backend");
+ }
+-- 
+1.7.6.1
diff --git a/libssh2.spec b/libssh2.spec
index b4c0dd4..791b37e 100644
--- a/libssh2.spec
+++ b/libssh2.spec
@@ -8,17 +8,19 @@
 %endif
 
 Name:		libssh2
-Version:	1.3.0
-Release:	4%{?dist}
+Version:	1.4.0
+Release:	1%{?dist}
 Summary:	A library implementing the SSH2 protocol
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://www.libssh2.org/
 Source0:	http://libssh2.org/download/libssh2-%{version}.tar.gz
 Patch0:		libssh2-1.2.9-utf8.patch
+Patch1:		libssh2-1.4.0-c4a0e0.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
+BuildRequires:	/usr/bin/man
 
 # Test suite requirements - we run the OpenSSH server and try to connect to it
 BuildRequires:	openssh-server
@@ -64,6 +66,9 @@ developing applications that use libssh2.
 # Make sure things are UTF-8...
 %patch0 -p1
 
+# Fix undefined reference to _libssh_error in libgcrypt (upstream patch)
+%patch1 -p1
+
 # Make sshd transition appropriately if building in an SELinux environment
 chcon $(/usr/sbin/matchpathcon -n /etc/rc.d/init.d/sshd) tests/ssh2.sh || :
 chcon -R $(/usr/sbin/matchpathcon -n /etc) tests/etc || :
@@ -128,6 +133,25 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libssh2.pc
 
 %changelog
+* Wed Feb  1 2012 Paul Howarth <paul at city-fan.org> 1.4.0-1
+- update to 1.4.0
+  - added libssh2_session_supported_algs()
+  - added libssh2_session_banner_get()
+  - added libssh2_sftp_get_channel()
+  - libssh2.h: bump the default window size to 256K
+  - sftp-seek: clear EOF flag
+  - userauth: provide more informations if ssh pub key extraction fails
+  - ssh2_exec: skip error outputs for EAGAIN
+  - LIBSSH2_SFTP_PACKET_MAXLEN: increase to 80000
+  - knownhost_check(): don't dereference ext if NULL is passed
+  - knownhost_add: avoid dereferencing uninitialized memory on error path
+  - OpenSSL EVP: fix threaded use of structs
+  - _libssh2_channel_read: react on errors from receive_window_adjust
+  - sftp_read: cap the read ahead maximum amount
+  - _libssh2_channel_read: fix non-blocking window adjusting 
+- add upstream patch fixing undefined function reference in libgcrypt backend
+- BR: /usr/bin/man for test suite
+
 * Sun Jan 15 2012 Peter Robinson <pbrobinson at fedoraproject.org> 1.3.0-4
 - skip the ssh test on ARM too
 
diff --git a/sources b/sources
index 05b2d34..aa596fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6425331899ccf1015f1ed79448cb4709  libssh2-1.3.0.tar.gz
+ee670161d8c5dff93ae84a3f34f15669  libssh2-1.4.0.tar.gz