From e1fe41124b99c01042b07eba57d10524e1770fa7 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 7 Jul 2020 20:32:00 +0200 Subject: [PATCH] libvorbis: update to 1.3.7. --- .../libvorbis/patches/CVE-2018-10392.patch | 26 --------- .../libvorbis/patches/CVE-2018-10393.patch | 58 ------------------- srcpkgs/libvorbis/template | 6 +- 3 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 srcpkgs/libvorbis/patches/CVE-2018-10392.patch delete mode 100644 srcpkgs/libvorbis/patches/CVE-2018-10393.patch diff --git a/srcpkgs/libvorbis/patches/CVE-2018-10392.patch b/srcpkgs/libvorbis/patches/CVE-2018-10392.patch deleted file mode 100644 index 1a50b6a226..0000000000 --- a/srcpkgs/libvorbis/patches/CVE-2018-10392.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001 -From: Thomas Daede -Date: Thu, 17 May 2018 16:19:19 -0700 -Subject: [PATCH] Sanity check number of channels in setup. - -Fixes #2335. ---- - lib/vorbisenc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c -index 4fc7b62f..64a51b5b 100644 ---- a/lib/vorbisenc.c -+++ b/lib/vorbisenc.c -@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){ - highlevel_encode_setup *hi=&ci->hi; - - if(ci==NULL)return(OV_EINVAL); -+ if(vi->channels<1||vi->channels>255)return(OV_EINVAL); - if(!hi->impulse_block_p)i0=1; - - /* too low/high an ATH floater is nonsensical, but doesn't break anything */ --- -2.18.0 - - diff --git a/srcpkgs/libvorbis/patches/CVE-2018-10393.patch b/srcpkgs/libvorbis/patches/CVE-2018-10393.patch deleted file mode 100644 index 9ad9d18f75..0000000000 --- a/srcpkgs/libvorbis/patches/CVE-2018-10393.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 98a60969315dba8c1e8231f561e1551670bc80ae Mon Sep 17 00:00:00 2001 -Message-Id: <98a60969315dba8c1e8231f561e1551670bc80ae.1511192857.git.agx@sigxcpu.org> -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Wed, 15 Nov 2017 13:12:00 +0100 -Subject: [PATCH] CVE-2017-14160: make sure we don't overflow - ---- - lib/psy.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/lib/psy.c b/lib/psy.c -index 422c6f1e..8bbf6cf3 100644 ---- a/lib/psy.c -+++ b/lib/psy.c -@@ -599,7 +599,7 @@ static void bark_noise_hybridmp(int n,const long *b, - XY[i] = tXY; - } - -- for (i = 0, x = 0.f;; i++, x += 1.f) { -+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) { - - lo = b[i] >> 16; - if( lo>=0 ) break; -@@ -621,12 +621,11 @@ static void bark_noise_hybridmp(int n,const long *b, - noise[i] = R - offset; - } - -- for ( ;; i++, x += 1.f) { -+ for ( ; i < n; i++, x += 1.f) { - - lo = b[i] >> 16; - hi = b[i] & 0xffff; - if(hi>=n)break; -- - tN = N[hi] - N[lo]; - tX = X[hi] - X[lo]; - tXX = XX[hi] - XX[lo]; -@@ -651,7 +650,7 @@ static void bark_noise_hybridmp(int n,const long *b, - - if (fixed <= 0) return; - -- for (i = 0, x = 0.f;; i++, x += 1.f) { -+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) { - hi = i + fixed / 2; - lo = hi - fixed; - if(lo>=0)break; -@@ -670,7 +669,7 @@ static void bark_noise_hybridmp(int n,const long *b, - - if (R - offset < noise[i]) noise[i] = R - offset; - } -- for ( ;; i++, x += 1.f) { -+ for ( ; i < n; i++, x += 1.f) { - - hi = i + fixed / 2; - lo = hi - fixed; --- -2.15.0 - diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template index 80dc1335d6..e962ccbf51 100644 --- a/srcpkgs/libvorbis/template +++ b/srcpkgs/libvorbis/template @@ -1,7 +1,7 @@ # Template file for 'libvorbis'. pkgname=libvorbis -version=1.3.6 -revision=4 +version=1.3.7 +revision=1 patch_args="-Np1" build_style=gnu-configure hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://www.xiph.org/vorbis/" distfiles="https://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz" -checksum=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb +checksum=0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab post_install() { vlicense COPYING