diff options
| author | Florian Franzmann | 2019-06-20 10:55:25 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2019-06-20 10:55:25 +0200 |
| commit | 099866b95da8fe88e4b9621b5629a8565acaf813 (patch) | |
| tree | 89a8818e8bb3a983bfa5d93dcd822bb544e9356c /crypto | |
| parent | 7767e7c597776242f55cb0360d3b663f221b887f (diff) | |
crypto/libssh2: version 1.9.0
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/libssh2/HISTORY | 1 | ||||
| -rwxr-xr-x | crypto/libssh2/PRE_BUILD | 1 | ||||
| -rw-r--r-- | crypto/libssh2/libssh2-1.8.0-libgcrypt-prefix.patch | 52 |
3 files changed, 1 insertions, 53 deletions
diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY index 4559ae61ac..d0b025688b 100644 --- a/crypto/libssh2/HISTORY +++ b/crypto/libssh2/HISTORY @@ -1,5 +1,6 @@ 2019-06-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 1.9.0 + * PRE_BUILD, libssh2-1.8.0-libgcrypt-prefix.patch: remove obsolete patch 2019-04-04 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 1.8.2 diff --git a/crypto/libssh2/PRE_BUILD b/crypto/libssh2/PRE_BUILD index 000ff4dc31..607c6ebc65 100755 --- a/crypto/libssh2/PRE_BUILD +++ b/crypto/libssh2/PRE_BUILD @@ -1,6 +1,5 @@ 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 deleted file mode 100644 index 38541fecee..0000000000 --- a/crypto/libssh2/libssh2-1.8.0-libgcrypt-prefix.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ad5223220aa83e2439657ddce6ffca4445f08f8c Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <siarheit@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@gentoo.org> -Signed-off-by: Sergei Trofimovich <siarheit@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 - |