diff options
Diffstat (limited to 'user/flac')
| -rw-r--r-- | user/flac/APKBUILD | 12 | ||||
| -rw-r--r-- | user/flac/CVE-2017-6888.patch | 27 |
2 files changed, 5 insertions, 34 deletions
diff --git a/user/flac/APKBUILD b/user/flac/APKBUILD index 363d5b3ac..5f8bd2adb 100644 --- a/user/flac/APKBUILD +++ b/user/flac/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=flac -pkgver=1.3.2 -pkgrel=3 +pkgver=1.3.3 +pkgrel=0 pkgdesc="Free Lossless Audio Codec" url="https://xiph.org/flac/" arch="all" @@ -10,8 +10,7 @@ license="BSD-3-Clause AND GPL-2.0+" subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="libogg-dev" -source="https://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz - CVE-2017-6888.patch" +source="https://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz" # secfixes: # 1.3.2-r3: @@ -20,7 +19,7 @@ source="https://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz build() { local _arch_conf case "${CARCH}" in - ppc*) _arch_conf="--enable-altivec" ;; + ppc*) _arch_conf="--enable-altivec --disable-vsx" ;; x86_64) _arch_conf="--enable-sse" ;; x86) _arch_conf="--disable-sse" ;; esac @@ -49,5 +48,4 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/COPYING.Xiph } -sha512sums="63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15 flac-1.3.2.tar.xz -ea241ba68a4e8d91d5db555ec8c459cff48ad8c3de511d0a92d4feb8b946a2173422015fdc9604240035ef315132fe4062ab3e6d4bc2d79aa1aed18defa32301 CVE-2017-6888.patch" +sha512sums="d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28 flac-1.3.3.tar.xz" diff --git a/user/flac/CVE-2017-6888.patch b/user/flac/CVE-2017-6888.patch deleted file mode 100644 index 080160bfb..000000000 --- a/user/flac/CVE-2017-6888.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4f47b63e9c971e6391590caf00a0f2a5ed612e67 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo <erikd@mega-nerd.com> -Date: Sat, 8 Apr 2017 18:34:49 +1000 -Subject: [PATCH] stream_decoder.c: Fix a memory leak - -Leak reported by Secunia Research. ---- - src/libFLAC/stream_decoder.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c -index 14d5fe7f..a5527511 100644 ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -1753,6 +1753,9 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre - } - memset (obj->comments[i].entry, 0, obj->comments[i].length) ; - if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) { -+ /* Current i-th entry is bad, so we delete it. */ -+ free (obj->comments[i].entry) ; -+ obj->comments[i].entry = NULL ; - obj->num_comments = i; - goto skip; - } --- -2.11.0 - |