summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2011-04-26 13:02:50 +0000
committerChristoph Mende <angelos@gentoo.org>2011-04-26 13:02:50 +0000
commit51e239dd7513de6de5f37571f085b86a6032e741 (patch)
tree14d4c83e18afd15cc6047ca43ec7c946376a1de9 /media-sound/substract_wave
parentUse a different patch to fix the overflow, this is what upstream actually int... (diff)
downloadhistorical-51e239dd7513de6de5f37571f085b86a6032e741.tar.gz
historical-51e239dd7513de6de5f37571f085b86a6032e741.tar.bz2
historical-51e239dd7513de6de5f37571f085b86a6032e741.zip
Fixed overflow (bug 337446))
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'media-sound/substract_wave')
-rw-r--r--media-sound/substract_wave/ChangeLog11
-rw-r--r--media-sound/substract_wave/files/substract_wave-0.3-overflow.patch26
-rw-r--r--media-sound/substract_wave/substract_wave-0.3-r1.ebuild (renamed from media-sound/substract_wave/substract_wave-0.3.ebuild)7
3 files changed, 39 insertions, 5 deletions
diff --git a/media-sound/substract_wave/ChangeLog b/media-sound/substract_wave/ChangeLog
index 205afb311fcc..c0f18cc4a428 100644
--- a/media-sound/substract_wave/ChangeLog
+++ b/media-sound/substract_wave/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-sound/substract_wave
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/substract_wave/ChangeLog,v 1.3 2009/05/11 20:21:32 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/substract_wave/ChangeLog,v 1.4 2011/04/26 13:02:50 angelos Exp $
+
+*substract_wave-0.3-r1 (26 Apr 2011)
+
+ 26 Apr 2011; Christoph Mende <christoph@gentoo.org>
+ -substract_wave-0.3.ebuild, +substract_wave-0.3-r1.ebuild,
+ +files/substract_wave-0.3-overflow.patch:
+ Fixed overflow (bug 337446))
11 May 2009; Samuli Suominen <ssuominen@gentoo.org>
substract_wave-0.3.ebuild, +files/substract_wave-0.3-Makefile.patch,
diff --git a/media-sound/substract_wave/files/substract_wave-0.3-overflow.patch b/media-sound/substract_wave/files/substract_wave-0.3-overflow.patch
new file mode 100644
index 000000000000..991a4f6c5381
--- /dev/null
+++ b/media-sound/substract_wave/files/substract_wave-0.3-overflow.patch
@@ -0,0 +1,26 @@
+diff --git a/substract_wave.c b/substract_wave.c
+index a44e5e5..bef211b 100644
+--- a/substract_wave.c
++++ b/substract_wave.c
+@@ -545,9 +545,9 @@ for(i = 0; i < header_size; i++)
+ *ptr = 0;
+ ptr++;
+ }
+-strcpy(out_header -> main_chunk, "RIFF");
+-strcpy(out_header -> chunk_type, "WAVE");
+-strcpy(out_header -> sub_chunk, "fmt ");
++memcpy(out_header -> main_chunk, "RIFF", 4);
++memcpy(out_header -> chunk_type, "WAVE", 4);
++memcpy(out_header -> sub_chunk, "fmt ", 4);
+ out_header -> length_chunk = 16; //always 16
+ out_header -> format = 1; //PCM
+
+@@ -557,7 +557,7 @@ out_header -> byte_p_spl = main_header -> byte_p_spl;
+
+ out_header -> sample_fq = main_header -> sample_fq;
+ out_header -> bit_p_spl = 16; // main_header -> bit_p_spl;
+-strcpy(out_header -> data_chunk, "data");
++memcpy(out_header -> data_chunk, "data", 4);
+
+ main_offset = start_offset + (samples_offset * 2);
+
diff --git a/media-sound/substract_wave/substract_wave-0.3.ebuild b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
index 9b9e5ed71b16..5ae36af83615 100644
--- a/media-sound/substract_wave/substract_wave-0.3.ebuild
+++ b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/substract_wave/substract_wave-0.3.ebuild,v 1.3 2009/05/11 20:21:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/substract_wave/substract_wave-0.3-r1.ebuild,v 1.1 2011/04/26 13:02:50 angelos Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
src_prepare() {
- epatch "${FILESDIR}"/${P}-Makefile.patch
+ epatch "${FILESDIR}"/${P}-Makefile.patch \
+ "${FILESDIR}"/${P}-overflow.patch
}
src_compile() {