update: expat, libssh2

src/expat.mk

@@ -4,8 +4,8 @@ PKG             := expat
 $(PKG)_WEBSITE  := https://github.com/libexpat/libexpat
 $(PKG)_DESCR    := Expat XML Parser
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.6
-$(PKG)_CHECKSUM := 17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2
+$(PKG)_VERSION  := 2.2.7
+$(PKG)_CHECKSUM := cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18
 $(PKG)_SUBDIR   := expat-$($(PKG)_VERSION)
 $(PKG)_FILE     := expat-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE)

src/libssh2-1-fixes.patch

@@ -1,59 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 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
- (mxe-specific)
-
-Git rid of the extra -lgcrypt here since we have to pass the
-whole list via LIBS. Otherwise, LIBS gets simplified with
--lgcrypt appearing only after its static dependencies.
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 1111111..2222222 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -423,7 +423,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [
-   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"
-     found_crypto=libgcrypt
-   else
-     # restore
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Mon, 7 Nov 2016 10:47:13 +0100
-Subject: [PATCH 2/2] fix yes/no in lib path
-
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 1111111..2222222 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -386,10 +386,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_MBEDTLS], [
- 
-   old_LDFLAGS=$LDFLAGS
-   old_CFLAGS=$CFLAGS
--  if test -n "$use_mbedtls" && test "$use_mbedtls" != "no"; then
--    LDFLAGS="$LDFLAGS -L$use_mbedtls/lib"
--    CFLAGS="$CFLAGS -I$use_mbedtls/include"
--  fi
- 
-   AC_LIB_HAVE_LINKFLAGS([mbedtls], [], [
-     #include <mbedtls/version.h>
-@@ -412,10 +408,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [
- 
-   old_LDFLAGS=$LDFLAGS
-   old_CFLAGS=$CFLAGS
--  if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
--    LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
--    CFLAGS="$CFLAGS -I$use_libgcrypt/include"
--  fi
-   AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [
-     #include <gcrypt.h>
-   ])

src/libssh2.mk

@@ -3,8 +3,8 @@
 PKG             := libssh2
 $(PKG)_WEBSITE  := https://libssh2.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.2
-$(PKG)_CHECKSUM := 088307d9f6b6c4b8c13f34602e8ff65d21c2dc4d55284dfe15d502c4ee190d67
+$(PKG)_VERSION  := 1.9.0
+$(PKG)_CHECKSUM := d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd
 $(PKG)_SUBDIR   := libssh2-$($(PKG)_VERSION)
 $(PKG)_FILE     := libssh2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://libssh2.org/download/$($(PKG)_FILE)