Mercurial > mxe-octave

changeset 2535:4a6fc9512b17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package ssh2
author Mark Brand <mabrand@mabrand.nl>
date Sat, 19 May 2012 09:57:21 +0200
parents 5879c1871a03
children 3cdb83ce7351
files index.html src/libssh2-1-fixes.patch src/libssh2.mk
diffstat 3 files changed, 35 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Thu May 17 22:20:25 2012 +0200
+++ b/index.html	Sat May 19 09:57:21 2012 +0200
@@ -1515,7 +1515,7 @@
     </tr>
     <tr>
         <td id="libssh2-package">libssh2</td>
-        <td id="libssh2-version">1.4.1</td>
+        <td id="libssh2-version">1.4.2</td>
         <td id="libssh2-website"><a href="http://www.libssh2.org">libssh2</a></td>
     </tr>
     <tr>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libssh2-1-fixes.patch	Sat May 19 09:57:21 2012 +0200
@@ -0,0 +1,32 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 6b8a3edae23dc93cc02e6c9572d0796e338ddc4f Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sat, 19 May 2012 10:40:36 +0200
+Subject: [PATCH] libgcrypt does not provide pkg-config support
+
+Commits 04692445d4a32430610ccf8c256e18245cbb3e06
+and e887a8bd0f043fd49e9119756858e75e82dee504 add
+'libgcrypt' to Requires.private of libssh2.pc
+file, but libgcrypt does not provide a .pc file, so
+this does not work.
+---
+ configure.ac |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index aa9d397..0d35a27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,7 +102,6 @@ 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
+ fi
+ 
+ AC_SUBST(LIBSREQUIRED)
+-- 
+1.7.9.2
+
--- a/src/libssh2.mk	Thu May 17 22:20:25 2012 +0200
+++ b/src/libssh2.mk	Sat May 19 09:57:21 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := libssh2
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := a5c59eac66f5686f3960f59dcb54b5bf3b339811
+$(PKG)_CHECKSUM := 7fc084254dabe14a9bc90fa3d569faa7ee943e19
 $(PKG)_SUBDIR   := libssh2-$($(PKG)_VERSION)
 $(PKG)_FILE     := libssh2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libssh2.org/download/$($(PKG)_FILE)
@@ -17,6 +17,7 @@
 endef
 
 define $(PKG)_BUILD
+    cd '$(1)' && ./buildconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \