From b33d80879a61f1494898c6278bbf7bdf3ed491c0 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 11 Mar 2015 10:56:44 +0100
Subject: [PATCH] libssh2: update

---
 src/libssh2-1-fixes.patch | 46 +++++++++------------------------------
 src/libssh2.mk            |  4 ++--
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/src/libssh2-1-fixes.patch b/src/libssh2-1-fixes.patch
index 7d169b5f..f5b6239f 100644
--- a/src/libssh2-1-fixes.patch
+++ b/src/libssh2-1-fixes.patch
@@ -1,51 +1,25 @@
 This file is part of MXE.
 See index.html for further information.
 
-Contains ad hoc patches for cross building.
-
-From ab12cbdf40141b62d2c01943811a65a65cf5e657 Mon Sep 17 00:00:00 2001
-From: MXE
+From a1d0ed70e2c94d89d0b598eacca6ac79b8cd5508 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
 Date: Sun, 2 Sep 2012 00:55:28 +0200
-Subject: [PATCH 1/2] include gpg-error with gcrypt for static linking
+Subject: [PATCH] include gpg-error with gcrypt for static linking
  (mxe-specific)
 
 
 diff --git a/configure.ac b/configure.ac
-index dfc6988..748dd21 100644
+index 563fb04..16caa88 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -103,6 +103,7 @@ fi
- if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
-   AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
+@@ -124,6 +124,7 @@ if test "$ac_cv_libgcrypt" = "yes"; then
+   AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use libgcrypt])
+   LIBSREQUIRED= # libgcrypt doesn't provide a .pc file. sad face.
    LIBS="$LIBS -lgcrypt"
 +  LIBS="$LIBS `${prefix}/bin/gpg-error-config --libs`"
+   found_crypto=libgcrypt
  fi
- 
- AC_SUBST(LIBSREQUIRED)
--- 
-1.8.0.3
-
-
-From 246a5f965ad348a6de921689a031ffa481f733e7 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Sat, 23 Mar 2013 18:41:25 +1100
-Subject: [PATCH 2/2] replace deprectaed AM_CONFIG_HEADER with
- AC_CONFIG_HEADERS
-
-
-diff --git a/configure.ac b/configure.ac
-index 748dd21..d190a2a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,7 @@
- AC_INIT(libssh2, [-], libssh2-devel@cool.haxx.se)
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR([src])
--AM_CONFIG_HEADER([src/libssh2_config.h example/libssh2_config.h])
-+AC_CONFIG_HEADERS([src/libssh2_config.h example/libssh2_config.h])
- AM_MAINTAINER_MODE
- 
- dnl SED is needed by some of the tools
+ AM_CONDITIONAL(LIBGCRYPT, test "$ac_cv_libgcrypt" = "yes")
 -- 
-1.8.0.3
+2.1.0
 
diff --git a/src/libssh2.mk b/src/libssh2.mk
index 082f783b..c8b4a570 100644
--- a/src/libssh2.mk
+++ b/src/libssh2.mk
@@ -3,8 +3,8 @@
 
 PKG             := libssh2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.3
-$(PKG)_CHECKSUM := c27ca83e1ffeeac03be98b6eef54448701e044b0
+$(PKG)_VERSION  := 1.5.0
+$(PKG)_CHECKSUM := d9a97a04aef8bcf835b22a7a2e8e869782baa3aa
 $(PKG)_SUBDIR   := libssh2-$($(PKG)_VERSION)
 $(PKG)_FILE     := libssh2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libssh2.org/download/$($(PKG)_FILE)