[vlc-commits] Contribs: update libssh2 to 1.8.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Apr  9 19:00:50 2017 +0200| [f67a27bc7f737c92a0d81fe3f832b1fc0adb28b2] | committer: Jean-Baptiste Kempf

Contribs: update libssh2 to 1.8.0

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f67a27bc7f737c92a0d81fe3f832b1fc0adb28b2
---

 contrib/src/ssh2/SHA512SUMS           |  2 +-
 contrib/src/ssh2/configure-zlib.patch | 10 ----------
 contrib/src/ssh2/gpg-error-pc.patch   | 11 -----------
 contrib/src/ssh2/rules.mak            |  7 +++----
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/contrib/src/ssh2/SHA512SUMS b/contrib/src/ssh2/SHA512SUMS
index 15a23ba9c7..4d156cdaa5 100644
--- a/contrib/src/ssh2/SHA512SUMS
+++ b/contrib/src/ssh2/SHA512SUMS
@@ -1 +1 @@
-707e0634b74fcf0f5ae4e46d9807907db7cd09328d553a67c49e9e11d852ae85843a7dcbe3f002e639eb2704e53e865c640c8fe85dcada330d0160708e8b5177  libssh2-1.4.3.tar.gz
+289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558  libssh2-1.8.0.tar.gz
diff --git a/contrib/src/ssh2/configure-zlib.patch b/contrib/src/ssh2/configure-zlib.patch
deleted file mode 100644
index 78d1fd71e6..0000000000
--- a/contrib/src/ssh2/configure-zlib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ssh2/configure.ac	2015-02-24 10:09:30.662277334 +0100
-+++ ssh2/configure.ac.new	2015-02-24 10:08:57.658394756 +0100
-@@ -133,6 +133,7 @@
-     AC_MSG_NOTICE([Try --with-libz-prefix=PATH if you know you have it])
-   else
-     AC_DEFINE(LIBSSH2_HAVE_ZLIB, 1, [Compile in zlib support])
-+    LIBS="$LIBS -lz"
-   fi
- fi
- 
diff --git a/contrib/src/ssh2/gpg-error-pc.patch b/contrib/src/ssh2/gpg-error-pc.patch
deleted file mode 100644
index 94a731b46a..0000000000
--- a/contrib/src/ssh2/gpg-error-pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 789ebfbba4..77aafdf7be 100644
--- a/contrib/src/ssh2/rules.mak
+++ b/contrib/src/ssh2/rules.mak
@@ -1,6 +1,6 @@
 # ssh2
 
-LIBSSH2_VERSION := 1.4.3
+LIBSSH2_VERSION := 1.8.0
 LIBSSH2_URL := http://www.libssh2.org/download/libssh2-$(LIBSSH2_VERSION).tar.gz
 
 ifdef BUILD_NETWORK
@@ -22,8 +22,7 @@ $(TARBALLS)/libssh2-$(LIBSSH2_VERSION).tar.gz:
 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
+	$(APPLY) $(SRC)/ssh2/ced924b78a40126606797ef57a74066eb3b4b83f.patch
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/ssh2/winrt-no-agent.patch
 endif
@@ -33,6 +32,6 @@ DEPS_ssh2 = gcrypt $(DEPS_gcrypt)
 
 .ssh2: ssh2
 	$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(BROKEN_GCC_CFLAGS) $(HOSTCONF) --disable-examples-build --with-libgcrypt --without-openssl
+	cd $< && $(HOSTVARS) ./configure $(BROKEN_GCC_CFLAGS) $(HOSTCONF) --disable-examples-build --with-libgcrypt --without-openssl --without-mbedtls
 	cd $< && $(MAKE) install
 	touch $@