Update to 1.0.25:

(SA45125 was already fixed in the package)

Version 1.0.25 (2011-07-13)
  * Fix for Secunia Advisory SA45125, heap overflow in PAF file handler.
  * Accept broken WAV files with blockalign == 0.
  * Minor bug fixes and improvements.

5 files changed, 6 insertions, 65 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 8ae51a4e952..cdf77ac1e3a 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2011/07/14 09:49:01 drochner Exp $
+# $NetBSD: Makefile,v 1.62 2011/08/06 10:23:16 wiz Exp $
 
-DISTNAME=	libsndfile-1.0.24
-PKGREVISION=	1
+DISTNAME=	libsndfile-1.0.25
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/files/
 
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index af34ebfcd58..17e21cafa8e 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.33 2011/07/14 09:49:01 drochner Exp $
+$NetBSD: distinfo,v 1.34 2011/08/06 10:23:16 wiz Exp $
 
-SHA1 (libsndfile-1.0.24.tar.gz) = ade2dad272b52f61bb58aca3a4004b28549ee0f8
-RMD160 (libsndfile-1.0.24.tar.gz) = 5ace8823b3b44576e8cf5ec8fa8d46935d8fb350
-Size (libsndfile-1.0.24.tar.gz) = 963034 bytes
-SHA1 (patch-aa) = 832fb2e44d692922403fccbfe23315a925e4f931
-SHA1 (patch-ab) = 5b2139035c41b49c714fabdff40dd0d5db5a306e
-SHA1 (patch-ac) = 5e7383f4332f24f609ae208aa75044f9863c5205
+SHA1 (libsndfile-1.0.25.tar.gz) = e95d9fca57f7ddace9f197071cbcfb92fa16748e
+RMD160 (libsndfile-1.0.25.tar.gz) = 7330ea9fc1cfa3809fa7d2a6e2a0593b6e0233c7
+Size (libsndfile-1.0.25.tar.gz) = 1060692 bytes
diff --git a/audio/libsndfile/patches/patch-aa b/audio/libsndfile/patches/patch-aa
deleted file mode 100644
index 682aacf239f..00000000000
--- a/audio/libsndfile/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.17 2011/07/14 09:49:01 drochner Exp $
-
-SA45125
-
---- src/common.h.orig	2011-03-23 09:01:02.000000000 +0000
-+++ src/common.h
-@@ -557,6 +557,7 @@ enum
- 	SFE_PAF_VERSION,
- 	SFE_PAF_UNKNOWN_FORMAT,
- 	SFE_PAF_SHORT_HEADER,
-+	SFE_PAF_BAD_CHANNELS,
- 
- 	SFE_SVX_NO_FORM,
- 	SFE_SVX_NO_BODY,
diff --git a/audio/libsndfile/patches/patch-ab b/audio/libsndfile/patches/patch-ab
deleted file mode 100644
index d66770c5936..00000000000
--- a/audio/libsndfile/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2011/07/14 09:49:01 drochner Exp $
-
-SA45125
-
---- src/paf.c.orig	2011-03-23 09:01:02.000000000 +0000
-+++ src/paf.c
-@@ -163,6 +163,9 @@ paf_read_header	(SF_PRIVATE *psf)
- {	PAF_FMT		paf_fmt ;
- 	int			marker ;
- 
-+	if (psf->filelength < PAF_HEADER_LENGTH)
-+		return SFE_PAF_SHORT_HEADER ;
-+
- 	memset (&paf_fmt, 0, sizeof (paf_fmt)) ;
- 	psf_binheader_readf (psf, "pm", 0, &marker) ;
- 
-@@ -199,8 +202,8 @@ paf_read_header	(SF_PRIVATE *psf)
- 		psf->endian = SF_ENDIAN_BIG ;
- 		} ;
- 
--	if (psf->filelength < PAF_HEADER_LENGTH)
--		return SFE_PAF_SHORT_HEADER ;
-+	if (paf_fmt.channels > SF_MAX_CHANNELS)
-+		return SFE_PAF_BAD_CHANNELS ;
- 
- 	psf->datalength = psf->filelength - psf->dataoffset ;
- 
diff --git a/audio/libsndfile/patches/patch-ac b/audio/libsndfile/patches/patch-ac
deleted file mode 100644
index 30bde51691d..00000000000
--- a/audio/libsndfile/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.13 2011/07/14 09:49:01 drochner Exp $
-
-SA45125
-
---- src/sndfile.c.orig	2011-03-23 09:01:02.000000000 +0000
-+++ src/sndfile.c
-@@ -173,6 +173,7 @@ ErrorStruct SndfileErrors [] =
- 	{	SFE_PAF_VERSION			, "Error in PAF file, bad version." },
- 	{	SFE_PAF_UNKNOWN_FORMAT	, "Error in PAF file, unknown format." },
- 	{	SFE_PAF_SHORT_HEADER	, "Error in PAF file. File shorter than minimal header." },
-+	{	SFE_PAF_BAD_CHANNELS	, "Error in PAF file. Bad channel count." },
- 
- 	{	SFE_SVX_NO_FORM			, "Error in 8SVX / 16SV file, no 'FORM' marker." },
- 	{	SFE_SVX_NO_BODY			, "Error in 8SVX / 16SV file, no 'BODY' marker." },