Update to 1.2.2. From the change log:

* define VENDOR and ENCODER strings
* fix regression from CVE-2008-1420; 1.0b1 files work again
* mark all tables as constant to reduce memory occupation
* additional decoder hardening against malicious streams
* substantially reduce amount of seeking performed by Vorbisfile
* Multichannel decode bugfix
* Improved robustness with corrupt streams.
* New ov_read_filter() vorbisfile call allows filtering decoded
  audio as floats before converting to integer samples.
* Fix an encoder bug with multichannel streams.
* Bare bones self test under 'make check'.
* Fix a problem encoding some streams between 14 and 28 kHz.
* Fix a numerical instability in the edge extrapolation filter.
* Specification correction.

11 files changed, 41 insertions, 140 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 949217b1c1a1..57a6fdf14255 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libvorbis
-PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTVERSION=	1.2.2
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/ \
@@ -16,7 +15,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/ \
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Audio compression codec library
 
-LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	ogg.6:${PORTSDIR}/audio/libogg
 
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
@@ -31,4 +30,7 @@ MAKE_ENV=	DOC=""
 MAKE_ENV=	DOC=doc
 .endif
 
+regression-test: build
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
+
 .include <bsd.port.mk>
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 6e84d5b5ccef..26e878f02393 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,3 +1,3 @@
-MD5 (libvorbis-1.2.0.tar.gz) = 478646358c49f34aedcce58948793619
-SHA256 (libvorbis-1.2.0.tar.gz) = 6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73
-SIZE (libvorbis-1.2.0.tar.gz) = 1494373
+MD5 (libvorbis-1.2.2.tar.gz) = fcab1884e78c49f06352d92cedf9a06a
+SHA256 (libvorbis-1.2.2.tar.gz) = e1c23cc3fdd9d07cdee3441ca44918987d995ea7ea457ddf61b430ac5a6b361d
+SIZE (libvorbis-1.2.2.tar.gz) = 1475590
diff --git a/audio/libvorbis/files/patch-Makefile.in b/audio/libvorbis/files/patch-Makefile.in
index 6b363dcf1a5e..7639cf3c3858 100644
--- a/audio/libvorbis/files/patch-Makefile.in
+++ b/audio/libvorbis/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	2007-07-26 21:46:30.000000000 +0000
-+++ Makefile.in	2007-07-26 21:49:02.000000000 +0000
-@@ -221,7 +221,7 @@
+--- Makefile.in.orig	2009-07-06 20:01:16.000000000 +0200
++++ Makefile.in	2009-07-06 20:01:35.000000000 +0200
+@@ -227,7 +227,7 @@ target_vendor = @target_vendor@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
--SUBDIRS = lib include doc examples vq
-+SUBDIRS = lib include $(DOC) examples vq
+-SUBDIRS = m4 include vq lib examples test doc
++SUBDIRS = m4 include vq lib examples test $(DOC)
  m4datadir = $(datadir)/aclocal
  m4data_DATA = vorbis.m4
- pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/audio/libvorbis/files/patch-configure b/audio/libvorbis/files/patch-configure
index ee94080e0feb..445785758c6e 100644
--- a/audio/libvorbis/files/patch-configure
+++ b/audio/libvorbis/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Jul 19 16:12:17 2002
-+++ configure	Sat Oct  5 17:57:37 2002
-@@ -5441,7 +5442,7 @@
+--- configure.orig	2009-07-06 20:01:46.000000000 +0200
++++ configure	2009-07-06 20:02:20.000000000 +0200
+@@ -20489,7 +20489,7 @@ if test -z "$GCC"; then
  		PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
  	*)
  		DEBUG="-g"
@@ -12,16 +12,16 @@ $FreeBSD$
  		PROFILE="-g -p" ;;
          esac
  else
-@@ -5536,9 +5537,9 @@
- 		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
- 		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
- 	*)
--		DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
--		CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+@@ -20663,9 +20663,9 @@ rm -f core conftest.err conftest.$ac_obj
+ 		CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
+ 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
+  	*)
+-		DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
+-		CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
 -		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-+		DEBUG="-g -Wall -W -fsigned-char"
-+		CFLAGS="-fsigned-char"
++		DEBUG="-g -Wall -Wextra -fsigned-char"
++		CFLAGS="-Wall -Wextra -fsigned-char"
 +		PROFILE="-g -pg -fsigned-char" ;;
          esac
