Mercurial > mxe-octave
changeset 2392:be80d8581762
update package libssh2
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Thu, 05 Apr 2012 08:52:18 +0200 |
| parents | fbf67aa01033 |
| children | 295e88579d64 |
| files | index.html src/libssh2-1-fixes.patch src/libssh2.mk |
| diffstat | 3 files changed, 2 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Tue Apr 03 14:59:00 2012 +0200 +++ b/index.html Thu Apr 05 08:52:18 2012 +0200 @@ -1469,7 +1469,7 @@ </tr> <tr> <td id="libssh2-package">libssh2</td> - <td id="libssh2-version">1.4.0</td> + <td id="libssh2-version">1.4.1</td> <td id="libssh2-website"><a href="http://www.libssh2.org">libssh2</a></td> </tr> <tr>
--- a/src/libssh2-1-fixes.patch Tue Apr 03 14:59:00 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From b3ade9a63e881e69b4c9cfe7b5dbad78dcc4a0e0 Mon Sep 17 00:00:00 2001 -From: Peter Stuge <peter@stuge.se> -Date: Wed, 1 Feb 2012 09:53:44 +0100 -Subject: [PATCH] Fix undefined reference to _libssh_error in libgcrypt - backend - -Commit 209de22299b4b58e582891dfba70f57e1e0492db introduced a function -call to a non-existing function, and since then the libgcrypt backend -has not been buildable. ---- - src/libgcrypt.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/libgcrypt.c b/src/libgcrypt.c -index 1bda5ee..5c2787b 100644 ---- a/src/libgcrypt.c -+++ b/src/libgcrypt.c -@@ -581,7 +581,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session, - const char *privatekey, - const char *passphrase) - { -- return _libssh_error(session, LIBSSH2_ERROR_FILE, -+ return _libssh2_error(session, LIBSSH2_ERROR_FILE, - "Unable to extract public key from private key file: " - "Method unimplemented in libgcrypt backend"); - } --- -1.7.8.3 -
--- a/src/libssh2.mk Tue Apr 03 14:59:00 2012 +0200 +++ b/src/libssh2.mk Thu Apr 05 08:52:18 2012 +0200 @@ -3,7 +3,7 @@ PKG := libssh2 $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 53428b4935ab6eb843d45f1593dc434cb287b93e +$(PKG)_CHECKSUM := a5c59eac66f5686f3960f59dcb54b5bf3b339811 $(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) $(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE)