summaryrefslogtreecommitdiff
path: root/user/ffmpeg/APKBUILD
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-05-05 11:25:48 -0500
committerMax Rees <maxcrees@me.com>2020-05-05 11:25:48 -0500
commitece7d1f171e81a88656947c48925da94f4d2105f (patch)
treeba1922ec64c18ef4327140f9e54187938a27b5f4 /user/ffmpeg/APKBUILD
parentf0b42a82699bb782fd074517ca488f1de239e623 (diff)
downloadpackages-ece7d1f171e81a88656947c48925da94f4d2105f.tar.gz
packages-ece7d1f171e81a88656947c48925da94f4d2105f.tar.bz2
packages-ece7d1f171e81a88656947c48925da94f4d2105f.tar.xz
packages-ece7d1f171e81a88656947c48925da94f4d2105f.zip
user/ffmpeg: patch CVE-2019-13312 and CVE-2020-12284 (#156)
Diffstat (limited to 'user/ffmpeg/APKBUILD')
-rw-r--r--user/ffmpeg/APKBUILD11
1 files changed, 9 insertions, 2 deletions
diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index b6de0597c..06e68aecb 100644
--- a/user/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ffmpeg
pkgver=4.2.2
-pkgrel=0
+pkgrel=1
pkgdesc="Record, convert, and stream audio and video"
url="https://ffmpeg.org/"
arch="all"
@@ -21,6 +21,8 @@ makedepends="alsa-lib-dev bzip2-dev freetype-dev gnutls-dev imlib2-dev
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
+ CVE-2019-13312.patch
+ CVE-2020-12284.patch
"
# secfixes:
@@ -37,6 +39,9 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
# - CVE-2017-14222
# - CVE-2017-14223
# - CVE-2017-14225
+# 4.2.2-r1:
+# - CVE-2019-13312
+# - CVE-2020-12284
build() {
_asm=""
@@ -98,4 +103,6 @@ libs() {
}
sha512sums="381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3 ffmpeg-4.2.2.tar.xz
-1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch"
+1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
+0c53680ae480b8f848893d4e5c40ea522bd25a72860e0955e039ec838ee09159ab2bfa0eafc71113009082c7f53981ba70116dcef17053cd3cc3ea59e4da5a5c CVE-2019-13312.patch
+910f8da9ed8e0998c311cc451f1725a20c4cc3e9f0c2d1981a1ceea8da5f434519044b4997e71d87424e19fcc45cb203238e49ad178e313696667e6c9bf311c9 CVE-2020-12284.patch"