diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-02-01 09:55:27 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2012-02-01 09:55:27 (GMT) |
| commit | c04f64bc515cfd9b4a1473db05d18cec5fbf3e68 (patch) | |
| tree | 2ad5674ed6cf56a144cd25419412af99429b8877 /src/libssh2-1-fixes.patch | |
| parent | a05d2cc7cfc5619b0edb3596b3a9e032253fb084 (diff) | |
| download | mxe-c04f64bc515cfd9b4a1473db05d18cec5fbf3e68.zip mxe-c04f64bc515cfd9b4a1473db05d18cec5fbf3e68.tar.gz mxe-c04f64bc515cfd9b4a1473db05d18cec5fbf3e68.tar.bz2 | |
update package libssh2
Diffstat (limited to 'src/libssh2-1-fixes.patch')
| -rw-r--r-- | src/libssh2-1-fixes.patch | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/src/libssh2-1-fixes.patch b/src/libssh2-1-fixes.patch index 71b94dc..7bdccde 100644 --- a/src/libssh2-1-fixes.patch +++ b/src/libssh2-1-fixes.patch @@ -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> |