Update to 1.3.7 for an accumulation of small bug fixes. No interface changes.

The port already had the CVE fixes.

6 files changed, 8 insertions, 36 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 038100fb22a7..eab099b0bcc8 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvorbis
-PORTVERSION=	1.3.6
-PORTREVISION=	1
+PORTVERSION=	1.3.7
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://downloads.xiph.org/releases/vorbis/ \
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index da43c0630fbc..c1388696f0bd 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521217149
-SHA256 (libvorbis-1.3.6.tar.xz) = af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415
-SIZE (libvorbis-1.3.6.tar.xz) = 1195388
+TIMESTAMP = 1593964776
+SHA256 (libvorbis-1.3.7.tar.xz) = b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b
+SIZE (libvorbis-1.3.7.tar.xz) = 1203792
diff --git a/audio/libvorbis/files/patch-lib_psy.c b/audio/libvorbis/files/patch-lib_psy.c
deleted file mode 100644
index 90aae7d8c12a..000000000000
--- a/audio/libvorbis/files/patch-lib_psy.c
+++ /dev/null
@@ -1,15 +0,0 @@
-CVE-2017-14160: fix bounds check on very low sample rates.
-https://gitlab.xiph.org/xiph/vorbis/-/commit/018ca26dece618457dd13585cad52941193c4a25
---- lib/psy.c.orig	2020-06-28 19:37:27 UTC
-+++ lib/psy.c
-@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b,
-   for (i = 0, x = 0.f;; i++, x += 1.f) {
- 
-     lo = b[i] >> 16;
--    if( lo>=0 ) break;
-     hi = b[i] & 0xffff;
-+    if( lo>=0 ) break;
-+    if( hi>=n ) break;
- 
-     tN = N[hi] + N[-lo];
-     tX = X[hi] - X[-lo];
diff --git a/audio/libvorbis/files/patch-lib_vorbisenc.c b/audio/libvorbis/files/patch-lib_vorbisenc.c
deleted file mode 100644
index c5e63a872086..000000000000
--- a/audio/libvorbis/files/patch-lib_vorbisenc.c
+++ /dev/null
@@ -1,12 +0,0 @@
-CVE-2018-10392: Sanity check number of channels in setup.
-https://gitlab.xiph.org/xiph/vorbis/-/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b
---- lib/vorbisenc.c.orig	2020-06-28 19:38:54 UTC
-+++ 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 */
diff --git a/audio/libvorbis/pkg-descr b/audio/libvorbis/pkg-descr
index 6dde4d52ffc0..16c596219c85 100644
--- a/audio/libvorbis/pkg-descr
+++ b/audio/libvorbis/pkg-descr
@@ -18,4 +18,4 @@ This package contains:
 - libvorbisenc, a BSD-license library that provides a simple,
   programmatic encoding setup interface.
 
-WWW: https://www.xiph.org/vorbis/
+WWW: https://xiph.org/vorbis/
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index f9d5c242c4fe..a7543ffe09ae 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -4,15 +4,15 @@ include/vorbis/vorbisfile.h
 lib/libvorbis.a
 lib/libvorbis.so
 lib/libvorbis.so.0
-lib/libvorbis.so.0.4.8
+lib/libvorbis.so.0.4.9
 lib/libvorbisenc.a
 lib/libvorbisenc.so
 lib/libvorbisenc.so.2
-lib/libvorbisenc.so.2.0.11
+lib/libvorbisenc.so.2.0.12
 lib/libvorbisfile.a
 lib/libvorbisfile.so
 lib/libvorbisfile.so.3
-lib/libvorbisfile.so.3.3.7
+lib/libvorbisfile.so.3.3.8
 libdata/pkgconfig/vorbis.pc
 libdata/pkgconfig/vorbisenc.pc
 libdata/pkgconfig/vorbisfile.pc