[vlc-devel] [PATCH 1/3] Contribs: update ssh2 to 1.9.0

[김정석님(JUSTIN)]

From: "J. Kim" <jeongseok.kim at sk.com>

---
 contrib/src/ssh2/SHA512SUMS                   |  2 +-
 ...24b78a40126606797ef57a74066eb3b4b83f.patch | 49 -------------------
 contrib/src/ssh2/rules.mak                    |  3 +-
 3 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 contrib/src/ssh2/ced924b78a40126606797ef57a74066eb3b4b83f.patch

diff --git a/contrib/src/ssh2/SHA512SUMS b/contrib/src/ssh2/SHA512SUMS
index 4d156cdaa5..553e4d195a 100644
--- a/contrib/src/ssh2/SHA512SUMS
+++ b/contrib/src/ssh2/SHA512SUMS
@@ -1 +1 @@
-289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558  libssh2-1.8.0.tar.gz
+41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17  libssh2-1.9.0.tar.gz
diff --git a/contrib/src/ssh2/ced924b78a40126606797ef57a74066eb3b4b83f.patch b/contrib/src/ssh2/ced924b78a40126606797ef57a74066eb3b4b83f.patch
deleted file mode 100644
index b8e908d3af..0000000000
--- a/contrib/src/ssh2/ced924b78a40126606797ef57a74066eb3b4b83f.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ced924b78a40126606797ef57a74066eb3b4b83f 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>
diff --git a/contrib/src/ssh2/rules.mak b/contrib/src/ssh2/rules.mak
index ac7acfe2bc..bfd8e4998e 100644
--- a/contrib/src/ssh2/rules.mak
+++ b/contrib/src/ssh2/rules.mak
@@ -1,6 +1,6 @@
 # ssh2
 
-LIBSSH2_VERSION := 1.8.0
+LIBSSH2_VERSION := 1.9.0
 LIBSSH2_URL := http://www.libssh2.org/download/libssh2-$(LIBSSH2_VERSION).tar.gz
 
 ifdef BUILD_NETWORK
@@ -22,7 +22,6 @@ $(TARBALLS)/libssh2-$(LIBSSH2_VERSION).tar.gz:
 ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2
 	$(UNPACK)
 	$(APPLY) $(SRC)/ssh2/no-tests.patch
-	$(APPLY) $(SRC)/ssh2/ced924b78a40126606797ef57a74066eb3b4b83f.patch
 	$(APPLY) $(SRC)/ssh2/0001-Add-lgpg-error-to-.pc-to-facilitate-static-linking.patch
 	$(call pkg_static,"libssh2.pc.in")
 ifdef HAVE_WINSTORE
-- 
2.26.0