Mercurial > hg > mxe
changeset 2871:b658a8e9dcc5 draft
update package libssh2
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Wed, 28 Nov 2012 16:52:11 +0100 |
| parents | aacf80e290b9 |
| children | 9d48874e3358 |
| files | index.html src/libssh2-1-fixes.patch src/libssh2.mk |
| diffstat | 3 files changed, 4 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html +++ b/index.html @@ -1540,7 +1540,7 @@ </tr> <tr> <td id="libssh2-package">libssh2</td> - <td id="libssh2-version">1.4.2</td> + <td id="libssh2-version">1.4.3</td> <td id="libssh2-website"><a href="http://www.libssh2.org">libssh2</a></td> </tr> <tr>
--- a/src/libssh2-1-fixes.patch +++ b/src/libssh2-1-fixes.patch @@ -1,37 +1,10 @@ This file is part of MXE. See index.html for further information. -From 0e2179c67d0cd618be29b30425bda18c23a2ddf0 Mon Sep 17 00:00:00 2001 -From: Dmitry Smirnov <onlyjob@member.fsf.org> -Date: Mon, 13 Aug 2012 23:34:51 +0200 -Subject: [PATCH 1/2] configure: gcrypt doesn't come with pkg-config support - -... so use plain old -lgcrypt to the linker to link with it. - -Fixes #225 -(cherry picked from commit e470738a0cf302abfd2891b80dbac4ac3e7eedd2) - -diff --git a/configure.ac b/configure.ac -index aa9d397..dfc6988 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -102,7 +102,7 @@ fi - # Look for libgcrypt - if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then - AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>]) -- LIBSREQUIRED=libgcrypt -+ LIBS="$LIBS -lgcrypt" - fi - - AC_SUBST(LIBSREQUIRED) --- -1.7.10.4 - - -From 75ecbf4e5ca3c977418f60db42ba03c13d0e68f9 Mon Sep 17 00:00:00 2001 +From 9cca5b7a1274f4e263441944b906f054118b8387 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 2 Sep 2012 00:55:28 +0200 -Subject: [PATCH 2/2] include gpg-error with gcrypt for static linking +Subject: [PATCH] include gpg-error with gcrypt for static linking (mxe-specific)
--- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -3,7 +3,7 @@ PKG := libssh2 $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 7fc084254dabe14a9bc90fa3d569faa7ee943e19 +$(PKG)_CHECKSUM := c27ca83e1ffeeac03be98b6eef54448701e044b0 $(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) $(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE)