Merge from bittboy/buildroot@26c91a9

package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch

@@ -1,28 +0,0 @@
-From: Thomas Daede <daede003@umn.edu>
-Date: Wed, 9 May 2018 21:56:59 +0000 (-0700)
-Subject: CVE-2017-14160: fix bounds check on very low sample rates.
-X-Git-Url: https://git.xiph.org/?p=vorbis.git;a=commitdiff_plain;h=018ca26dece618457dd13585cad52941193c4a25
-
-CVE-2017-14160: fix bounds check on very low sample rates.
-
-Downloaded from upstream commit
-https://git.xiph.org/?p=vorbis.git;a=commitdiff;h=018ca26dece618457dd13585cad52941193c4a25
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
-
-diff --git a/lib/psy.c b/lib/psy.c
-index 422c6f1..1310123 100644
---- a/lib/psy.c
-+++ b/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];

package/libvorbis/Config.in

@@ -13,3 +13,5 @@ config BR2_PACKAGE_LIBVORBIS
 	  representations such as MPEG-4 (AAC), and similar to, but
 	  higher performance than MPEG-1/2 audio layer 3, MPEG-4 audio
 	  (TwinVQ), WMA and PAC.
+
+	  https://xiph.org/vorbis/

package/libvorbis/libvorbis.hash

@@ -1,4 +1,4 @@
 # From http://www.xiph.org/downloads/
-sha256 af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415 libvorbis-1.3.6.tar.xz
+sha256  b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b  libvorbis-1.3.7.tar.xz
 # License files, locally calculated
-sha256 29e9914e6173b7061b7d48c25e6159fc1438326738bc047cc7248abc01b271f6  COPYING
+sha256  ec1815db59fcd302846df949d7424876cb2e2dc5ed1606c5fb0b36787b1cf43a  COPYING

package/libvorbis/libvorbis.mk

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBVORBIS_VERSION = 1.3.6
+LIBVORBIS_VERSION = 1.3.7
 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz
-LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis
+LIBVORBIS_SITE = https://downloads.xiph.org/releases/vorbis
 LIBVORBIS_INSTALL_STAGING = YES
 LIBVORBIS_CONF_OPTS = --disable-oggtest
 LIBVORBIS_DEPENDENCIES = host-pkgconf libogg