From 0e7630c31989bec8ac96261b72518f7b505bcdb7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 15 May 2014 12:33:22 +0200
Subject: libssh: update to 0.6.3

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/libssh/libssh_0.6.3.bb | 29 ++++++++++++++++++++++++++
 meta-oe/recipes-support/libssh/libssh_git.bb   | 28 -------------------------
 2 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 meta-oe/recipes-support/libssh/libssh_0.6.3.bb
 delete mode 100644 meta-oe/recipes-support/libssh/libssh_git.bb

diff --git a/meta-oe/recipes-support/libssh/libssh_0.6.3.bb b/meta-oe/recipes-support/libssh/libssh_0.6.3.bb
new file mode 100644
index 000000000..771a47a6c
--- /dev/null
+++ b/meta-oe/recipes-support/libssh/libssh_0.6.3.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol"
+HOMEPAGE = "http://www.libssh.org"
+SECTION = "libs"
+
+DEPENDS = "zlib openssl libgcrypt"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139"
+
+SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-6"
+SRCREV = "87145387aa12b720b52d6bc75b4dd6cd058c868a"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = " \
+    -DWITH_GCRYPT=1 \
+    -DWITH_PCAP=1 \
+    -DWITH_SFTP=1 \
+    -DWITH_ZLIB=1 \
+    "
+
+inherit cmake
+
+do_configure_prepend () {
+    # Disable building of examples
+    sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \
+        || bbfatal "Failed to disable examples"
+}
+
+FILES_${PN}-dev += "${libdir}/cmake"
diff --git a/meta-oe/recipes-support/libssh/libssh_git.bb b/meta-oe/recipes-support/libssh/libssh_git.bb
deleted file mode 100644
index 3f118a0f3..000000000
--- a/meta-oe/recipes-support/libssh/libssh_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol"
-HOMEPAGE = "http://www.libssh.org"
-SECTION = "libs"
-
-DEPENDS = "zlib openssl libgcrypt"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139"
-
-PV = "0.5.5+gitr${SRCPV}"
-SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-5"
-SRCREV = "43914a5f07702fe292a968322d5ff2627e0431db"
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE = " \
-    -DWITH_GCRYPT=1 \
-    -DWITH_PCAP=1 \
-    -DWITH_SFTP=1 \
-    -DWITH_ZLIB=1 \
-    "
-
-inherit cmake
-
-do_configure_prepend () {
-    # Disable building of examples
-    sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \
-        || bbfatal "Failed to disable examples"
-}
-- 
cgit v1.2.3-54-g00ecf