Contribs: ssh2, gcrypt needs gpg-error

diff --git a/contrib/src/ssh2/gpg-error-pc.patch b/contrib/src/ssh2/gpg-error-pc.patch
new file mode 100644 (file)
index 0000000..94a731b
--- /dev/null
+++ b/contrib/src/ssh2/gpg-error-pc.patch
@@ -0,0 +1,11 @@
+--- ssh2/configure.ac  2015-02-24 10:15:45.581842131 +0100
++++ ssh2/configure.ac.new      2015-02-24 10:15:34.948332253 +0100
+@@ -102,7 +102,7 @@
+ # Look for libgcrypt
+ if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
+   AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
+-  LIBS="$LIBS -lgcrypt"
++  LIBS="$LIBS -lgcrypt -lgpg-error"
+ fi
+ 
+ AC_SUBST(LIBSREQUIRED)

diff --git a/contrib/src/ssh2/rules.mak b/contrib/src/ssh2/rules.mak
index 1a05fe87558abb9e85900770d618d307b3991ba8..2efa5541a15a92ed44c2b66910276db4944c91cf 100644 (file)
--- a/contrib/src/ssh2/rules.mak
+++ b/contrib/src/ssh2/rules.mak
@@ -19,6 +19,7 @@ ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2
        $(UNPACK)
        $(APPLY) $(SRC)/ssh2/no-tests.patch
        $(APPLY) $(SRC)/ssh2/configure-zlib.patch
+       $(APPLY) $(SRC)/ssh2/gpg-error-pc.patch
        $(MOVE)
 
 DEPS_ssh2 = gcrypt $(DEPS_gcrypt)