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
This commit is contained in:
parent
4256e1a18e
commit
d2c802f8e0
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
/libssh2-1.3.0.tar.gz
|
/libssh2-[0-9.]*.tar.gz
|
||||||
|
28
libssh2-1.4.0-c4a0e0.patch
Normal file
28
libssh2-1.4.0-c4a0e0.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From b3ade9a63e881e69b4c9cfe7b5dbad78dcc4a0e0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Stuge <peter@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
|
28
libssh2.spec
28
libssh2.spec
@ -8,17 +8,19 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: libssh2
|
Name: libssh2
|
||||||
Version: 1.3.0
|
Version: 1.4.0
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A library implementing the SSH2 protocol
|
Summary: A library implementing the SSH2 protocol
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.libssh2.org/
|
URL: http://www.libssh2.org/
|
||||||
Source0: http://libssh2.org/download/libssh2-%{version}.tar.gz
|
Source0: http://libssh2.org/download/libssh2-%{version}.tar.gz
|
||||||
Patch0: libssh2-1.2.9-utf8.patch
|
Patch0: libssh2-1.2.9-utf8.patch
|
||||||
|
Patch1: libssh2-1.4.0-c4a0e0.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
BuildRequires: /usr/bin/man
|
||||||
|
|
||||||
# Test suite requirements - we run the OpenSSH server and try to connect to it
|
# Test suite requirements - we run the OpenSSH server and try to connect to it
|
||||||
BuildRequires: openssh-server
|
BuildRequires: openssh-server
|
||||||
@ -64,6 +66,9 @@ developing applications that use libssh2.
|
|||||||
# Make sure things are UTF-8...
|
# Make sure things are UTF-8...
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
|
||||||
|
# Fix undefined reference to _libssh_error in libgcrypt (upstream patch)
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
# Make sshd transition appropriately if building in an SELinux environment
|
# 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 $(/usr/sbin/matchpathcon -n /etc/rc.d/init.d/sshd) tests/ssh2.sh || :
|
||||||
chcon -R $(/usr/sbin/matchpathcon -n /etc) tests/etc || :
|
chcon -R $(/usr/sbin/matchpathcon -n /etc) tests/etc || :
|
||||||
@ -128,6 +133,25 @@ rm -rf %{buildroot}
|
|||||||
%{_libdir}/pkgconfig/libssh2.pc
|
%{_libdir}/pkgconfig/libssh2.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 1 2012 Paul Howarth <paul@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@fedoraproject.org> 1.3.0-4
|
* Sun Jan 15 2012 Peter Robinson <pbrobinson@fedoraproject.org> 1.3.0-4
|
||||||
- skip the ssh test on ARM too
|
- skip the ssh test on ARM too
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user