[vlc-commits] [Git][videolan/vlc][master] Contribs: update ssh2 to 1.10.0
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Sun May 29 00:01:24 UTC 2022
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
aecaaec7 by Jean-Baptiste Kempf at 2022-05-28T21:16:16+00:00
Contribs: update ssh2 to 1.10.0
See #26921
- - - - -
6 changed files:
- − contrib/src/ssh2/0001-Add-lgpg-error-to-.pc-to-facilitate-static-linking.patch
- + contrib/src/ssh2/0001-fix-gcrypt-linking.patch
- contrib/src/ssh2/SHA512SUMS
- − contrib/src/ssh2/ced924b78a40126606797ef57a74066eb3b4b83f.patch
- contrib/src/ssh2/rules.mak
- contrib/src/ssh2/winrt-no-agent.patch
Changes:
=====================================
contrib/src/ssh2/0001-Add-lgpg-error-to-.pc-to-facilitate-static-linking.patch deleted
=====================================
@@ -1,30 +0,0 @@
-From 2fc4ef54ec61e98e757a49719b859d8ee59af952 Mon Sep 17 00:00:00 2001
-From: Mikhail Gusarov <dottedmag at dottedmag.net>
-Date: Wed, 3 Sep 2014 15:47:19 +0200
-Subject: [PATCH] Add -lgpg-error to .pc to facilitate static linking
-
-Note that this patch is Debian-specific as we know that libssh2 is linked
-to gcrypt.
-
-Patching configure.ac to add gpg-error as a dependent library is not good, as it
-would cause overlinking of libssh2, and there is no separate variable for
-"static dependencies".
-
-All this mess ought to be solved in gcrypt inself by providing .pc file,
-but it is not.
-
----
- libssh2.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libssh2/libssh2.pc.in
-===================================================================
---- libssh2.orig/libssh2.pc.in
-+++ libssh2/libssh2.pc.in
-@@ -13,5 +13,5 @@ Description: Library for SSH-based commu
- Version: @LIBSSH2VER@
- Requires.private: @LIBSREQUIRED@
- Libs: -L${libdir} -lssh2 @LIBS@
--Libs.private: @LIBS@
-+Libs.private: @LIBS@ -lgpg-error
- Cflags: -I${includedir}
=====================================
contrib/src/ssh2/0001-fix-gcrypt-linking.patch
=====================================
@@ -0,0 +1,10 @@
+--- ssh2/acinclude.m4.orig 2022-05-08 22:01:39.704273920 +0200
++++ ssh2/acinclude.m4 2022-05-27 15:24:17.697253672 +0200
+@@ -434,6 +434,7 @@
+ [libgcrypt], [
+ LIBSSH2_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>], [
+ AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use $1])
++ LIBS="$LIBS -lgcrypt -lgpg-error"
+ found_crypto="$1"
+ ])
+ ],
=====================================
contrib/src/ssh2/SHA512SUMS
=====================================
@@ -1 +1 @@
-289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558 libssh2-1.8.0.tar.gz
+e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30 libssh2-1.10.0.tar.gz
=====================================
contrib/src/ssh2/ced924b78a40126606797ef57a74066eb3b4b83f.patch deleted
=====================================
@@ -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>
=====================================
contrib/src/ssh2/rules.mak
=====================================
@@ -1,6 +1,6 @@
# ssh2
-LIBSSH2_VERSION := 1.8.0
+LIBSSH2_VERSION := 1.10.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/ced924b78a40126606797ef57a74066eb3b4b83f.patch
- $(APPLY) $(SRC)/ssh2/0001-Add-lgpg-error-to-.pc-to-facilitate-static-linking.patch
+ $(APPLY) $(SRC)/ssh2/0001-fix-gcrypt-linking.patch
$(call pkg_static,"libssh2.pc.in")
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/ssh2/winrt-no-agent.patch
=====================================
contrib/src/ssh2/winrt-no-agent.patch
=====================================
@@ -18,3 +18,14 @@
{"Pageant", &agent_ops_pageant},
#endif /* WIN32 */
#ifdef PF_UNIX
+--- ssh2/src/agent_win.c.orig 2022-05-27 20:17:14.311901449 +0200
++++ ssh2/src/agent_win.c 2022-05-27 20:16:25.851861610 +0200
+@@ -55,7 +55,7 @@
+ #include <stdlib.h>
+ #endif
+
+-#ifdef WIN32
++#if defined(WIN32) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+ /* Code to talk to OpenSSH was taken and modified from the Win32 port of
+ * Portable OpenSSH by the PowerShell team. Commit
+ * 8ab565c53f3619d6a1f5ac229e212cad8a52852c of
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/aecaaec7fa874a2f3c76f4c99142b1bee4697bae
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/aecaaec7fa874a2f3c76f4c99142b1bee4697bae
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list