media-video/vlc: fix build with sftp

Closes: https://bugs.gentoo.org/681764
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/11597
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/media-video/vlc/files/vlc-3.0.6-sftp.patch b/media-video/vlc/files/vlc-3.0.6-sftp.patch
new file mode 100644 (file)
index 0000000..3092bf5
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-sftp.patch
@@ -0,0 +1,24 @@
+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.
+---
+ modules/access/sftp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/access/sftp.c b/modules/access/sftp.c
+index e420b91ca93..dc7f6cc27f7 100644
+--- a/modules/access/sftp.c
++++ b/modules/access/sftp.c
+@@ -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;
+-#if LIBSSH2_VERSION_NUM >= 0x010801
++#if LIBSSH2_VERSION_NUM >= 0x010900
+         case LIBSSH2_HOSTKEY_TYPE_ECDSA_256:
+             knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_ECDSA_256;
+             break;

diff --git a/media-video/vlc/vlc-3.0.6-r1.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild
index e53ae722722db1061998c87dbb8c8694d7c12491..42b4075acb2750e71987817d02d363492e0ba1ff 100644 (file)
--- a/media-video/vlc/vlc-3.0.6-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.6-r1.ebuild
@@ -234,6 +234,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-libvpx-1.8.0.patch # bug 677606
        "${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290
        "${FILESDIR}"/${P}-libav.patch
+       "${FILESDIR}"/${P}-sftp.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )