[libssh2/f20] Update to 1.5.0

Paul Howarth pghmcfc at fedoraproject.org
Wed Mar 11 11:39:51 UTC 2015


commit 54cf5dbf0189e8205afea08b7650e3521295e7e4
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Mar 11 10:30:38 2015 +0000

    Update to 1.5.0
    
    - New upstream release 1.5.0
      - See RELEASE-NOTES for details of bug fixes and enhancements
      - Security Advisory for CVE-2015-1782, using SSH_MSG_KEXINIT data unbounded

 ...p-seek-Don-t-flush-buffers-on-same-offset.patch |  54 -----
 ...s-Along-error-path-reset-the-correct-stat.patch |  26 ---
 ...p-Add-support-for-fsync-OpenSSH-extension.patch | 223 ---------------------
 ...evert-window_size-explicit-adjustments-on.patch |  69 -------
 0005-channel.c-fix-a-use-after-free.patch          |  26 ---
 ...annel_write-client-spins-on-write-when-wi.patch |  45 -----
 ...-redid-window-handling-for-flow-control-r.patch | 146 --------------
 ...annel_read-fix-data-drop-when-out-of-wind.patch | 140 -------------
 ...2_channel_read-Honour-window_size_initial.patch |  62 ------
 0010-Set-default-window-size-to-2MB.patch          |  85 --------
 ...eive_window_adjust-store-windows-size-alw.patch |  66 ------
 ...nt_init-init-fd-to-LIBSSH2_INVALID_SOCKET.patch |  31 ---
 libssh2-1.3.0.tar.gz.asc                           |   7 -
 libssh2.spec                                       |  52 ++---
 sources                                            |   2 +-
 15 files changed, 15 insertions(+), 1019 deletions(-)
---
diff --git a/libssh2.spec b/libssh2.spec
index 4b05504..4e4af86 100644
--- a/libssh2.spec
+++ b/libssh2.spec
@@ -11,26 +11,14 @@
 %{!?__isa_bits: %global __isa_bits %((echo '#include <bits/wordsize.h>'; echo __WORDSIZE) | cpp - | grep -Ex '32|64')}
 
 Name:		libssh2
-Version:	1.4.3
-Release:	10%{?dist}
+Version:	1.5.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.4.2-utf8.patch
-Patch1:		0001-sftp-seek-Don-t-flush-buffers-on-same-offset.patch
-Patch2:		0002-sftp-statvfs-Along-error-path-reset-the-correct-stat.patch
-Patch3:		0003-sftp-Add-support-for-fsync-OpenSSH-extension.patch
-Patch4:		0004-partially-revert-window_size-explicit-adjustments-on.patch
-Patch5:		0005-channel.c-fix-a-use-after-free.patch
-Patch6:		0006-_libssh2_channel_write-client-spins-on-write-when-wi.patch
-Patch7:		0007-window_size-redid-window-handling-for-flow-control-r.patch
-Patch8:		0008-_libssh2_channel_read-fix-data-drop-when-out-of-wind.patch
-Patch9:		0009-_libssh2_channel_read-Honour-window_size_initial.patch
-Patch10:	0010-Set-default-window-size-to-2MB.patch
-Patch11:	0011-channel_receive_window_adjust-store-windows-size-alw.patch
-Patch12:	0012-libssh2_agent_init-init-fd-to-LIBSSH2_INVALID_SOCKET.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
@@ -84,28 +72,6 @@ sed -i s/4711/47%{?__isa_bits}/ tests/ssh2.{c,sh}
 # Make sure things are UTF-8...
 %patch0 -p1
 
-# Three upstream patches required for qemu ssh block driver.
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-# http://thread.gmane.org/gmane.network.ssh.libssh2.devel/6428
-%patch4 -p1
-
-# https://trac.libssh2.org/ticket/268
-%patch5 -p1
-
-# Fix curl's excessive memory consumption during scp download
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-
-# prevent a not-connected agent from closing STDIN (#1147717)
-%patch12 -p1
-
 # Make sshd transition appropriately if building in an SELinux environment
 %if !(0%{?fedora} >= 17 || 0%{?rhel} >= 7)
 chcon $(/usr/sbin/matchpathcon -n /etc/rc.d/init.d/sshd) tests/ssh2.sh || :
@@ -155,12 +121,17 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS ChangeLog COPYING README NEWS
+%if 0%{?_licensedir:1}
+%license COPYING
+%else
+%doc COPYING
+%endif
+%doc docs/AUTHORS ChangeLog NEWS README RELEASE-NOTES
 %{_libdir}/libssh2.so.1
 %{_libdir}/libssh2.so.1.*
 
 %files docs
-%doc HACKING
+%doc docs/BINDINGS docs/HACKING docs/TODO
 %{_mandir}/man3/libssh2_*.3*
 
 %files devel
@@ -172,6 +143,11 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libssh2.pc
 
 %changelog
+* Wed Mar 11 2015 Paul Howarth <paul at city-fan.org> - 1.5.0-1
+- Update to 1.5.0
+  - See RELEASE-NOTES for details of bug fixes and enhancements
+  - Security Advisory for CVE-2015-1782, using SSH_MSG_KEXINIT data unbounded
+
 * Fri Oct 10 2014 Kamil Dudka <kdudka at redhat.com> 1.4.3-10
 - prevent a not-connected agent from closing STDIN (#1147717)
 
diff --git a/sources b/sources
index fab710a..039b601 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-071004c60c5d6f90354ad1b701013a0b  libssh2-1.4.3.tar.gz
+e7fa3f5c6bd2d67a9b360ff726bbc6ba  libssh2-1.5.0.tar.gz


More information about the scm-commits mailing list