diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2011-04-26 12:51:29 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2011-04-26 12:51:29 +0000 |
| commit | 6e78641e6376ed214cb9e3e3f18d59a2a05881c5 (patch) | |
| tree | 5c7a266a21568e8786098ab505a78c5eaf0806cc /media-sound/combine_wave | |
| parent | Remove vulnerable version bug #364191 (diff) | |
| download | gentoo-2-6e78641e6376ed214cb9e3e3f18d59a2a05881c5.tar.gz gentoo-2-6e78641e6376ed214cb9e3e3f18d59a2a05881c5.tar.bz2 gentoo-2-6e78641e6376ed214cb9e3e3f18d59a2a05881c5.zip | |
Fixed overflow (bug 337090)
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/combine_wave')
| -rw-r--r-- | media-sound/combine_wave/ChangeLog | 11 | ||||
| -rw-r--r-- | media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild (renamed from media-sound/combine_wave/combine_wave-0.3.1.ebuild) | 5 | ||||
| -rw-r--r-- | media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch | 27 |
3 files changed, 39 insertions, 4 deletions
diff --git a/media-sound/combine_wave/ChangeLog b/media-sound/combine_wave/ChangeLog index 940e42c41fb7..ba6f537ba844 100644 --- a/media-sound/combine_wave/ChangeLog +++ b/media-sound/combine_wave/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/combine_wave -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/combine_wave/ChangeLog,v 1.5 2010/07/20 23:57:25 sbriesen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/combine_wave/ChangeLog,v 1.6 2011/04/26 12:51:29 angelos Exp $ + +*combine_wave-0.3.1-r1 (26 Apr 2011) + + 26 Apr 2011; Christoph Mende <christoph@gentoo.org> + -combine_wave-0.3.1.ebuild, +combine_wave-0.3.1-r1.ebuild, + +files/combine_wave-0.3.1-overflow.patch: + Fixed overflow (bug 337090) 20 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org> -files/combine_wave-0.3.diff: diff --git a/media-sound/combine_wave/combine_wave-0.3.1.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild index a714b558bd0b..38bdf8693696 100644 --- a/media-sound/combine_wave/combine_wave-0.3.1.ebuild +++ b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 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/combine_wave/combine_wave-0.3.1.ebuild,v 1.2 2010/07/20 23:55:38 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild,v 1.1 2011/04/26 12:51:29 angelos Exp $ EAPI="2" @@ -20,6 +20,7 @@ src_prepare() { # fix makefile sed -i -e "s:gcc:\$(CC):g" -e "s:= -O2:+=:g" \ -e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile + epatch "${FILESDIR}"/${P}-overflow.patch } src_compile() { diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch new file mode 100644 index 000000000000..3174577dfb92 --- /dev/null +++ b/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch @@ -0,0 +1,27 @@ +diff --git a/wave_header.h b/wave_header.h +index e1f6071..70d30e4 100644 +--- a/wave_header.h ++++ b/wave_header.h +@@ -3,10 +3,10 @@ + + typedef struct + { /* header for WAV-Files */ +- char main_chunk[4]; /* 'RIFF' */ ++ char main_chunk[5]; /* 'RIFF' */ + uint32_t length; /* length of file */ +- char chunk_type[4]; /* 'WAVE' */ +- char sub_chunk[4]; /* 'fmt' */ ++ char chunk_type[5]; /* 'WAVE' */ ++ char sub_chunk[5]; /* 'fmt ' */ + uint32_t length_chunk; /* length sub_chunk, always 16 bytes */ + uint16_t format; /* always 1 = PCM-Code */ + uint16_t modus; /* 1 = Mono, 2 = Stereo */ +@@ -14,7 +14,7 @@ typedef struct + uint32_t byte_p_sec; /* Data per sec */ + uint16_t byte_p_spl; /* bytes per sample, 1=8 bit, 2=16 bit (mono) 2=8 bit, 4=16 bit (stereo) */ + uint16_t bit_p_spl; /* bits per sample, 8, 12, 16 */ +- char data_chunk[4]; /* 'data' */ ++ char data_chunk[5]; /* 'data' */ + uint32_t data_length; /* length of data */ + } wave_header; + |