From 802c0b91e72790ccfc562ecab6e4f56329e4e573 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Tue, 21 Feb 2012 13:05:57 +0000
Subject: update to 1.3.3 integrates the fix for CVE-2012-0444

---
 audio/libvorbis/Makefile                    |  7 +++----
 audio/libvorbis/distinfo                    |  9 ++++-----
 audio/libvorbis/patches/patch-CVE-2012-0444 | 14 --------------
 3 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 audio/libvorbis/patches/patch-CVE-2012-0444

(limited to 'audio/libvorbis')

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 2795eb76db6..d405b7426a1 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2012/02/17 12:23:24 drochner Exp $
+# $NetBSD: Makefile,v 1.53 2012/02/21 13:05:57 drochner Exp $
 
-DISTNAME=	libvorbis-1.3.2
-PKGREVISION=	1
+DISTNAME=	libvorbis-1.3.3
 CATEGORIES=	devel audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/vorbis/
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 01df7373ab2..6c4743e011a 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.21 2012/02/17 12:23:24 drochner Exp $
+$NetBSD: distinfo,v 1.22 2012/02/21 13:05:57 drochner Exp $
 
-SHA1 (libvorbis-1.3.2.tar.bz2) = 4c44da8215d1fc56676fccc1af8dd6b422d9e676
-RMD160 (libvorbis-1.3.2.tar.bz2) = 2478fd66305ee6fa31d6d336e4ff2b3ec649d661
-Size (libvorbis-1.3.2.tar.bz2) = 1230364 bytes
-SHA1 (patch-CVE-2012-0444) = c5e2cb7ee0a13c38b43166952954e66bcc5307a1
+SHA1 (libvorbis-1.3.3.tar.xz) = 31d1a0ec4815bf1ee638b0f2850f03efcd48022a
+RMD160 (libvorbis-1.3.3.tar.xz) = b73f638e23ed907cff9e900a9edabb7ad34a0bcf
+Size (libvorbis-1.3.3.tar.xz) = 1087888 bytes
diff --git a/audio/libvorbis/patches/patch-CVE-2012-0444 b/audio/libvorbis/patches/patch-CVE-2012-0444
deleted file mode 100644
index 82653ff2f6b..00000000000
--- a/audio/libvorbis/patches/patch-CVE-2012-0444
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-CVE-2012-0444,v 1.1 2012/02/17 12:23:24 drochner Exp $
-
-changeset #18151
-
---- lib/floor1.c.orig	2010-10-23 04:31:21.000000000 +0000
-+++ lib/floor1.c
-@@ -167,6 +167,7 @@ static vorbis_info_floor *floor1_unpack 
- 
-   for(j=0,k=0;j<info->partitions;j++){
-     count+=info->class_dim[info->partitionclass[j]];
-+    if(count>VIF_POSIT) goto err_out;
-     for(;k<count;k++){
-       int t=info->postlist[k+2]=oggpack_read(opb,rangebits);
-       if(t<0 || t>=(1<<rangebits))
-- 
cgit v1.2.3