aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-08-06 06:46:54 -0300
committerNatanael Copa <ncopa@alpinelinux.org>2019-08-07 05:36:03 +0000
commit4a026780fa744022e7172bf526c93942dd7e42fd (patch)
tree0b983b97fd3f87012574ceaac4c9bf01add61dd7
parent02cd631434797ac12a9293efc00bb4b6d213a4e5 (diff)
downloadaports-4a026780fa744022e7172bf526c93942dd7e42fd.tar.gz
aports-4a026780fa744022e7172bf526c93942dd7e42fd.tar.bz2
aports-4a026780fa744022e7172bf526c93942dd7e42fd.tar.xz
main/flac: upgrade to 1.3.3
-rw-r--r--main/flac/APKBUILD16
-rw-r--r--main/flac/CVE-2017-6888.patch27
2 files changed, 6 insertions, 37 deletions
diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index a1916a32cf..df6145f56d 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -1,23 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=flac
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.3.3
+pkgrel=0
pkgdesc="Free Lossless Audio Codec"
-url="http://flac.sourceforge.net/"
+url="https://xiph.org/flac/"
arch="all"
license="custom:Xiph LGPL GPL FDL"
-options="!checkroot"
+options="!checkroot !check" # Tests are infinite
subpackages="$pkgname-dev $pkgname-doc"
-depends=
makedepends="libogg-dev !libiconv"
-source="http://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz
- CVE-2017-6888.patch"
+source="http://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
# secfixes:
# 1.3.2-r2:
# - CVE-2017-6888
-builddir="$srcdir/$pkgname-$pkgver"
build() {
cd "$builddir"
@@ -54,5 +51,4 @@ package() {
install -Dm0644 COPYING.Xiph \
"$pkgdir"/usr/share/licenses/$pkgname/COPYING.Xiph
}
-sha512sums="63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15 flac-1.3.2.tar.xz
-d2fedee94282a38fecd9c9e0a196966e2b23cc1df13290348bb7841a61aa9e95658e6dda6b8637f78d11a397f076388cbc2a0bf6f15e798882ccf42cc8c6f35c CVE-2017-6888.patch"
+sha512sums="d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28 flac-1.3.3.tar.xz"
diff --git a/main/flac/CVE-2017-6888.patch b/main/flac/CVE-2017-6888.patch
deleted file mode 100644
index 7c829be9b9..0000000000
--- a/main/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 14d5fe7..a552751 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.1.4
-