libvorbis-32: 1.3.5 -> 1.3.6

libvorbis-32/.md5sum

@@ -1 +1,2 @@
-28cb28097c07a735d6af56e598e1c90f  libvorbis-1.3.5.tar.xz
+943275d84d55dfa072ec3a2566fd9bfa  CVE-2017-14160.patch
+b7d1692f275c73e7833ed1cc2697cd65  libvorbis-1.3.6.tar.xz

libvorbis-32/.signature

@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXakUyjLqBAdtL1ZjbnNBMqFInnuXslQx0EBAzv/7RLAxiZPLxKwKYSH3IwHrMwh4Py+NM/Q4heaDl3cgyjQmvQ8=
-SHA256 (Pkgfile) = a226bf08a41f6ef6b2fbcc05f79c5aa84fdc45350519f535eb53fc327d8161a3
+RWSwxGo/zH7eXe318+fHmaI1kEBhYQ8VoZLTLypWIUIpMoevlQbHf/z5kbY8bAa2RQANpq8ezAKd343imMSr1WkgWH2KLMkoSA4=
+SHA256 (Pkgfile) = bb6baaade4af84b752b32798335a6b7d423fc860fd4dfee5f0585c231316f1a0
 SHA256 (.footprint) = 5eb3b153993a682d83fa9dcd87ed86afe17fd171e0905236b4e3151926db1f64
-SHA256 (libvorbis-1.3.5.tar.xz) = 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1
+SHA256 (libvorbis-1.3.6.tar.xz) = af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415
+SHA256 (CVE-2017-14160.patch) = f93bf45de3a21db0fa9bb9cd25edefb1182bf24d61028a86cbf45fbcd11fbdf5

libvorbis-32/CVE-2017-14160.patch

@@ -0,0 +1,58 @@
+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?= <agx@sigxcpu.org>
+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
+

libvorbis-32/Pkgfile

@@ -4,17 +4,22 @@
 # Depends on:  libogg-32 libvorbis
 
 name=libvorbis-32
-version=1.3.5
+version=1.3.6
 release=1
-source=(http://downloads.xiph.org/releases/vorbis/libvorbis-$version.tar.xz)
+source=(https://downloads.xiph.org/releases/vorbis/${name%-*}-$version.tar.xz
+	CVE-2017-14160.patch)
 
 build() {
-    cd libvorbis-$version
+	cd ${name%-*}-$version
 
-    ./configure --prefix=/usr --libdir=/usr/lib32
+	patch -p1 -i $SRC/CVE-2017-14160.patch
 
-    make
-    make DESTDIR=$PKG install
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/lib32
 
-    rm -r $PKG/usr/{include,share}
+	make
+	make DESTDIR=$PKG install
+
+	rm -r $PKG/usr/{include,share}
 }