Mercurial > mxe-octave

changeset 5110:37f184df1eb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libssh2: update to v1.9.0 * src/libssh2.mk: update version, checksum * src/libssh2-1-fixes.patch: remove file * dist-files.mk: remove ref to patch file
author John Donoghue
date Wed, 03 Jul 2019 14:18:37 -0400
parents 474bef9380e0
children 52de2b23fd0f
files dist-files.mk src/libssh2-1-fixes.patch src/libssh2.mk
diffstat 3 files changed, 2 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed Jul 03 14:09:34 2019 -0400
+++ b/dist-files.mk	Wed Jul 03 14:18:37 2019 -0400
@@ -298,7 +298,6 @@
   libshout.mk \
   libsigc++.mk \
   libsndfile.mk \
-  libssh2-1-fixes.patch \
   libssh2-test.c \
   libssh2.mk \
   libtool.mk \
--- a/src/libssh2-1-fixes.patch	Wed Jul 03 14:09:34 2019 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-From 65ae975e2a670869580e289d5d9bf255d2a10209 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 734ef07..a6ee65a 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
--- 
-2.9.3
-
-
-From fb65371e600772e72491f06a368a727c96d525c7 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 a6ee65a..510a0d3 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>
-   ])
--- 
-2.9.3
-
--- a/src/libssh2.mk	Wed Jul 03 14:09:34 2019 -0400
+++ b/src/libssh2.mk	Wed Jul 03 14:18:37 2019 -0400
@@ -3,8 +3,8 @@
 
 PKG             := libssh2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.2
-$(PKG)_CHECKSUM := 9250682b0df0ab61e47cc4192f99731949f605bc
+$(PKG)_VERSION  := 1.9.0
+$(PKG)_CHECKSUM := 21e98282b103307a16792e5e2d4c99beaf0b3b9c
 $(PKG)_SUBDIR   := libssh2-$($(PKG)_VERSION)
 $(PKG)_FILE     := libssh2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libssh2.org/download/$($(PKG)_FILE)