[SCM] flac/master: Drop obsolete patches

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Jan 3 19:38:14 UTC 2017


The following commit has been merged in the master branch:
commit 78c298117ad46f606dc415b43ac4a10577d1d1ca
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Tue Jan 3 20:20:42 2017 +0100

    Drop obsolete patches

diff --git a/debian/patches/flac.git-43ba7ad05f1656e885ce2f34a9a72494f45705ae.patch b/debian/patches/flac.git-43ba7ad05f1656e885ce2f34a9a72494f45705ae.patch
deleted file mode 100644
index 90fe4ff..0000000
--- a/debian/patches/flac.git-43ba7ad05f1656e885ce2f34a9a72494f45705ae.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 43ba7ad05f1656e885ce2f34a9a72494f45705ae Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd at mega-nerd.com>
-Date: Fri, 28 Nov 2014 23:39:25 +1100
-Subject: [PATCH] src/libFLAC/stream_decoder.c : Fix another input validation bug.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-If a file says it contains a stupidly large number of vorbis comments,
-the stream decoder would try to allocate enough memory which would fail
-returning NULL and then write to that pointer anyway. The solution is
-to set a hard limit of 10000 vorbis comments and force num_comments to
-zero if the number is too large.
-
-Problem found using the afl (american fuzzy lop) fuzzer.
-
-Closes: https://sourceforge.net/p/flac/bugs/421/
-Reported-by : Hanno Böck <hanno at hboeck.de>
----
- src/libFLAC/stream_decoder.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
---- a/src/libFLAC/stream_decoder.c
-+++ b/src/libFLAC/stream_decoder.c
-@@ -1728,6 +1728,11 @@ FLAC__bool read_metadata_vorbiscomment_(
- 			return false; /* read_callback_ sets the state for us */
- 
- 		/* read comments */
-+		if (obj->num_comments > 100000) {
-+			/* Possibly malicious file. */
-+			obj->num_comments = 0;
-+			return false;
-+		}
- 		if (obj->num_comments > 0) {
- 			if (0 == (obj->comments = safe_malloc_mul_2op_p(obj->num_comments, /*times*/sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) {
- 				decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
diff --git a/debian/patches/requires-flac.patch b/debian/patches/requires-flac.patch
deleted file mode 100644
index 31acd06..0000000
--- a/debian/patches/requires-flac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Chain::Status::as_cstring uses
- FLAC__Metadata_ChainStatusString which is in libFLAC. Since the function
- is inline, every program calling this function must also link with -lflac,
- but this is missing in flac++.pc.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713645
-
---- a/src/libFLAC++/flac++.pc.in
-+++ b/src/libFLAC++/flac++.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: FLAC++
- Description: Free Lossless Audio Codec Library (C++ API)
- Version: @VERSION@
--Requires.private: flac
-+Requires: flac
- Libs: -L${libdir} -lFLAC++
- Cflags: -I${includedir}
diff --git a/debian/patches/series b/debian/patches/series
index 614722b..102288a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 Revert-man-Makefile-Fail-more-gracefully.patch
-requires-flac.patch
-flac.git-43ba7ad05f1656e885ce2f34a9a72494f45705ae.patch
 privacy-breach-logo.patch
 privacy-breach-w3c-valid-html.patch

-- 
flac packaging



More information about the pkg-multimedia-commits mailing list