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 | 9d9c8a0c04a59db88fc57b3d187e64cee7107db1 (patch) | |
| tree | effc766e74793872dab9b5e6352ea0ba39438c4b /media-sound/combine_wave | |
| parent | Remove vulnerable version bug #364191 (diff) | |
| download | historical-9d9c8a0c04a59db88fc57b3d187e64cee7107db1.tar.gz historical-9d9c8a0c04a59db88fc57b3d187e64cee7107db1.tar.bz2 historical-9d9c8a0c04a59db88fc57b3d187e64cee7107db1.zip | |
Fixed overflow (bug 337090)
Package-Manager: portage-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/Manifest | 15 | ||||
| -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 |
4 files changed, 52 insertions, 6 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/Manifest b/media-sound/combine_wave/Manifest index 83d61dc22104..2e64e3bbee89 100644 --- a/media-sound/combine_wave/Manifest +++ b/media-sound/combine_wave/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX combine_wave-0.3.1-overflow.patch 968 RMD160 c285a686640c6c10231b1b795545d137c1150bde SHA1 ad92f301eadbae8a83f28e25272077d605be2e4a SHA256 6fe38cda2f0747cde1de777c86c9ff735c65e8a3e00bc3d0e45023339ea8baee DIST combine_wave-0.3.1.tgz 14875 RMD160 c05b4c29723f7873ac351f561d424fcfbfa531f3 SHA1 baff4718855cd2e565e46539f14062fae0f8b7de SHA256 871dd240bce9f19a8f190496dc8aff7ef4f09c3a55bff2ec3f1c1fc2a2f68078 -EBUILD combine_wave-0.3.1.ebuild 797 RMD160 dbeb6d554ea1803be09da67a391dff0aee245d6d SHA1 c9813a56f214faa1def8f4f3b2877de0bd8723db SHA256 c7458e00d949813d3c9453bbeef7786051e145fcd4e59500e08cfb9f78c37733 -MISC ChangeLog 877 RMD160 e6ab755375c9a4157e7815bd5df6655b502c7fc0 SHA1 712bc30b653d9dde5ac113111f43f2a0b717a0be SHA256 18adb1f8925a002bc13e12f8c3fc5a18238ec54a325761728c97b81054a21500 +EBUILD combine_wave-0.3.1-r1.ebuild 841 RMD160 a182dc641a4b7f9b552acb1c58f11bbc39beacff SHA1 f11e670c5ba8baa35bde67aa5b0935483b385cb3 SHA256 e92767e0f0bcd1d5c2f4af7371115fd5f7291f14d3e890be80c18abb07082ce9 +MISC ChangeLog 1104 RMD160 b023950c929c4063b3feb47635ec40ff85ab17de SHA1 0f8a377c9a1aac8b5ba3e3f6f17dc6b0f564c8d1 SHA256 c78cfb0c491de5f20ef816bf9fa3fa787d5ec77869b11ec2b8c30780a4f4523c MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk22v8sACgkQmWq1bYTyC0MyRQD8DFlsV8jT5DU1WZPLZW5DwGRn +KUfA15QdhY5y6Q7E4MABAIEWbeM6Xzm0Z4KhkdsnPhaCV+mmrCkkO9REXRET/ksM +=SQB3 +-----END PGP SIGNATURE----- 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; + |