Update libsndfile to 1.0.26:

Version 1.0.26 (2015-11-22)
  * Fix for CVE-2014-9496, SD2 buffer read overflow.
  * Fix for CVE-2014-9756, file_io.c divide by zero.
  * Fix for CVE-2015-7805, AIIF heap write overflow.
  * Add support for ALAC encoder in a CAF container.
  * Add support for Cart chunks in WAV files.
  * Minor bug fixes and improvements.

5 files changed, 24 insertions, 67 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 4c63f626138..dbca88cefb3 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2015/08/17 17:11:19 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2015/12/04 20:39:05 wiz Exp $
 
-DISTNAME=	libsndfile-1.0.25
-PKGREVISION=	3
+DISTNAME=	libsndfile-1.0.26
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/files/
 
diff --git a/audio/libsndfile/PLIST b/audio/libsndfile/PLIST
index e25777ddd2c..46e6ee12b7b 100644
--- a/audio/libsndfile/PLIST
+++ b/audio/libsndfile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2010/10/16 08:23:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/12/04 20:39:05 wiz Exp $
 bin/sndfile-cmp
 bin/sndfile-concat
 bin/sndfile-convert
@@ -23,19 +23,19 @@ man/man1/sndfile-interleave.1
 man/man1/sndfile-metadata-get.1
 man/man1/sndfile-metadata-set.1
 man/man1/sndfile-play.1
-share/doc/libsndfile1-dev/html/FAQ.html
-share/doc/libsndfile1-dev/html/api.html
-share/doc/libsndfile1-dev/html/bugs.html
-share/doc/libsndfile1-dev/html/command.html
-share/doc/libsndfile1-dev/html/dither.html
-share/doc/libsndfile1-dev/html/embedded_files.html
-share/doc/libsndfile1-dev/html/index.html
-share/doc/libsndfile1-dev/html/libsndfile.css
-share/doc/libsndfile1-dev/html/libsndfile.jpg
-share/doc/libsndfile1-dev/html/lists.html
-share/doc/libsndfile1-dev/html/new_file_type.HOWTO
-share/doc/libsndfile1-dev/html/octave.html
-share/doc/libsndfile1-dev/html/pkgconfig.html
-share/doc/libsndfile1-dev/html/sndfile_info.html
-share/doc/libsndfile1-dev/html/tutorial.html
-share/doc/libsndfile1-dev/html/win32.html
+man/man1/sndfile-salvage.1
+share/doc/libsndfile/FAQ.html
+share/doc/libsndfile/api.html
+share/doc/libsndfile/bugs.html
+share/doc/libsndfile/command.html
+share/doc/libsndfile/dither.html
+share/doc/libsndfile/embedded_files.html
+share/doc/libsndfile/index.html
+share/doc/libsndfile/libsndfile.css
+share/doc/libsndfile/libsndfile.jpg
+share/doc/libsndfile/lists.html
+share/doc/libsndfile/new_file_type.HOWTO
+share/doc/libsndfile/octave.html
+share/doc/libsndfile/sndfile_info.html
+share/doc/libsndfile/tutorial.html
+share/doc/libsndfile/win32.html
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index a31f00681a6..c2a249b8b24 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.37 2015/11/03 01:12:38 agc Exp $
+$NetBSD: distinfo,v 1.38 2015/12/04 20:39:05 wiz Exp $
 
-SHA1 (libsndfile-1.0.25.tar.gz) = e95d9fca57f7ddace9f197071cbcfb92fa16748e
-RMD160 (libsndfile-1.0.25.tar.gz) = 7330ea9fc1cfa3809fa7d2a6e2a0593b6e0233c7
-SHA512 (libsndfile-1.0.25.tar.gz) = 4ca9780ed0a915aca8a10ef91bf4bf48b05ecb85285c2c3fe7eef1d46d3e0747e61416b6bddbef369bd69adf4b796ff5f61380e0bc998906b170a93341ba6f78
-Size (libsndfile-1.0.25.tar.gz) = 1060692 bytes
-SHA1 (patch-programs_sndfile-play.c) = c72eb9f7b4dbcc87051a841acb8bcdb7cadd5585
-SHA1 (patch-src_file__io.c) = 6f1f5c4dd5f60281e7850f264dd6546c08c28af8
-SHA1 (patch-src_sd2.c) = 34b5317b07bf12f9cf944e8c6154de1444ac7565
+SHA1 (libsndfile-1.0.26.tar.gz) = c9092c06f6ed51034c9e809e150083ff1f55e79e
+RMD160 (libsndfile-1.0.26.tar.gz) = e521b70af27b0a1bd6aebee3b46806d66aac230a
+SHA512 (libsndfile-1.0.26.tar.gz) = 49a131482f9735e2f171ab7b59770cafc6b92e177f88bed9d2e6189390abc5aa473081dce3e4ec3c0e32b6f3d8c19901136b3df15b9222c11b578f522e88257e
+Size (libsndfile-1.0.26.tar.gz) = 1080727 bytes
diff --git a/audio/libsndfile/patches/patch-programs_sndfile-play.c b/audio/libsndfile/patches/patch-programs_sndfile-play.c
deleted file mode 100644
index 30a68b1abbc..00000000000
--- a/audio/libsndfile/patches/patch-programs_sndfile-play.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-programs_sndfile-play.c,v 1.1 2012/06/22 20:31:48 adam Exp $
-
---- programs/sndfile-play.c.orig	2012-06-22 19:48:12.000000000 +0000
-+++ programs/sndfile-play.c
-@@ -58,7 +58,6 @@
- 	#include 	<sys/soundcard.h>
- 
- #elif (defined (__MACH__) && defined (__APPLE__))
--	#include <Carbon.h>
- 	#include <CoreAudio/AudioHardware.h>
- 
- #elif defined (HAVE_SNDIO_H)
diff --git a/audio/libsndfile/patches/patch-src_file__io.c b/audio/libsndfile/patches/patch-src_file__io.c
deleted file mode 100644
index 1f4b8939e1f..00000000000
--- a/audio/libsndfile/patches/patch-src_file__io.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_file__io.c,v 1.1 2015/01/03 18:43:48 spz Exp $
-
-patch for
-http://secunia.com/advisories/61132
-from
-https://github.com/erikd/libsndfile/commit/725c7dbb95bfaf8b4bb7b04820e3a00cceea9ce6
-part 1 of 2
-
---- src/file_io.c.orig	2011-01-19 10:12:28.000000000 +0000
-+++ src/file_io.c
-@@ -1,5 +1,5 @@
- /*
--** Copyright (C) 2002-2011 Erik de Castro Lopo <erikd@mega-nerd.com>
-+** Copyright (C) 2002-2014 Erik de Castro Lopo <erikd@mega-nerd.com>
- ** Copyright (C) 2003 Ross Bencina <rbencina@iprimus.com.au>
- **
- ** This program is free software; you can redistribute it and/or modify
-@@ -358,6 +358,9 @@ psf_fwrite (const void *ptr, sf_count_t 
- {	sf_count_t total = 0 ;
- 	ssize_t	count ;
- 
-+	if (bytes == 0 || items == 0)
-+		return 0 ;
-+
- 	if (psf->virtual_io)
- 		return psf->vio.write (ptr, bytes*items, psf->vio_user_data) / bytes ;
-