diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | vlc-sftp-libssh2.patch | 26 |
3 files changed, 36 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Mar 6 19:54:10 UTC 2019 +# Wed Mar 20 16:08:33 UTC 2019 pkgbase = vlc-nox pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (without X support) pkgver = 3.0.6 - pkgrel = 3 + pkgrel = 4 url = https://www.videolan.org/vlc/ arch = x86_64 license = LGPL2.1 @@ -162,10 +162,12 @@ pkgbase = vlc-nox source = update-vlc-plugin-cache.hook source = lua53_compat.patch source = vlc-libvpx18.patch + source = vlc-sftp-libssh2.patch sha512sums = 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52 sha512sums = 80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df sha512sums = 33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f sha512sums = 4392415e49232be0d1d39e70f15307b9fec01dfb6e720d4978e415b4798a13f20c401e6c7a7a099e164332ffa9555a01e9bb1ee6fa48fb9a83d497d6411d6a04 + sha512sums = 9eca31f3b7f2d6abe39bf2806da258166ea1fa3f8db0c18d484f3c384c52cf601de1265268dad070d89850545e67f4e380da3bddca00d3b7fc3524f554dee760 pkgname = vlc-nox @@ -8,7 +8,7 @@ _pkgbase=vlc pkgname=vlc-nox pkgver=3.0.6 -pkgrel=3 +pkgrel=4 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (without X support)' url='https://www.videolan.org/vlc/' arch=('x86_64') @@ -93,11 +93,13 @@ options=('!emptydirs') source=(http://download.videolan.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz update-vlc-plugin-cache.hook lua53_compat.patch - vlc-libvpx18.patch) + vlc-libvpx18.patch + vlc-sftp-libssh2.patch) sha512sums=('7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52' '80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df' '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f' - '4392415e49232be0d1d39e70f15307b9fec01dfb6e720d4978e415b4798a13f20c401e6c7a7a099e164332ffa9555a01e9bb1ee6fa48fb9a83d497d6411d6a04') + '4392415e49232be0d1d39e70f15307b9fec01dfb6e720d4978e415b4798a13f20c401e6c7a7a099e164332ffa9555a01e9bb1ee6fa48fb9a83d497d6411d6a04' + '6cd985a4b999f89e2aabb2527fb08895f51b6be0133fb09bcfc89d9ea108be3757ee2d6d0c7b1e47de83c68558f02852b3f90b033756cfeaff7d749767c33c19') prepare() { cd "${srcdir}/${_pkgbase}-${pkgver}" @@ -105,6 +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-libssh2.patch" sed 's|whoami|echo builduser|g' -i configure sed 's|hostname -f|echo arch|g' -i configure } diff --git a/vlc-sftp-libssh2.patch b/vlc-sftp-libssh2.patch new file mode 100644 index 000000000000..9d5f3fd7d861 --- /dev/null +++ b/vlc-sftp-libssh2.patch @@ -0,0 +1,26 @@ +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 e420b91ca9..dc7f6cc27f 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; +-- +2.21.0 |