From e22a461db0181f197346f4ad5e4263fc84582e49b9824a06413f39d51b9496e9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Apr 2024 08:13:03 +0000 Subject: [PATCH] Move metadata into patch/use established git patch line tags as far as doable OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=35 --- ffmpeg-6.spec | 4 ---- ffmpeg-CVE-2023-50007.patch | 11 ++++++----- ffmpeg-CVE-2023-50008.patch | 11 ++++++----- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ffmpeg-6.spec b/ffmpeg-6.spec index 7ab050d..6f1d14b 100644 --- a/ffmpeg-6.spec +++ b/ffmpeg-6.spec @@ -120,9 +120,7 @@ Patch12: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch Patch90: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch -# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-50007.patch CVE-2023-50007 bsc#1223253 qzhao@suse.com -- Fix crash with EOF handling. Patch92: ffmpeg-CVE-2023-50007.patch -# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-50008.patch CVE-2023-50008 bsc#1223254 qzhao@suse.com -- Fix memory leaks. Patch93: ffmpeg-CVE-2023-50008.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel @@ -844,9 +842,7 @@ Patch12: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch Patch90: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch -# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-50007.patch CVE-2023-50007 bsc#1223253 qzhao@suse.com -- Fix crash with EOF handling. Patch92: ffmpeg-CVE-2023-50007.patch -# PATCH-FIX-UPSTREAM ffmpeg-CVE-2023-50008.patch CVE-2023-50008 bsc#1223254 qzhao@suse.com -- Fix memory leaks. Patch93: ffmpeg-CVE-2023-50008.patch BuildRequires: c_compiler Requires: this-is-only-for-build-envs diff --git a/ffmpeg-CVE-2023-50007.patch b/ffmpeg-CVE-2023-50007.patch index f970722..f90ee9f 100644 --- a/ffmpeg-CVE-2023-50007.patch +++ b/ffmpeg-CVE-2023-50007.patch @@ -1,8 +1,9 @@ -commit b1942734c7cbcdc9034034373abcc9ecb9644c47 -Author: Paul B Mahol -Date: Mon Nov 27 11:45:34 2023 +0100 - - avfilter/af_afwtdn: fix crash with EOF handling +From b1942734c7cbcdc9034034373abcc9ecb9644c47 Mon Sep 17 00:00:00 2001 +From: Paul B Mahol +Date: Mon, 27 Nov 2023 11:45:34 +0100 +Subject: [PATCH] avfilter/af_afwtdn: fix crash with EOF handling +References: https://bugzilla.opensuse.org/1223253 +References: CVE-2023-50007 diff -Nura ffmpeg-6.1.1/libavfilter/af_afwtdn.c ffmpeg-6.1.1_new/libavfilter/af_afwtdn.c --- ffmpeg-6.1.1/libavfilter/af_afwtdn.c 2023-11-11 08:25:17.000000000 +0800 diff --git a/ffmpeg-CVE-2023-50008.patch b/ffmpeg-CVE-2023-50008.patch index 0502a62..b23fcd7 100644 --- a/ffmpeg-CVE-2023-50008.patch +++ b/ffmpeg-CVE-2023-50008.patch @@ -1,8 +1,9 @@ -commit 5f87a68cf70dafeab2fb89b42e41a4c29053b89b -Author: Paul B Mahol -Date: Mon Nov 27 12:08:20 2023 +0100 - - avfilter/vf_colorcorrect: fix memory leaks +From 5f87a68cf70dafeab2fb89b42e41a4c29053b89b Mon Sep 17 00:00:00 2001 +From: Paul B Mahol +Date: Mon Nov 27 12:08:20 2023 +0100 +Subject: avfilter/vf_colorcorrect: fix memory leaks +References: https://bugzilla.opensuse.org/1223254 +References: CVE-2023-50008 diff -Nura ffmpeg-6.1.1/libavfilter/vf_colorcorrect.c ffmpeg-6.1.1_new/libavfilter/vf_colorcorrect.c --- ffmpeg-6.1.1/libavfilter/vf_colorcorrect.c 2023-11-11 08:25:17.000000000 +0800