diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-05-10 00:53:07 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-05-10 00:53:07 +0000 |
| commit | 37d91537b3ba473dcbe29bef26a458c1f27ec8b1 (patch) | |
| tree | fcee5cee9b7e90f77583879ed500e6c7c9b06edb /user/ffmpeg/APKBUILD | |
| parent | 2196072f13ded27b9579b329e84e3572998579ef (diff) | |
| parent | 37f871df2a0ce73cbda11caba1dc63c8118b14fb (diff) | |
| download | packages-37d91537b3ba473dcbe29bef26a458c1f27ec8b1.tar.gz packages-37d91537b3ba473dcbe29bef26a458c1f27ec8b1.tar.bz2 packages-37d91537b3ba473dcbe29bef26a458c1f27ec8b1.tar.xz packages-37d91537b3ba473dcbe29bef26a458c1f27ec8b1.zip | |
Merge branch 'sec/2020.05.05' into 'master'
Security updates for 2020.05.05
See merge request adelie/packages!446
Diffstat (limited to 'user/ffmpeg/APKBUILD')
| -rw-r--r-- | user/ffmpeg/APKBUILD | 11 |
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" |