Commit 9a1ed782 authored by Booloki's avatar Booloki
Browse files

sftp-libssh2 patch improvements

parent e741df0e
Pipeline #378 failed with stage
in 8 minutes and 8 seconds
......@@ -94,12 +94,12 @@ source=(http://download.videolan.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}
update-vlc-plugin-cache.hook
lua53_compat.patch
vlc-libvpx18.patch
vlc-sftp-libssh.patch)
vlc-sftp-libssh2.patch)
sha512sums=('7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52'
'80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df'
'33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f'
'4392415e49232be0d1d39e70f15307b9fec01dfb6e720d4978e415b4798a13f20c401e6c7a7a099e164332ffa9555a01e9bb1ee6fa48fb9a83d497d6411d6a04'
'9eca31f3b7f2d6abe39bf2806da258166ea1fa3f8db0c18d484f3c384c52cf601de1265268dad070d89850545e67f4e380da3bddca00d3b7fc3524f554dee760')
'6cd985a4b999f89e2aabb2527fb08895f51b6be0133fb09bcfc89d9ea108be3757ee2d6d0c7b1e47de83c68558f02852b3f90b033756cfeaff7d749767c33c19')
prepare() {
cd "${srcdir}/${_pkgbase}-${pkgver}"
......@@ -107,7 +107,7 @@ prepare() {
sed -e 's|-Werror-implicit-function-declaration||g' -i configure
patch -Np1 < "${srcdir}/lua53_compat.patch"
patch -Np1 < "${srcdir}/vlc-libvpx18.patch"
patch -Np1 < "${srcdir}/vlc-sftp-libssh.patch"
patch -Np1 < "${srcdir}/vlc-sftp-libssh2.patch"
sed 's|whoami|echo builduser|g' -i configure
sed 's|hostname -f|echo arch|g' -i configure
}
......
From 11449b5cd8b415768e010d9b7c1d6ba3cea21f82
From: Rémi Denis-Courmont
Subject: sftp: fix version for ECDSA known hosts (fixes #22060)
From 11449b5cd8b415768e010d9b7c1d6ba3cea21f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Wed, 20 Mar 2019 05:20:30 +0200
Subject: [PATCH] sftp: fix version for ECDSA known hosts (fixes #22060)
1.8.x is a stable branch, separate from the feature branch that contains
the ECDSA support
the ECDSA support.
---
modules/access/sftp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
# https://github.com/videolan/vlc/commit/11449b5cd8b415768e010d9b7c1d6ba3cea21f82#diff-49579e86ef0fcb134c24449827c7c195
diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index e420b91ca9..dc7f6cc27f 100644
--- a/modules/access/sftp.c
+++ b/modules/access/sftp.c
@@ -306,7 +306,7 @@
@@ -307,7 +307,7 @@ static int Open( vlc_object_t* p_this )
case LIBSSH2_HOSTKEY_TYPE_DSS:
knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_SSHDSS;
break;
......@@ -19,3 +22,5 @@ the ECDSA support
case LIBSSH2_HOSTKEY_TYPE_ECDSA_256:
knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_ECDSA_256;
break;
--
2.21.0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment