update package libssh2

This commit is contained in:
Mark Brand 2012-02-01 10:55:27 +01:00
parent a05d2cc7cf
commit c04f64bc51
2 changed files with 30 additions and 17 deletions

View File

@ -1,19 +1,32 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
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
diff -Naur libssh2-1.3.0.orig/include/libssh2.h libssh2-1.3.0/include/libssh2.h
--- libssh2-1.3.0.orig/include/libssh2.h 2011-09-06 15:56:34.000000000 -0500
+++ libssh2-1.3.0/include/libssh2.h 2011-10-17 10:10:13.000000000 -0500
@@ -88,8 +88,8 @@
extern "C" {
#endif
#ifdef _WIN32
-# include <BaseTsd.h>
-# include <WinSock2.h>
+# include <basetsd.h>
+# include <winsock2.h>
#endif
#include <stddef.h>

View File

@ -4,8 +4,8 @@
# libssh2
PKG := libssh2
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.3.0
$(PKG)_CHECKSUM := d342e06abe38a29b1bbb9c58d50dd093eab0bee9
$(PKG)_VERSION := 1.4.0
$(PKG)_CHECKSUM := 53428b4935ab6eb843d45f1593dc434cb287b93e
$(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION)
$(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.libssh2.org