diff --git a/libssh2.spec b/libssh2.spec index 8060e5f..4c1514a 100644 --- a/libssh2.spec +++ b/libssh2.spec @@ -12,7 +12,7 @@ Name: libssh2 Version: 1.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A library implementing the SSH2 protocol Group: System Environment/Libraries License: BSD @@ -20,6 +20,7 @@ URL: http://www.libssh2.org/ Source0: http://libssh2.org/download/libssh2-%{version}.tar.gz Patch2: CVE-2016-0787.patch Patch3: libssh2-1.7.0-openssl11.patch +Patch4: libssh2-1.7.0-openssl11-memleak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildRequires: coreutils @@ -78,9 +79,13 @@ sed -i s/4711/47%{?__isa_bits}/ tests/ssh2.{c,sh} # diffie_hellman_sha1: Convert bytes to bits (additional fix for CVE-2016-0787) %patch2 -p1 + # Build with OpenSSL 1.1.0 from upstream git %patch3 -p1 +# make curl test-suite work again with valgrind enabled +%patch4 -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,6 +160,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/libssh2.pc %changelog +* Thu Oct 20 2016 Kamil Dudka - 1.7.0-7 +- make curl test-suite work again with valgrind enabled + * Tue Oct 11 2016 Tomáš Mráz - 1.7.0-6 - rebuild with OpenSSL 1.1.0