From 5654781ad9d4c91990eeb7ab325b5a05019e9d50 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 5 Apr 2012 08:52:18 +0200 Subject: [PATCH] update package libssh2 --- index.html | 2 +- src/libssh2-1-fixes.patch | 32 -------------------------------- src/libssh2.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 src/libssh2-1-fixes.patch diff --git a/index.html b/index.html index a1af319f..9422e82f 100644 --- a/index.html +++ b/index.html @@ -1469,7 +1469,7 @@ USE_OSGPLUGIN(<plugin2>) libssh2 - 1.4.0 + 1.4.1 libssh2 diff --git a/src/libssh2-1-fixes.patch b/src/libssh2-1-fixes.patch deleted file mode 100644 index 04e85c0c..00000000 --- a/src/libssh2-1-fixes.patch +++ /dev/null @@ -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 -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 - diff --git a/src/libssh2.mk b/src/libssh2.mk index a232177b..5d5337f0 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -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)