From 5c74a5e7a7fa48979e2a12cb0284d27ec7631af2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 19 Dec 2014 17:06:57 +0100
Subject: [PATCH] Security fix for CVE-2014-8132.

---
 .gitignore  |  1 +
 libssh.spec | 17 ++++++++++++-----
 sources     |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 920f538..eb75817 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libssh-0.4.4.tar.gz.asc
 /libssh-0.6.0.tar.xz
 /libssh-0.6.1.tar.xz
 /libssh-0.6.3.tar.xz
+/libssh-0.6.4.tar.gz
diff --git a/libssh.spec b/libssh.spec
index 3141342..0953a5a 100644
--- a/libssh.spec
+++ b/libssh.spec
@@ -1,17 +1,18 @@
 Name:           libssh
-Version:        0.6.3
-Release:        3%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        A library implementing the SSH protocol
 License:        LGPLv2+
 URL:            http://www.libssh.org
 Group:          System Environment/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:        https://red.libssh.org/attachments/download/87/libssh-0.6.3.tar.xz
+Source0:        https://red.libssh.org/attachments/download/107/libssh-0.6.4.tar.gz
 
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
 
 %description
@@ -26,6 +27,8 @@ third-party programs others than libcrypto (from openssl).
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       cmake
 
 %description devel
 The %{name}-devel package contains libraries and header files for developing
@@ -75,14 +78,18 @@ rm -rf %{buildroot}
 %{_includedir}/libssh/server.h
 %{_includedir}/libssh/sftp.h
 %{_includedir}/libssh/ssh2.h
-%{_libdir}/cmake/libssh-config-version.cmake
-%{_libdir}/cmake/libssh-config.cmake
+%dir  %{_libdir}/cmake/libssh
+%{_libdir}/cmake/libssh/libssh-config-version.cmake
+%{_libdir}/cmake/libssh/libssh-config.cmake
 %{_libdir}/pkgconfig/libssh.pc
 %{_libdir}/pkgconfig/libssh_threads.pc
 %{_libdir}/libssh.so
 %{_libdir}/libssh_threads.so
 
 %changelog
+* Fri Dec 19 2014 - Andreas Schneider <asn@redhat.com> - 0.6.4-1
+- Security fix for CVE-2014-8132.
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index af64935..28865ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66cf16e77f60913b4d54f18c92cdbf71  libssh-0.6.3.tar.xz
+5d092f911492e3ee4cd7b473f09a0196  libssh-0.6.4.tar.gz