From d9735126b11cf42261728258bd81d229d47baeb0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Mar 2018 19:50:58 +0100 Subject: [PATCH] libvorbis: update to 1.3.6. --- srcpkgs/libvorbis/patches/CVE-2017-14632.patch | 10 ---------- srcpkgs/libvorbis/patches/CVE-2017-14633.patch | 11 ----------- .../libvorbis/patches/autogen_skip_configure.patch | 9 --------- srcpkgs/libvorbis/template | 8 ++++---- 4 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/libvorbis/patches/CVE-2017-14632.patch delete mode 100644 srcpkgs/libvorbis/patches/CVE-2017-14633.patch delete mode 100644 srcpkgs/libvorbis/patches/autogen_skip_configure.patch diff --git a/srcpkgs/libvorbis/patches/CVE-2017-14632.patch b/srcpkgs/libvorbis/patches/CVE-2017-14632.patch deleted file mode 100644 index 33cd45bcaf8..00000000000 --- a/srcpkgs/libvorbis/patches/CVE-2017-14632.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/info.c -+++ lib/info.c -@@ -584,6 +584,7 @@ int vorbis_analysis_headerout(vorbis_dsp - private_state *b=v->backend_state; - - if(!b||vi->channels<=0){ -+ b = NULL; - ret=OV_EFAULT; - goto err_out; - } diff --git a/srcpkgs/libvorbis/patches/CVE-2017-14633.patch b/srcpkgs/libvorbis/patches/CVE-2017-14633.patch deleted file mode 100644 index 548b1262848..00000000000 --- a/srcpkgs/libvorbis/patches/CVE-2017-14633.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/info.c -+++ lib/info.c -@@ -583,7 +583,7 @@ int vorbis_analysis_headerout(vorbis_dsp - oggpack_buffer opb; - private_state *b=v->backend_state; - -- if(!b||vi->channels<=0){ -+ if(!b||vi->channels<=0||vi->channels>256){ - b = NULL; - ret=OV_EFAULT; - goto err_out; diff --git a/srcpkgs/libvorbis/patches/autogen_skip_configure.patch b/srcpkgs/libvorbis/patches/autogen_skip_configure.patch deleted file mode 100644 index 3f2ecc134b3..00000000000 --- a/srcpkgs/libvorbis/patches/autogen_skip_configure.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- autogen.sh.orig 2013-03-21 17:21:18.281013739 +0100 -+++ autogen.sh 2013-03-21 17:21:23.960040231 +0100 -@@ -124,6 +124,3 @@ echo " $AUTOMAKE --add-missing $AUTOMAK - $AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1 - echo " autoconf" - autoconf || exit 1 -- --cd $olddir --$srcdir/configure --enable-maintainer-mode "$@" && echo diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template index bb376333e4d..471d587bc75 100644 --- a/srcpkgs/libvorbis/template +++ b/srcpkgs/libvorbis/template @@ -1,16 +1,16 @@ # Template file for 'libvorbis'. pkgname=libvorbis -version=1.3.5 -revision=2 +version=1.3.6 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libogg-devel" short_desc="The Vorbis General Audio Compression Codec" maintainer="Juan RP " -license="BSD" +license="3-clause-BSD" homepage="http://www.xiph.org/vorbis/" distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz" -checksum=6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce +checksum=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb pre_configure() { autoreconf -fi -I m4