summaryrefslogtreecommitdiff
path: root/libssh2.spec
diff options
context:
space:
mode:
Diffstat (limited to 'libssh2.spec')
-rw-r--r--libssh2.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/libssh2.spec b/libssh2.spec
index 4d942dc..8060e5f 100644
--- a/libssh2.spec
+++ b/libssh2.spec
@@ -12,13 +12,14 @@
Name: libssh2
Version: 1.7.0
-Release: 5%{?dist}
+Release: 6%{?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
Patch2: CVE-2016-0787.patch
+Patch3: libssh2-1.7.0-openssl11.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: coreutils
@@ -77,6 +78,8 @@ 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 sshd transition appropriately if building in an SELinux environment
%if !(0%{?fedora} >= 17 || 0%{?rhel} >= 7)
@@ -152,6 +155,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libssh2.pc
%changelog
+* Tue Oct 11 2016 Tomáš Mráz <tmraz@redhat.com> - 1.7.0-6
+- rebuild with OpenSSL 1.1.0
+
* Sun Mar 6 2016 Paul Howarth <paul@city-fan.org> - 1.7.0-5
- Revert parts of previous change that broke EL-5 compatibility
- Include NEWS in docs package, it's much more than RELEASE-NOTES
bgstack15