aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2021-10-26 22:44:49 +0200
committerJ0WI <J0WI@users.noreply.github.com>2021-10-27 01:06:28 +0200
commitc76a8e57ec87aceedd8b7778d938d95747f8e372 (patch)
treec712e490a66e187bb4622a300eed88c510255aac
parentea9b052f3040aa0e6cd7bd1a7c50d2fb6e42889d (diff)
community/ffmpeg: security upgrade to 4.4.1
-rw-r--r--community/ffmpeg/APKBUILD28
-rw-r--r--community/ffmpeg/CVE-2021-33815.patch35
2 files changed, 23 insertions, 40 deletions
diff --git a/community/ffmpeg/APKBUILD b/community/ffmpeg/APKBUILD
index 6993eda9bab..9306372a386 100644
--- a/community/ffmpeg/APKBUILD
+++ b/community/ffmpeg/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ffmpeg
-pkgver=4.4
-pkgrel=1
+pkgver=4.4.1
+pkgrel=0
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
url="https://ffmpeg.org/"
arch="all"
@@ -45,12 +45,31 @@ makedepends="
checkdepends="rsync"
source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
- CVE-2021-33815.patch
"
# secfixes:
+# 4.4.1-r0:
+# - CVE-2020-20446
+# - CVE-2020-20453
+# - CVE-2020-22015
+# - CVE-2020-22019
+# - CVE-2020-22021
+# - CVE-2020-22037
+# - CVE-2021-38114
+# - CVE-2021-38171
+# - CVE-2021-38291
# 4.4-r1:
# - CVE-2021-33815
+# 4.4-r0:
+# - CVE-2020-20450
+# - CVE-2020-21041
+# - CVE-2020-22038
+# - CVE-2020-22042
+# - CVE-2020-24020
+# - CVE-2021-30123
+# 4.3.2-r0:
+# - CVE-2020-35964
+# - CVE-2020-35965
# 4.3.1-r0:
# - CVE-2020-14212
# 4.3-r0:
@@ -195,7 +214,6 @@ libs() {
}
sha512sums="
-4f9e99958904bf1b99b4b17e2104729dfe67e0080cac525137597974597ff265c9847eb1be0771aa443c85691025bc0747d213e6c1281f7b67d18d8b0e8c5080 ffmpeg-4.4.tar.xz
+c651c120b71db6991ffc54abc291986e7d35d776203af327f9a28853d1d0af468ca0956e2d3d893f55a211f70a40c041d5aa9aa9664ef581302b27494be9374e ffmpeg-4.4.1.tar.xz
1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
-ebcae42657870fff5542bed2b06f07c9f5cce1bd324842a3c0b1c6d12c72fbb66e00e7354d558c359331cf2c74bd8309b26d8460a9b6f2ef743f1ad0e9b1024d CVE-2021-33815.patch
"
diff --git a/community/ffmpeg/CVE-2021-33815.patch b/community/ffmpeg/CVE-2021-33815.patch
deleted file mode 100644
index bcde1597712..00000000000
--- a/community/ffmpeg/CVE-2021-33815.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Tue, 25 May 2021 19:29:18 +0200
-Subject: [PATCH] avcodec/exr: More strictly check dc_count
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: out of array access
-Fixes: exr/deneme
-
-Found-by: Burak Çarıkçı <burakcarikci@crypttech.com>
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavcodec/exr.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libavcodec/exr.c b/libavcodec/exr.c
-index 9377a8916936..4648ed7d6226 100644
---- a/libavcodec/exr.c
-+++ b/libavcodec/exr.c
-@@ -1059,11 +1059,11 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
- bytestream2_skip(&gb, ac_size);
- }
-
-- if (dc_size > 0) {
-+ {
- unsigned long dest_len = dc_count * 2LL;
- GetByteContext agb = gb;
-
-- if (dc_count > (6LL * td->xsize * td->ysize + 63) / 64)
-+ if (dc_count != dc_w * dc_h * 3)
- return AVERROR_INVALIDDATA;
-
- av_fast_padded_malloc(&td->dc_data, &td->dc_size, FFALIGN(dest_len, 64) * 2);