diff options
Diffstat (limited to 'main/ffmpeg/APKBUILD')
| -rw-r--r-- | main/ffmpeg/APKBUILD | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index d858906238..894aac0e4d 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,9 +1,10 @@ +# Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=3.2.2 -pkgrel=1 +pkgver=3.2.4 +pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" arch="all" @@ -17,6 +18,12 @@ source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch cflags-speed-O2.patch " + +# secfixes: +# 3.2.4-r0: +# - CVE-2017-5024 +# - CVE-2017-5025 + builddir="$srcdir/$pkgname-$pkgver" build() { @@ -74,6 +81,10 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } +<<<<<<< HEAD sha512sums="7cb61684081bbe905ef324f60d259fd543e8be1ed2593167beb9324bec8bbc012cccff40a73e8be0ccc6bb0a20acd98a3dbac0d1d39403016cb381c1410b45db ffmpeg-3.2.2.tar.bz2 +======= +sha512sums="ba5004d0f2659faa139c7dbf2f0fc6bab1d4e017d919f4ac271a5d2e8e4a3478909176e3a4d1ad33ddf2f62ab28dd9e00ce9be1399efb7cb3276dde79134cdaa ffmpeg-3.2.4.tar.bz2 +>>>>>>> main/ffmpeg: security upgrade to 3.2.4 - fixes #6869 32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch 5ff940abb4265401eebb0f2fd486b51a004d62a480c5a64bc279149731b577b5c95f0b7ff2d73429ec10b1f0b76ecf7fa466b02ba3a0bf79d9b7ac2ae87ee5d5 cflags-speed-O2.patch" |