[SCM] ardour/master: Drop CVE-2007-4974

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4a92e51b9f1d3431217920acb4a05cb1fd46f41e
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Jun 25 17:58:24 2012 +0200

    Drop CVE-2007-4974
    
    Included upstream

diff --git a/debian/patches/CVE-2007-4974.patch b/debian/patches/CVE-2007-4974.patch
deleted file mode 100644
index 0bfb45e..0000000
--- a/debian/patches/CVE-2007-4974.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nurad ardour-2.1~/libs/libsndfile/src/flac.c ardour-2.1/libs/libsndfile/src/flac.c
---- ardour-2.1~/libs/libsndfile/src/flac.c	2007-12-04 17:21:35.000000000 +0100
-+++ ardour-2.1/libs/libsndfile/src/flac.c	2007-12-04 17:25:32.000000000 +0100
-@@ -50,7 +50,7 @@
- ** Private static functions.
- */
- 
--#define ENC_BUFFER_SIZE 4096
-+#define ENC_BUFFER_SIZE 8192
- 
- typedef enum
- {	PFLAC_PCM_SHORT = 0,
-@@ -172,6 +172,17 @@
- 	const FLAC__int32* const *buffer = pflac->wbuffer ;
- 	unsigned i = 0, j, offset ;
- 
-+	/*
-+	**	frame->header.blocksize is variable and we're using a constant blocksize
-+	**	of FLAC__MAX_BLOCK_SIZE.
-+	**	Check our assumptions here.
-+	*/
-+	if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
-+	{	psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ;
-+		psf->error = SFE_INTERNAL ;
-+		return 0 ;
-+	}
-+
- 	if (pflac->ptr == NULL)
- 	{	/*
- 		**	Not sure why this code is here and not elsewhere.
-@@ -180,7 +191,7 @@
- 		pflac->bufferbackup = SF_TRUE ;
- 		for (i = 0 ; i < frame->header.channels ; i++)
- 		{	if (pflac->rbuffer [i] == NULL)
--				pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ;
-+				pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
- 			memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ;
- 			} ;
- 		pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;

-- 
ardour Debian packaging