[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: ssh2: remove gcrypt patch

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
ee9fc6ba by Johannes Kauffmann at 2023-08-12T21:11:04+00:00
contrib: ssh2: remove gcrypt patch

The gpg-error-config tool seems to be used now for querying the correct
gpg-error flags. For gcrypt, the .pc provides the link flags.

- - - - -
180d194e by Johannes Kauffmann at 2023-08-12T21:11:04+00:00
contrib: ssh2: update to 1.11.0

For specifying the crypto library, use --with-crypto, as the previous
options seem to have been removed and now cause warnings.

The package can now be build without tests without patching Makefile.am,
by using --disable-tests.

The code touched by the UWP patch has gotten a proper UWP treatment
upstream. However, since 1.11.0 the ClearMemory feature is enabled by
default, and uses SecureZeroMemory. Thus, on UWP, add a dependency on
patched MinGW.

- - - - -
b23942d4 by Johannes Kauffmann at 2023-08-12T21:11:04+00:00
contrib: ssh2: remove RECONF

Without patching Makefile.am or m4 files, no need to autoreconf.

- - - - -


5 changed files:

- − contrib/src/ssh2/0001-fix-gcrypt-linking.patch
- contrib/src/ssh2/SHA512SUMS
- − contrib/src/ssh2/no-tests.patch
- contrib/src/ssh2/rules.mak
- − contrib/src/ssh2/winrt-no-agent.patch


Changes:

=====================================
contrib/src/ssh2/0001-fix-gcrypt-linking.patch deleted
=====================================
@@ -1,10 +0,0 @@
---- 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 @@
-e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30  libssh2-1.10.0.tar.gz
+ef85e152dc252bd9b1c05276972b9c22313f5d492743dde090235742746d67f634f2a419eff9162132e2274c8582113b75279b074e0c7b34b2526b92fd1a1e8e  libssh2-1.11.0.tar.gz


=====================================
contrib/src/ssh2/no-tests.patch deleted
=====================================
@@ -1,10 +0,0 @@
---- libssh2-1.4.3/Makefile.am.orig	2014-01-24 18:42:51.602763926 +0100
-+++ libssh2-1.4.3/Makefile.am	2014-01-24 18:42:58.522873002 +0100
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS = foreign nostdinc
- 
--SUBDIRS = src tests docs
-+SUBDIRS = src docs
- if BUILD_EXAMPLES
- SUBDIRS += example
- endif


=====================================
contrib/src/ssh2/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # ssh2
 
-LIBSSH2_VERSION := 1.10.0
+LIBSSH2_VERSION := 1.11.0
 LIBSSH2_URL := http://www.libssh2.org/download/libssh2-$(LIBSSH2_VERSION).tar.gz
 
 ifdef BUILD_NETWORK
@@ -17,20 +17,18 @@ $(TARBALLS)/libssh2-$(LIBSSH2_VERSION).tar.gz:
 
 ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2
 	$(UNPACK)
-	$(APPLY) $(SRC)/ssh2/no-tests.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
-endif
 	$(MOVE)
 
 DEPS_ssh2 = gcrypt $(DEPS_gcrypt)
+ifdef HAVE_WINSTORE
+# uses SecureZeroMemory
+DEPS_ssh2 += alloweduwp $(DEPS_alloweduwp)
+endif
 
-SSH2_CONF := --disable-examples-build --with-libgcrypt --without-openssl --without-mbedtls
+SSH2_CONF := --disable-examples-build --disable-tests --with-crypto=libgcrypt
 
 .ssh2: ssh2
-	$(RECONF)
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(SSH2_CONF)
 	+$(MAKEBUILD)


=====================================
contrib/src/ssh2/winrt-no-agent.patch deleted
=====================================
@@ -1,31 +0,0 @@
---- ssh2/src/agent.c.orig	2016-05-09 17:39:46.474593275 +0200
-+++ ssh2/src/agent.c	2016-05-09 17:40:03.058578212 +0200
-@@ -251,7 +251,7 @@
- };
- #endif  /* PF_UNIX */
- 
--#ifdef WIN32
-+#if defined(WIN32) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- /* Code to talk to Pageant was taken from PuTTY.
-  *
-  * Portions copyright Robert de Bath, Joris van Rantwijk, Delian
-@@ -353,7 +353,7 @@
-     const char *name;
-     struct agent_ops *ops;
- } supported_backends[] = {
--#ifdef WIN32
-+#if defined(WIN32) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-     {"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/-/compare/d3898bdd7a491382ac7458ede2b4222d63326cda...b23942d4a61612b84a3f4e85b294b3bb2c2e891e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d3898bdd7a491382ac7458ede2b4222d63326cda...b23942d4a61612b84a3f4e85b294b3bb2c2e891e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance