From 57c0d21bb483181690e2db6123ced86a972dbf1643adb85a209cf1aef401d244 Mon Sep 17 00:00:00 2001 From: ZhaoQiang Date: Thu, 1 Aug 2024 01:32:26 +0800 Subject: [PATCH] Rename patches to fit SUSE CVE submit requirement. --- ...046.patch => ffmpeg-4-CVE-2020-22046.patch | 0 ...502.patch => ffmpeg-4-CVE-2023-49502.patch | 0 ...010.patch => ffmpeg-4-CVE-2023-50010.patch | 0 ...793.patch => ffmpeg-4-CVE-2023-51793.patch | 0 ...gth.patch => ffmpeg-4-CVE-2023-51794.patch | 0 ...ion.patch => ffmpeg-4-CVE-2023-51798.patch | 0 ...ent.patch => ffmpeg-4-CVE-2024-31578.patch | 0 ffmpeg-4.changes | 30 +++++++++++++------ ffmpeg-4.spec | 17 +++++------ 9 files changed, 28 insertions(+), 19 deletions(-) rename ffmpeg-4.4-CVE-2020-22046.patch => ffmpeg-4-CVE-2020-22046.patch (100%) rename ffmpeg-CVE-2023-49502.patch => ffmpeg-4-CVE-2023-49502.patch (100%) rename ffmpeg-CVE-2023-50010.patch => ffmpeg-4-CVE-2023-50010.patch (100%) rename ffmpeg-CVE-2023-51793.patch => ffmpeg-4-CVE-2023-51793.patch (100%) rename 0001-avfilter-af_stereowiden-Check-length.patch => ffmpeg-4-CVE-2023-51794.patch (100%) rename 0001-avfilter-vf_minterpolate-Check-pts-before-division.patch => ffmpeg-4-CVE-2023-51798.patch (100%) rename 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch => ffmpeg-4-CVE-2024-31578.patch (100%) diff --git a/ffmpeg-4.4-CVE-2020-22046.patch b/ffmpeg-4-CVE-2020-22046.patch similarity index 100% rename from ffmpeg-4.4-CVE-2020-22046.patch rename to ffmpeg-4-CVE-2020-22046.patch diff --git a/ffmpeg-CVE-2023-49502.patch b/ffmpeg-4-CVE-2023-49502.patch similarity index 100% rename from ffmpeg-CVE-2023-49502.patch rename to ffmpeg-4-CVE-2023-49502.patch diff --git a/ffmpeg-CVE-2023-50010.patch b/ffmpeg-4-CVE-2023-50010.patch similarity index 100% rename from ffmpeg-CVE-2023-50010.patch rename to ffmpeg-4-CVE-2023-50010.patch diff --git a/ffmpeg-CVE-2023-51793.patch b/ffmpeg-4-CVE-2023-51793.patch similarity index 100% rename from ffmpeg-CVE-2023-51793.patch rename to ffmpeg-4-CVE-2023-51793.patch diff --git a/0001-avfilter-af_stereowiden-Check-length.patch b/ffmpeg-4-CVE-2023-51794.patch similarity index 100% rename from 0001-avfilter-af_stereowiden-Check-length.patch rename to ffmpeg-4-CVE-2023-51794.patch diff --git a/0001-avfilter-vf_minterpolate-Check-pts-before-division.patch b/ffmpeg-4-CVE-2023-51798.patch similarity index 100% rename from 0001-avfilter-vf_minterpolate-Check-pts-before-division.patch rename to ffmpeg-4-CVE-2023-51798.patch diff --git a/0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch b/ffmpeg-4-CVE-2024-31578.patch similarity index 100% rename from 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch rename to ffmpeg-4-CVE-2024-31578.patch diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index be8559c..7412abc 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jul 28 15:21:18 UTC 2024 - Cliff Zhao + +- Update ffmpeg-4.4-CVE-2020-22046.patch + ffmpeg-CVE-2023-49502.patch + ffmpeg-CVE-2023-50010.patch + ffmpeg-CVE-2023-51793.patch + 0001-avfilter-af_stereowiden-Check-length.patch + 0001-avfilter-vf_minterpolate-Check-pts-before-division.patch + 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch + Rename patches and adjust changelog format to fit SUSE CVE fix format. + ------------------------------------------------------------------- Fri Jul 26 13:19:42 UTC 2024 - Filip Kastl @@ -22,7 +34,7 @@ Tue Apr 27 11:38:35 UTC 2024 - Cliff Zhao Fri Apr 26 22:16:48 UTC 2024 - Jan Engelhardt - Add 0001-avfilter-af_stereowiden-Check-length.patch - [boo#1223437, CVE-2023-51794] + (boo#1223437, CVE-2023-51794) ------------------------------------------------------------------- Thu Apr 23 16:14:18 UTC 2024 - Cliff Zhao @@ -92,7 +104,7 @@ Wed Apr 19 21:00:41 UTC 2023 - Bjørn Lie * avcodec/012v: Order operations for odd size handling * avcodec/alsdec: The minimal block is at least 7 bits * avcodec/bink: - - Avoid undefined out of array end pointers in + - Avoid undefined out of array end pointers in binkb_decode_plane() - Fix off by 1 error in ref end * avcodec/eac3dec: avoid float noise in fixed mode addition to @@ -276,7 +288,7 @@ Tue Aug 10 09:38:39 UTC 2021 - Alynx Zhou ------------------------------------------------------------------- Sat Jul 10 10:11:32 UTC 2021 - Hans-Peter Jansen -- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains +- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains a goto to a none existing label. In order to distinguish this patch from the original, I renamed it to ffmpeg-4.4-CVE-2020-22046.patch @@ -302,7 +314,7 @@ Fri Jun 4 12:29:16 UTC 2021 - Jan Engelhardt ------------------------------------------------------------------- Thu May 20 23:16:09 UTC 2021 - Daniel Molkentin -- Enable vulkan on on Leap 15 +- Enable vulkan on on Leap 15 ------------------------------------------------------------------- Fri Apr 16 10:20:15 UTC 2021 - Jan Engelhardt @@ -321,8 +333,8 @@ Fri Apr 9 18:52:46 UTC 2021 - Jan Engelhardt Sun Mar 14 21:08:02 UTC 2021 - Dirk Müller - update to 4.3.2: - * lots of oss-fuzz reported overflow fixes, see included ChangeLog -- drop + * lots of oss-fuzz reported overflow fixes, see included ChangeLog +- drop ffmpeg.git-ba3e771a42c29ee02c34e7769cfc1b2dbc5c760a.patch 0001-lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch 0001-avformat-vividas-improve-extradata-packing-checks-in.patch: upstream @@ -338,7 +350,7 @@ Sun Jan 24 11:22:02 UTC 2021 - Dirk Müller - remove dependency on OpenJPEG, this is obsolete since ffmpeg 4.0, we already build against OpenJPEG 2.1. - see changes: + see changes: - Dropped support for OpenJPEG versions 2.0 and below. Using OpenJPEG now requires 2.1 (or later) and pkg-config. @@ -370,7 +382,7 @@ Mon Jul 27 13:39:27 UTC 2020 - Hans-Peter Jansen ------------------------------------------------------------------- Thu Jul 16 10:49:02 UTC 2020 - Alexander Reimelt -- Add librav1e support +- Add librav1e support ------------------------------------------------------------------- Sun Jul 12 16:08:10 UTC 2020 - Bjørn Lie @@ -437,7 +449,7 @@ Fri Mar 31 00:41:22 UTC 2020 - Ismail Dönmez - Add Samba support for Factory (as this needs a fix in Samba itself) Add --enable-libsmbclient to configure, add BR on pkgconfig(smbclient) - License is now GPLv3+ by default (--enable-version3) - + ------------------------------------------------------------------- Mon Mar 30 07:14:39 UTC 2020 - Tomáš Chvátal diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 463007c..8aba6e1 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -104,9 +104,6 @@ Summary: Set of libraries for working with various multimedia formats License: GPL-3.0-or-later Group: Productivity/Multimedia/Video/Editors and Convertors URL: https://ffmpeg.org/ - -#Freshcode-URL: http://freshcode.club/projects/ffmpeg -#Git-Clone: git://source.ffmpeg.org/ffmpeg Source: https://www.ffmpeg.org/releases/%_name-%version.tar.xz Source2: https://www.ffmpeg.org/releases/%_name-%version.tar.xz.asc Source3: ffmpeg-4-rpmlintrc @@ -119,18 +116,18 @@ Patch2: ffmpeg-new-coder-errors.diff Patch3: ffmpeg-codec-choice.diff Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch Patch5: soversion.patch -Patch9: ffmpeg-4.4-CVE-2020-22046.patch +Patch9: ffmpeg-4-CVE-2020-22046.patch Patch10: ffmpeg-chromium.patch Patch11: ffmpeg-libglslang-detection.patch Patch12: 0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch Patch13: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch Patch14: ffmpeg-glslang-cxx17.patch -Patch15: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch -Patch16: 0001-avfilter-vf_minterpolate-Check-pts-before-division.patch -Patch17: ffmpeg-CVE-2023-49502.patch -Patch18: ffmpeg-CVE-2023-51793.patch -Patch19: 0001-avfilter-af_stereowiden-Check-length.patch -Patch20: ffmpeg-CVE-2023-50010.patch +Patch15: ffmpeg-4-CVE-2024-31578.patch +Patch16: ffmpeg-4-CVE-2023-51798.patch +Patch17: ffmpeg-4-CVE-2023-49502.patch +Patch18: ffmpeg-4-CVE-2023-51793.patch +Patch19: ffmpeg-4-CVE-2023-51794.patch +Patch20: ffmpeg-4-CVE-2023-50010.patch Patch21: ffmpeg-4-CVE-2024-32230.patch Patch22: ffmpeg-c99.patch BuildRequires: ladspa-devel