Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2d67413cf74a4899eda718fbbd44a89551009670)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2d67413cf74a4899eda718fbbd44a89551009670)
  • Date: Sat, 14 Jan 2017 00:01:26 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/libssh2/DEPENDS | 4 +
crypto/libssh2/DETAILS | 1
crypto/libssh2/HISTORY | 5 +
crypto/libssh2/PRE_BUILD | 6 ++
crypto/libssh2/libssh2-1.8.0-libgcrypt-prefix.patch | 52
++++++++++++++++++++
5 files changed, 67 insertions(+), 1 deletion(-)

New commits:
commit 2d67413cf74a4899eda718fbbd44a89551009670
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/libssh2: fix build if gcrypt is selected as a dependency

diff --git a/crypto/libssh2/DEPENDS b/crypto/libssh2/DEPENDS
index a0115e1..1d16889 100755
--- a/crypto/libssh2/DEPENDS
+++ b/crypto/libssh2/DEPENDS
@@ -3,4 +3,6 @@ if [ "$SSH2_CRYPTO" = libgcrypt ]; then
else
depends SSL --with-openssl
fi &&
-depends zlib
+depends zlib &&
+depends automake &&
+depends autoconf
diff --git a/crypto/libssh2/DETAILS b/crypto/libssh2/DETAILS
index 31b9d97..bc75416 100755
--- a/crypto/libssh2/DETAILS
+++ b/crypto/libssh2/DETAILS
@@ -1,6 +1,7 @@
SPELL=libssh2
VERSION=1.8.0
SECURITY_PATCH=2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY
index 301fefd..8cb0724 100644
--- a/crypto/libssh2/HISTORY
+++ b/crypto/libssh2/HISTORY
@@ -1,3 +1,8 @@
+2017-01-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, libssh2-1.8.0-libgcrypt-prefix.patch, DEPENDS: add patch
from
+ gentoo to fix build if gcrypt is selected as a dependency
+ * DETAILS: PATCHLEVEL++
+
2017-01-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.0
* ssh2.gpg: add Daniel Stenberg <daniel AT haxx.se>
diff --git a/crypto/libssh2/PRE_BUILD b/crypto/libssh2/PRE_BUILD
new file mode 100755
index 0000000..000ff4d
--- /dev/null
+++ b/crypto/libssh2/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/libssh2-1.8.0-libgcrypt-prefix.patch" &&
+autoreconf -fi
+
diff --git a/crypto/libssh2/libssh2-1.8.0-libgcrypt-prefix.patch
b/crypto/libssh2/libssh2-1.8.0-libgcrypt-prefix.patch
new file mode 100644
index 0000000..38541fe
--- /dev/null
+++ b/crypto/libssh2/libssh2-1.8.0-libgcrypt-prefix.patch
@@ -0,0 +1,52 @@
+From ad5223220aa83e2439657ddce6ffca4445f08f8c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit AT google.com>
+Date: Mon, 31 Oct 2016 09:04:33 +0000
+Subject: [PATCH] acinclude.m4: fix ./configure --with-libgcrypt
+
+The change fixes passing of bogus gcrypt prefix.
+Reproducible as:
+
+ $ ./configure --with-libgcrypt
+ $ make V=1
+ ...
+ /bin/sh ../libtool --tag=CC --mode=link gcc -g -O2 -Iyes/include
-version-info 1:1:0 -no-undefined -export-symbols-regex '^libssh2_.*'
-lgcrypt -lz -Lyes/lib -o libssh2.la -rpath /usr/local/lib channel.lo
comp.lo crypt.lo hostkey.lo kex.lo mac.lo misc.lo packet.lo publickey.lo
scp.lo session.lo sftp.lo userauth.lo transport.lo version.lo knownhost.lo
agent.lo libgcrypt.lo pem.lo keepalive.lo global.lo -lgcrypt
+ ../libtool: line 7475: cd: yes/lib: No such file or directory
+ libtool: error: cannot determine absolute directory name of 'yes/lib'
+
+These
+ -Iyes/include
+ -Lyes/lib
+come from libgcrypt code autodetection:
+ if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
+ LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
+ CFLAGS="$CFLAGS -I$use_libgcrypt/include"
+
+I assume it's a typo to use yes/no flag as a prefix and changed
+it to '$with_libgcrypt_prefix'.
+
+Reported-by: Mikhail Pukhlikov <cynede AT gentoo.org>
+Signed-off-by: Sergei Trofimovich <siarheit AT google.com>
+---
+ acinclude.m4 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 734ef07..c78260c 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -412,9 +412,9 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [
+
+ old_LDFLAGS=$LDFLAGS
+ old_CFLAGS=$CFLAGS
+- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
+- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
+- CFLAGS="$CFLAGS -I$use_libgcrypt/include"
++ if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then
++ LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib"
++ CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include"
+ fi
+ AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [
+ #include <gcrypt.h>
+--
+2.10.1
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2d67413cf74a4899eda718fbbd44a89551009670), Florian Franzmann, 01/13/2017

Archive powered by MHonArc 2.6.24.

Top of Page