manfred-h/ffmpeg-5
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-5
Code Pull Requests Activity

Revert renames rejected by factory-auto in rq 1189525

Browse Source
This commit is contained in:
Jan Engelhardt 2024-07-27 07:55:53 +02:00
parent e2830ed12e
commit a11e95f56f
10 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ffmpeg-4-CVE-2020-22046.patch → ffmpeg-4.4-CVE-2020-22046.patch
View File

15
ffmpeg-5.changes
View File

@ -13,19 +13,6 @@ Tue Jul 2 11:57:01 UTC 2024 - Cliff Zhao <qzhao@suse.com>
grain metadata.
(CVE-2024-32228, bsc#1227277)
-------------------------------------------------------------------
Tue Jul 2 11:28:10 UTC 2024 - Cliff Zhao <qzhao@suse.com>
- Rename CVE patches as SUSE CVE standard:(package name)-%(CVE number)
ffmpeg-4.4-CVE-2020-22046.patch
ffmpeg-5-CVE-2023-50007.patch
ffmpeg-5-CVE-2023-50008.patch
ffmpeg-5-CVE-2023-49502.patch
ffmpeg-5-CVE-2023-51793.patch
ffmpeg-5-CVE-2023-50009.patch
ffmpeg-Templatify-ff_gaussian_blur-and-ff-function.patch
ffmpeg-5-CVE-2023-50010.patch
-------------------------------------------------------------------
Tue Apr 27 11:38:35 UTC 2024 - Cliff Zhao <qzhao@suse.com>
@ -50,7 +37,7 @@ Tue Apr 26 12:18:26 UTC 2024 - Cliff Zhao <qzhao@suse.com>
-------------------------------------------------------------------
Tue Apr 24 10:48:32 UTC 2024 - Cliff Zhao <qzhao@suse.com>
- Add ffmpeg-5-CVE-2023-50009-shim-cf1f5744.patch:
- Add ffmpeg-Templatify-ff_gaussian_blur-and-ff-function.patch:
Backporting cf1f5744 from upstream, Templatify function
ff_gaussian_blur and ff_sobel to prepare fix support for CVE-2023-50009.
(CVE-2023-50009 bsc#1223255)

31
ffmpeg-5.spec
View File

@ -17,9 +17,6 @@
%define flavor @BUILD_FLAVOR@%{nil}
#
# preamble is present twice, watch out
#
%if "%{flavor}" != "ffmpeg-5-mini"
# Create proper conflicts to make sure we require all from one version
@ -107,7 +104,7 @@ Patch2: ffmpeg-new-coder-errors.diff
Patch3: ffmpeg-codec-choice.diff
Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch
Patch5: work-around-abi-break.patch
Patch9: ffmpeg-4-CVE-2020-22046.patch
Patch9: ffmpeg-4.4-CVE-2020-22046.patch
Patch10: 0001-avfilter-af_dialoguenhance-fix-overreads.patch
Patch11: 0001-avfilter-af_dialoguenhance-simplify-channels-copy.patch
Patch12: 0001-avfilter-af_dialoguenhance-do-output-scaling-once.patch
@ -119,15 +116,18 @@ Patch17: 0001-avfilter-af_stereowiden-Check-length.patch
Patch90: ffmpeg-chromium.patch
Patch91: ffmpeg-dlopen-openh264.patch
Patch93: soname.diff
Patch94: ffmpeg-5-CVE-2023-50007.patch
Patch95: ffmpeg-5-CVE-2023-50008.patch
Patch96: ffmpeg-5-CVE-2023-49502.patch
Patch97: ffmpeg-5-CVE-2023-51793.patch
Patch98: ffmpeg-5-CVE-2023-50009-shim-cf1f5744.patch
Patch99: ffmpeg-5-CVE-2023-50009.patch
Patch100: ffmpeg-5-CVE-2023-50010.patch
Patch94: ffmpeg-CVE-2023-50007.patch
Patch95: ffmpeg-CVE-2023-50008.patch
Patch96: ffmpeg-CVE-2023-49502.patch
Patch97: ffmpeg-CVE-2023-51793.patch
Patch98: ffmpeg-Templatify-ff_gaussian_blur-and-ff-function.patch
Patch99: ffmpeg-CVE-2023-50009.patch
Patch100: ffmpeg-CVE-2023-50010.patch
Patch101: ffmpeg-5-CVE-2024-32228.patch
Patch102: ffmpeg-5-CVE-2024-32230.patch
#
# preamble is present twice, watch out
#
%if %{with amf_sdk}
BuildRequires: AMF-devel
%endif
@ -855,14 +855,15 @@ Patch17: 0001-avfilter-af_stereowiden-Check-length.patch
Patch90: ffmpeg-chromium.patch
Patch91: ffmpeg-dlopen-openh264.patch
Patch93: soname.diff
# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-50007.patch CVE-2023-50007 bsc#1223253 qzhao@suse.com -- Fix crash with EOF handling.
Patch94: ffmpeg-CVE-2023-50007.patch
# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-50008.patch CVE-2023-50008 bsc#1223254 qzhao@suse.com -- Fix memory leaks.
Patch95: ffmpeg-CVE-2023-50008.patch
# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-49502.patch CVE-2023-49502 bsc#1223235 qzhao@suse.com -- Account for chroma sub-sampling in min size calculation.
Patch96: ffmpeg-CVE-2023-49502.patch
# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-51793.patch CVE-2023-51793 bsc#1223272 qzhao@suse.com -- Fix odd height handling.
Patch97: ffmpeg-CVE-2023-51793.patch
Patch98: ffmpeg-Templatify-ff_gaussian_blur-and-ff-function.patch
Patch99: ffmpeg-CVE-2023-50009.patch
Patch100: ffmpeg-CVE-2023-50010.patch
Patch101: ffmpeg-5-CVE-2024-32228.patch
Patch102: ffmpeg-5-CVE-2024-32230.patch
BuildRequires: c_compiler
Requires: this-is-only-for-build-envs

0
ffmpeg-5-CVE-2023-49502.patch → ffmpeg-CVE-2023-49502.patch
View File

0
ffmpeg-5-CVE-2023-50007.patch → ffmpeg-CVE-2023-50007.patch
View File

0
ffmpeg-5-CVE-2023-50008.patch → ffmpeg-CVE-2023-50008.patch
View File

0
ffmpeg-5-CVE-2023-50009.patch → ffmpeg-CVE-2023-50009.patch
View File

0
ffmpeg-5-CVE-2023-50010.patch → ffmpeg-CVE-2023-50010.patch
View File

0
ffmpeg-5-CVE-2023-51793.patch → ffmpeg-CVE-2023-51793.patch
View File

13
ffmpeg-5-CVE-2023-50009-shim-cf1f5744.patch → ffmpeg-Templatify-ff_gaussian_blur-and-ff-function.patch
View File

@ -1,14 +1,16 @@
commit cf1f57443158bcbe84a213e8dc631a302993f9a2
Author: Thilo Borgmann <thilo.borgmann@mail.de>
Date: Mon Jul 18 16:09:46 2022 +0200
Subject: lavfi/edge_common: Templatify ff_gaussian_blur and ff_sobel
References: CVE-2023-50009
References: bsc#1172423
Upstream: Backport from upstream
References: https://bugzilla.opensuse.org/1172423
Backport cf1f5744 from upstream, Templatify function ff_gaussian_blur
and ff_sobel to prepare fix support for CVE-2023-50009. -qzhao
lavfi/edge_common: Templatify ff_gaussian_blur and ff_sobel
[Backport cf1f5744 from upstream, Templatify function ff_gaussian_blur
and ff_sobel to prepare fix support for CVE-2023-50009. -qzhao]
diff --git a/libavfilter/edge_common.c b/libavfilter/edge_common.c
index d72e8521cd..ebd47d7c53 100644
--- a/libavfilter/edge_common.c
+++ b/libavfilter/edge_common.c
@@ -46,33 +46,13 @@ static int get_rounded_direction(int gx, int gy)
@ -310,3 +312,4 @@ index 90390ceb3e..603f06f141 100644
* ignore the rest, so we need a clean output buffer */
--
2.41.0