From 810db304f3766699ce758aa98e72cd7c5793a6bb1b3ba6e9fb00a6d3bee98807 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 14 Aug 2024 08:49:42 +0000 Subject: [PATCH] - Disable ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch and ffmpeg-6-CVE-2024-32228.patch as they brake compilation with BUILD_ORIG enabled, i.e. Packman. Packages in Packman fail to build for quite some time now. I bisected it to these two patches. Can we please disable for now until we get a proper solution so that Packman users get at least CVE fixes for the rest? Thx! OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=43 --- ffmpeg-6.changes | 7 +++++++ ffmpeg-6.spec | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ffmpeg-6.changes b/ffmpeg-6.changes index f98e0c9..331b21a 100644 --- a/ffmpeg-6.changes +++ b/ffmpeg-6.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 13 18:59:14 UTC 2024 - Manfred Hollstein + +- Disable ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch and + ffmpeg-6-CVE-2024-32228.patch as they brake compilation with + BUILD_ORIG enabled, i.e. Packman. + ------------------------------------------------------------------- Fri Jul 26 14:28:59 UTC 2024 - Filip Kastl diff --git a/ffmpeg-6.spec b/ffmpeg-6.spec index 78ef649..d3f8f93 100644 --- a/ffmpeg-6.spec +++ b/ffmpeg-6.spec @@ -121,8 +121,8 @@ Patch92: ffmpeg-CVE-2023-50007.patch Patch93: ffmpeg-CVE-2023-50008.patch Patch94: ffmpeg-6-CVE-2024-32228-shim-1535d338.patch Patch95: ffmpeg-6-CVE-2024-32228-shim-f50382cb.patch -Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch -Patch97: ffmpeg-6-CVE-2024-32228.patch +#Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch +#Patch97: ffmpeg-6-CVE-2024-32228.patch Patch98: ffmpeg-6-CVE-2024-32230.patch Patch99: ffmpeg-c99.patch # @@ -852,8 +852,8 @@ Patch92: ffmpeg-CVE-2023-50007.patch Patch93: ffmpeg-CVE-2023-50008.patch Patch94: ffmpeg-6-CVE-2024-32228-shim-1535d338.patch Patch95: ffmpeg-6-CVE-2024-32228-shim-f50382cb.patch -Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch -Patch97: ffmpeg-6-CVE-2024-32228.patch +#Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch +#Patch97: ffmpeg-6-CVE-2024-32228.patch Patch98: ffmpeg-6-CVE-2024-32230.patch Patch99: ffmpeg-c99.patch BuildRequires: c_compiler