aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2021-01-21 23:16:24 -0300
committerLeo <thinkabit.ukim@gmail.com>2021-01-22 04:40:20 +0000
commit5eb255c35916d3dc97979da4e68911e36a3e87dc (patch)
tree7994dd4b8415f8632623a6c0837ec4e3531b7695
parent2d14aad2262bc2eee6355b322cfeda030c699ea6 (diff)
downloadaports-5eb255c35916d3dc97979da4e68911e36a3e87dc.tar.gz
aports-5eb255c35916d3dc97979da4e68911e36a3e87dc.tar.bz2
aports-5eb255c35916d3dc97979da4e68911e36a3e87dc.tar.xz
community/vorbis-tools: upgrade to 1.4.2
-rw-r--r--community/vorbis-tools/APKBUILD19
-rw-r--r--community/vorbis-tools/vorbis-tools-CVE-2015-6749.patch41
2 files changed, 4 insertions, 56 deletions
diff --git a/community/vorbis-tools/APKBUILD b/community/vorbis-tools/APKBUILD
index ae9fe8b7f4..a15f6c7f58 100644
--- a/community/vorbis-tools/APKBUILD
+++ b/community/vorbis-tools/APKBUILD
@@ -1,23 +1,15 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=vorbis-tools
-pkgver=1.4.0
-pkgrel=1
+pkgver=1.4.2
+pkgrel=0
pkgdesc="Extra tools for Ogg-Vorbis"
url="https://www.xiph.org/vorbis/"
arch="all"
license="GPL-2.0-only"
makedepends="curl-dev flac-dev libvorbis-dev libao-dev speex-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="http://downloads.xiph.org/releases/vorbis/vorbis-tools-$pkgver.tar.gz
- vorbis-tools-CVE-2015-6749.patch
- vorbis-tools-cve9638-cve9639.patch
- vorbis-tools-cve9640.patch"
-
-prepare() {
- default_prepare
- update_config_guess
-}
+source="http://downloads.xiph.org/releases/vorbis/vorbis-tools-$pkgver.tar.gz"
build() {
./configure \
@@ -31,7 +23,4 @@ package() {
rm "$pkgdir"/usr/lib/charset.alias
}
-sha512sums="d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99 vorbis-tools-1.4.0.tar.gz
-c1faa062e7035770db533383ebb3ae18efaf167f7a103c12cef81418da4be43545e368eab2915c243c03354c3bf0b8dbb198da90e7eaa59c8e00f1461c65b601 vorbis-tools-CVE-2015-6749.patch
-bcf5ae147de547f6463f3000e06398a8b4db326b44eab02bf314ca8ae3b90c45bd25481fb76ccbf39d9a2798a6c9fadb48600f393b6436f01f95ce2a20c04fe8 vorbis-tools-cve9638-cve9639.patch
-3bb8a50309f2657a99662039818040abf345d540915543cf35c3e5855d865fd33bf4bbaf296882662e6b11570199a054c7d34cfdd44ef69f9d3c9f45f4d8671f vorbis-tools-cve9640.patch"
+sha512sums="31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf vorbis-tools-1.4.2.tar.gz"
diff --git a/community/vorbis-tools/vorbis-tools-CVE-2015-6749.patch b/community/vorbis-tools/vorbis-tools-CVE-2015-6749.patch
deleted file mode 100644
index 78e3c810e6..0000000000
--- a/community/vorbis-tools/vorbis-tools-CVE-2015-6749.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001
-From: Mark Harris <mark.hsj@gmail.com>
-Date: Sun, 30 Aug 2015 05:54:46 -0700
-Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input
-
-Fixes #2212
----
- oggenc/audio.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/oggenc/audio.c b/oggenc/audio.c
-index 477da8c..4921fb9 100644
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] =
- int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- {
- int aifc; /* AIFC or AIFF? */
-- unsigned int len;
-- unsigned char *buffer;
-+ unsigned int len, readlen;
-+ unsigned char buffer[22];
- unsigned char buf2[8];
- aiff_fmt format;
- aifffile *aiff = malloc(sizeof(aifffile));
-@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- return 0; /* Weird common chunk */
- }
-
-- buffer = alloca(len);
--
-- if(fread(buffer,1,len,in) < len)
-+ readlen = len < sizeof(buffer) ? len : sizeof(buffer);
-+ if(fread(buffer,1,readlen,in) < readlen ||
-+ (len > readlen && !seek_forward(in, len-readlen)))
- {
- fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
- return 0;
---
-2.5.0
-