Merge from bittboy/buildroot@db180c0

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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBVORBIS
+	bool "libvorbis"
+	select BR2_PACKAGE_LIBOGG
+	help
+	  Library for the Vorbis open source audio decoder
+	  Ogg Vorbis is a fully open, non-proprietary,
+	  patent-and-royalty-free, general-purpose compressed audio
+	  format for mid to high quality (8kHz-48.0kHz, 16+ bit,
+	  polyphonic) audio and music at fixed and variable bitrates
+	  from 16 to 128 kbps/channel.
+
+	  This places Vorbis in the same competitive class as audio
+	  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.

package/libvorbis/libvorbis.hash

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

package/libvorbis/libvorbis.mk

@@ -0,0 +1,16 @@
+################################################################################
+#
+# libvorbis
+#
+################################################################################
+
+LIBVORBIS_VERSION = 1.3.6
+LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz
+LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis
+LIBVORBIS_INSTALL_STAGING = YES
+LIBVORBIS_CONF_OPTS = --disable-oggtest
+LIBVORBIS_DEPENDENCIES = host-pkgconf libogg
+LIBVORBIS_LICENSE = BSD-3-Clause
+LIBVORBIS_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))