[ffmpeg/el7] Release 3.4.6

commit d67dc5d9599d989ae06c89b8691a737d37397c1d Author: Leigh Scott <leigh123linux(a)googlemail.com&gt; Date: Sun Mar 31 17:11:18 2019 +0100 Release 3.4.6 ...lsubtitles-Fixes-denial-of-service-due-to.patch | 65 ---------------------- ...lsubtitles-Fixes-denial-of-service-due-to.patch | 64 --------------------- ffmpeg.spec | 15 ++--- sources | 2 +- 4 files changed, 6 insertions(+), 140 deletions(-) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index d2f3a0f..b4c9a1d 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -67,8 +67,8 @@ Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} -Version: 3.4.5 -Release: 3%{?date}%{?date:git}%{?rel}%{?dist} +Version: 3.4.6 +Release: 1%{?date}%{?date:git}%{?rel}%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ %if 0%{?date} @@ -78,12 +78,6 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz %endif #Backport patch for arm neon Patch0: 0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch -# https://nvd.nist.gov/vuln/detail/CVE-2019-9718 -# https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/1f00c97bc3475c477f3c468cf... -Patch1: 0001-avcodec-htmlsubtitles-Fixes-denial-of-service-due-to.patch -# https://nvd.nist.gov/vuln/detail/CVE-2019-9721 -# https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/894995c41e0795c7a44f81adc... -Patch2: 0002-avcodec-htmlsubtitles-Fixes-denial-of-service-due-to.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}} %{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}} @@ -302,8 +296,6 @@ echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION %endif # backport patch for arm neon %patch0 -p1 -%patch1 -p1 -b .CVE-2019-9718 -%patch2 -p1 -b .CVE-2019-9721 # fix -O3 -g in host_cflags sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure mkdir -p _doc/examples @@ -410,6 +402,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.4.6-1 +- Release 3.4.6 + * Tue Mar 19 2019 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.4.5-3 - Patch to fix CVE-2019-9718 and CVE-2019-9721 diff --git a/sources b/sources index 13558d9..8195197 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b91ca21ff8ff6912226516fede49b0cb ffmpeg-3.4.5.tar.xz +ff3e96b56edc485a91673392610afa08 ffmpeg-3.4.6.tar.xz