- fi
- CFLAGS="$CFLAGS $cflags_save"
+ 
+         { echo "$as_me:$LINENO: checking if $CC accepts -Wdeclaration-after-statement" >&5
diff --git a/audio/libvorbis/files/patch-doc_Makefile.in b/audio/libvorbis/files/patch-doc_Makefile.in
index 4a5cb25be9d1..13eb9185be11 100644
--- a/audio/libvorbis/files/patch-doc_Makefile.in
+++ b/audio/libvorbis/files/patch-doc_Makefile.in
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- doc/Makefile.in.orig
-+++ doc/Makefile.in
-@@ -162,7 +162,7 @@
+--- doc/Makefile.in.orig	2009-07-06 20:04:01.000000000 +0200
++++ doc/Makefile.in	2009-07-06 20:04:14.000000000 +0200
+@@ -168,7 +168,7 @@ build_vendor = @build_vendor@
  builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
@@ -12,12 +12,3 @@ $FreeBSD$
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -249,7 +249,7 @@
- # FIXME: also needed here
- #	white-xifish.png 
- built_docs = Vorbis_I_spec.html Vorbis_I_spec.pdf
--@BUILD_DOCS_FALSE@doc_DATA = $(static_docs) $(SPEC_PNG)
-+@BUILD_DOCS_FALSE@doc_DATA = $(static_docs) $(SPEC_PNG) $(built_docs)
- 
- # conditionally make the generated documentation
- @BUILD_DOCS_TRUE@doc_DATA = $(static_docs) $(SPEC_PNG) $(built_docs)
diff --git a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
index b64d6ac493bb..cf04fdc10c9a 100644
--- a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
+++ b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- doc/vorbisenc/Makefile.in.orig
-+++ doc/vorbisenc/Makefile.in
-@@ -150,7 +150,7 @@
+--- doc/vorbisenc/Makefile.in.orig	2009-07-06 20:04:38.000000000 +0200
++++ doc/vorbisenc/Makefile.in	2009-07-06 20:04:49.000000000 +0200
+@@ -156,7 +156,7 @@ build_vendor = @build_vendor@
  builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
@@ -12,15 +12,3 @@ $FreeBSD$
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -187,7 +187,10 @@
- top_srcdir = @top_srcdir@
- doc_DATA = index.html overview.html reference.html style.css\
- 	 vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html\
--	vorbis_encode_init_vbr.html
-+	vorbis_encode_init_vbr.html changes.html examples.html\
-+	ov_ectl_ratemanage2_arg.html ov_ectl_ratemanage_arg.html\
-+	vorbis_encode_setup_init.html vorbis_encode_setup_managed.html\
-+	vorbis_encode_setup_vbr.html
- 
- EXTRA_DIST = $(doc_DATA)
- all: all-am
diff --git a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
index 942e9371fb39..75c50cf16c50 100644
--- a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
+++ b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- doc/vorbisfile/Makefile.in.orig
-+++ doc/vorbisfile/Makefile.in
-@@ -150,7 +150,7 @@
+--- doc/vorbisfile/Makefile.in.orig	2009-07-06 20:05:09.000000000 +0200
++++ doc/vorbisfile/Makefile.in	2009-07-06 20:05:20.000000000 +0200
+@@ -156,7 +156,7 @@ build_vendor = @build_vendor@
  builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
@@ -12,12 +12,3 @@ $FreeBSD$
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -201,7 +201,7 @@
- 	overview.html reference.html return.html seekexample.html seeking.html\
- 	seeking_example_c.html seeking_test_c.html seekingexample.html\
- 	style.css threads.html vorbis_comment.html vorbis_info.html\
--	vorbisfile_example_c.html
-+	vorbisfile_example_c.html ov_fopen.html
- 
- EXTRA_DIST = $(doc_DATA)
- all: all-am
diff --git a/audio/libvorbis/files/patch-lib_codebook.c b/audio/libvorbis/files/patch-lib_codebook.c
deleted file mode 100644
index ac555bdcf7b7..000000000000
--- a/audio/libvorbis/files/patch-lib_codebook.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- lib/codebook.c.orig
-+++ lib/codebook.c
-@@ -159,6 +159,8 @@
-   s->entries=oggpack_read(opb,24);
-   if(s->entries==-1)goto _eofout;
- 
-+  if(_ilog(s->dim)+_ilog(s->entries)>24)goto _eofout;
-+
-   /* codeword ordering.... length ordered or unordered? */
-   switch((int)oggpack_read(opb,1)){
-   case 0:
-@@ -225,7 +227,7 @@
-       int quantvals=0;
-       switch(s->maptype){
-       case 1:
--	quantvals=_book_maptype1_quantvals(s);
-+	quantvals=(s->dim==0?0:_book_maptype1_quantvals(s));
- 	break;
-       case 2:
- 	quantvals=s->entries*s->dim;
diff --git a/audio/libvorbis/files/patch-lib_res0.c b/audio/libvorbis/files/patch-lib_res0.c
deleted file mode 100644
index 67e619ab0bbc..000000000000
--- a/audio/libvorbis/files/patch-lib_res0.c
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- lib/res0.c.orig
-+++ lib/res0.c
-@@ -223,6 +223,20 @@
-   for(j=0;j<acc;j++)
-     if(info->booklist[j]>=ci->books)goto errout;
- 
-+  /* verify the phrasebook is not specifying an impossible or
-+     inconsistent partitioning scheme. */
-+  {
-+    int entries = ci->book_param[info->groupbook]->entries;
-+    int dim = ci->book_param[info->groupbook]->dim;
-+    int partvals = 1;
-+    while(dim>0){
-+      partvals *= info->partitions;
-+      if(partvals > entries) goto errout;
-+      dim--;
-+    }
-+    if(partvals != entries) goto errout;
-+  }
-+
-   return(info);
-  errout:
-   res0_free_info(info);
-@@ -263,7 +277,7 @@
-     }
-   }
- 
--  look->partvals=rint(pow((float)look->parts,(float)dim));
-+  look->partvals=look->phrasebook->entries;
-   look->stages=maxstage;
-   look->decodemap=_ogg_malloc(look->partvals*sizeof(*look->decodemap));
-   for(j=0;j<look->partvals;j++){
diff --git a/audio/libvorbis/pkg-descr b/audio/libvorbis/pkg-descr
index a41d92020e2d..67c411defae8 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: http://www.xiph.org/ogg/vorbis/
+WWW: http://www.xiph.org/vorbis/
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index 7477c8754217..54188b0e0344 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -13,36 +13,26 @@ lib/libvorbisenc.so.2
 lib/libvorbisfile.a
 lib/libvorbisfile.la
 lib/libvorbisfile.so
-lib/libvorbisfile.so.5
+lib/libvorbisfile.so.6
 libdata/pkgconfig/vorbis.pc
 libdata/pkgconfig/vorbisenc.pc
 libdata/pkgconfig/vorbisfile.pc
 share/aclocal/vorbis.m4
-%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.html
-%%PORTDOCS%%%%DOCSDIR%%/Vorbis_I_spec.pdf
-%%PORTDOCS%%%%DOCSDIR%%/components.png
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-avt-rtp-vorbis-06.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-avt-rtp-vorbis-06.xml
 %%PORTDOCS%%%%DOCSDIR%%/eightphase.png
 %%PORTDOCS%%%%DOCSDIR%%/evenlsp.png
-%%PORTDOCS%%%%DOCSDIR%%/floor1-1.png
-%%PORTDOCS%%%%DOCSDIR%%/floor1-2.png
-%%PORTDOCS%%%%DOCSDIR%%/floor1-3.png
-%%PORTDOCS%%%%DOCSDIR%%/floor1-4.png
+%%PORTDOCS%%%%DOCSDIR%%/fish_xiph_org.png
 %%PORTDOCS%%%%DOCSDIR%%/floor1_inverse_dB_table.html
 %%PORTDOCS%%%%DOCSDIR%%/floorval.png
 %%PORTDOCS%%%%DOCSDIR%%/fourphase.png
 %%PORTDOCS%%%%DOCSDIR%%/framing.html
 %%PORTDOCS%%%%DOCSDIR%%/helper.html
-%%PORTDOCS%%%%DOCSDIR%%/hufftree-under.png
-%%PORTDOCS%%%%DOCSDIR%%/hufftree.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/lspmap.png
 %%PORTDOCS%%%%DOCSDIR%%/oddlsp.png
 %%PORTDOCS%%%%DOCSDIR%%/oggstream.html
 %%PORTDOCS%%%%DOCSDIR%%/programming.html
-%%PORTDOCS%%%%DOCSDIR%%/residue-pack.png
-%%PORTDOCS%%%%DOCSDIR%%/residue2.png
+%%PORTDOCS%%%%DOCSDIR%%/rfc5215.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc5215.xml
 %%PORTDOCS%%%%DOCSDIR%%/squarepolar.png
 %%PORTDOCS%%%%DOCSDIR%%/stereo.html
 %%PORTDOCS%%%%DOCSDIR%%/stream.png
@@ -127,10 +117,7 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbisfile_example_c.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisword2.png
 %%PORTDOCS%%%%DOCSDIR%%/wait.png
-%%PORTDOCS%%%%DOCSDIR%%/white-ogg.png
 %%PORTDOCS%%%%DOCSDIR%%/white-xifish.png
-%%PORTDOCS%%%%DOCSDIR%%/window1.png
-%%PORTDOCS%%%%DOCSDIR%%/window2.png
 @dirrm include/vorbis
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisfile
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisenc