libvorbis-32: 1.3.6 -> 1.3.7

4 files changed, 15 insertions, 77 deletions

diff --git a/libvorbis-32/.footprint b/libvorbis-32/.footprint
index 296c4a9a..1310c5c2 100644
--- a/libvorbis-32/.footprint
+++ b/libvorbis-32/.footprint
@@ -2,19 +2,19 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libvorbis.a
 -rwxr-xr-x	root/root	usr/lib32/libvorbis.la
-lrwxrwxrwx	root/root	usr/lib32/libvorbis.so -> libvorbis.so.0.4.8
-lrwxrwxrwx	root/root	usr/lib32/libvorbis.so.0 -> libvorbis.so.0.4.8
--rwxr-xr-x	root/root	usr/lib32/libvorbis.so.0.4.8
+lrwxrwxrwx	root/root	usr/lib32/libvorbis.so -> libvorbis.so.0.4.9
+lrwxrwxrwx	root/root	usr/lib32/libvorbis.so.0 -> libvorbis.so.0.4.9
+-rwxr-xr-x	root/root	usr/lib32/libvorbis.so.0.4.9
 -rw-r--r--	root/root	usr/lib32/libvorbisenc.a
 -rwxr-xr-x	root/root	usr/lib32/libvorbisenc.la
-lrwxrwxrwx	root/root	usr/lib32/libvorbisenc.so -> libvorbisenc.so.2.0.11
-lrwxrwxrwx	root/root	usr/lib32/libvorbisenc.so.2 -> libvorbisenc.so.2.0.11
--rwxr-xr-x	root/root	usr/lib32/libvorbisenc.so.2.0.11
+lrwxrwxrwx	root/root	usr/lib32/libvorbisenc.so -> libvorbisenc.so.2.0.12
+lrwxrwxrwx	root/root	usr/lib32/libvorbisenc.so.2 -> libvorbisenc.so.2.0.12
+-rwxr-xr-x	root/root	usr/lib32/libvorbisenc.so.2.0.12
 -rw-r--r--	root/root	usr/lib32/libvorbisfile.a
 -rwxr-xr-x	root/root	usr/lib32/libvorbisfile.la
-lrwxrwxrwx	root/root	usr/lib32/libvorbisfile.so -> libvorbisfile.so.3.3.7
-lrwxrwxrwx	root/root	usr/lib32/libvorbisfile.so.3 -> libvorbisfile.so.3.3.7
--rwxr-xr-x	root/root	usr/lib32/libvorbisfile.so.3.3.7
+lrwxrwxrwx	root/root	usr/lib32/libvorbisfile.so -> libvorbisfile.so.3.3.8
+lrwxrwxrwx	root/root	usr/lib32/libvorbisfile.so.3 -> libvorbisfile.so.3.3.8
+-rwxr-xr-x	root/root	usr/lib32/libvorbisfile.so.3.3.8
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/vorbis.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/vorbisenc.pc
diff --git a/libvorbis-32/.signature b/libvorbis-32/.signature
index e4b92cf4..f7bd6a2a 100644
--- a/libvorbis-32/.signature
+++ b/libvorbis-32/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXe4oCwJQWfBKU30jw8KxP9eK2WR94SbhsI6aKIIvLDhhVvzAHbPGjN7xyfxi9eGWAcfOAdd5th6yzFTIKd+JmwE=
-SHA256 (Pkgfile) = df1d8365a46c8f06f18c7cceea22754da007c05891bf2fa31e6fd807fd0a3820
-SHA256 (.footprint) = 5eb3b153993a682d83fa9dcd87ed86afe17fd171e0905236b4e3151926db1f64
-SHA256 (libvorbis-1.3.6.tar.xz) = af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415
-SHA256 (CVE-2017-14160.patch) = f93bf45de3a21db0fa9bb9cd25edefb1182bf24d61028a86cbf45fbcd11fbdf5
+RWSwxGo/zH7eXf97H3YT/TelW4WyW/ppSvawMwT+Xdy5bjnqbxx+VTWM9sqRc67TmO3filGZExuHkQDbaYpWlO0S4dnxpNHl0AQ=
+SHA256 (Pkgfile) = 79cf6095ac75f8c1516826e02fb75d99d81080a6aa850b7effa6c51fcae7e20c
+SHA256 (.footprint) = b2d341b1925ccea91518df9915b17e78f817aa053bbf46fa4b214ccffbb73a2e
+SHA256 (libvorbis-1.3.7.tar.xz) = b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b
diff --git a/libvorbis-32/CVE-2017-14160.patch b/libvorbis-32/CVE-2017-14160.patch
deleted file mode 100644
index 9ad9d18f..00000000
--- a/libvorbis-32/CVE-2017-14160.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?= <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
-
diff --git a/libvorbis-32/Pkgfile b/libvorbis-32/Pkgfile
index bb957170..5167773c 100644
--- a/libvorbis-32/Pkgfile
+++ b/libvorbis-32/Pkgfile
@@ -4,16 +4,13 @@
 # Depends on: libogg-32 libvorbis
 
 name=libvorbis-32
-version=1.3.6
+version=1.3.7
 release=1
-source=(https://downloads.xiph.org/releases/vorbis/${name%-*}-$version.tar.xz
-	CVE-2017-14160.patch)
+source=(https://downloads.xiph.org/releases/vorbis/${name%-*}-$version.tar.xz)
 
 build() {
 	cd ${name%-*}-$version
 
-	patch -p1 -i $SRC/CVE-2017-14160.patch
-
 	./configure \
 		--prefix=/usr \
 		--libdir=/usr/lib32