commit 604596387379849e9ca1152177e3cd2ad7fc924c Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Sat Jul 27 14:19:19 2019 +0200 Add patch for gnutls set_default_priority Use-gnutls_set_default_priority.patch | 35 +++++++++++++++++++++++++++++++++++ ffmpeg.spec | 2 ++ 2 files changed, 37 insertions(+) --- diff --git a/Use-gnutls_set_default_priority.patch b/Use-gnutls_set_default_priority.patch new file mode 100644 index 0000000..dffe2a8 --- /dev/null +++ b/Use-gnutls_set_default_priority.patch @@ -0,0 +1,35 @@ +From 58eb69d5f471a7d6c13d54e235164595a0968049 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet <kwizart(a)gmail.com&gt; +Date: Sat, 15 Jun 2019 16:18:42 +0200 +Subject: [PATCH] Use gnutls_set_default_priority + +This will use the default priority for gnutls. + +When supported, the priority will be set to @SYSTEM which allows to +adapt the ciphers list at runtime according to the policy set. + +See also: +https://fedoraproject.org/wiki/Packaging:CryptoPolicies +https://wiki.debian.org/CryptoPolicy + +Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com&gt; +--- + libavformat/tls_gnutls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c +index f32bc2821b..b30e8ea007 100644 +--- a/libavformat/tls_gnutls.c ++++ b/libavformat/tls_gnutls.c +@@ -181,7 +181,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op + gnutls_transport_set_pull_function(p->session, gnutls_url_pull); + gnutls_transport_set_push_function(p->session, gnutls_url_push); + gnutls_transport_set_ptr(p->session, c->tcp); +- gnutls_priority_set_direct(p->session, "NORMAL", NULL); ++ gnutls_set_default_priority (p->session); + do { + ret = gnutls_handshake(p->session); + if (gnutls_error_is_fatal(ret)) { +-- +2.17.2 + diff --git a/ffmpeg.spec b/ffmpeg.spec index 423c75a..ca6d8c4 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -98,6 +98,8 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz #Backport avutil/mem: Fix invalid use of av_alloc_size #See rfbz#5221 Patch0: 4361293fcf59edb56879c36edcd25f0a91e0edf8.patch +#http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2019-July/246927.html +Patch1: Use-gnutls_set_default_priority.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} %{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}