Use a different patch to fix the overflow, this is what upstream actually intended to do

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 39 insertions, 35 deletions

diff --git a/media-sound/combine_wave/ChangeLog b/media-sound/combine_wave/ChangeLog
index ba6f537ba844..314b7254ec4c 100644
--- a/media-sound/combine_wave/ChangeLog
+++ b/media-sound/combine_wave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/combine_wave
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/combine_wave/ChangeLog,v 1.7 2011/04/26 12:58:41 angelos Exp $
+
+  26 Apr 2011; Christoph Mende <christoph@gentoo.org>
+  combine_wave-0.3.1-r1.ebuild, files/combine_wave-0.3.1-overflow.patch:
+  Use a different patch to fix the overflow, this is what upstream actually
+  intended to do
 
 *combine_wave-0.3.1-r1 (26 Apr 2011)
 
diff --git a/media-sound/combine_wave/Manifest b/media-sound/combine_wave/Manifest
index 2e64e3bbee89..c0f4630cdef2 100644
--- a/media-sound/combine_wave/Manifest
+++ b/media-sound/combine_wave/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX combine_wave-0.3.1-overflow.patch 968 RMD160 c285a686640c6c10231b1b795545d137c1150bde SHA1 ad92f301eadbae8a83f28e25272077d605be2e4a SHA256 6fe38cda2f0747cde1de777c86c9ff735c65e8a3e00bc3d0e45023339ea8baee
+AUX combine_wave-0.3.1-overflow.patch 840 RMD160 85898b68f4182680b5688fb1b9dc06da1ae9e17b SHA1 faa79b1e2e78a5f36f03d51ab6a5e2114cd3b37b SHA256 25c283da8c22c890a9220d1a959abc93b1447ed43b74f3a7f69c76d7f14e91de
 DIST combine_wave-0.3.1.tgz 14875 RMD160 c05b4c29723f7873ac351f561d424fcfbfa531f3 SHA1 baff4718855cd2e565e46539f14062fae0f8b7de SHA256 871dd240bce9f19a8f190496dc8aff7ef4f09c3a55bff2ec3f1c1fc2a2f68078
-EBUILD combine_wave-0.3.1-r1.ebuild 841 RMD160 a182dc641a4b7f9b552acb1c58f11bbc39beacff SHA1 f11e670c5ba8baa35bde67aa5b0935483b385cb3 SHA256 e92767e0f0bcd1d5c2f4af7371115fd5f7291f14d3e890be80c18abb07082ce9
-MISC ChangeLog 1104 RMD160 b023950c929c4063b3feb47635ec40ff85ab17de SHA1 0f8a377c9a1aac8b5ba3e3f6f17dc6b0f564c8d1 SHA256 c78cfb0c491de5f20ef816bf9fa3fa787d5ec77869b11ec2b8c30780a4f4523c
+EBUILD combine_wave-0.3.1-r1.ebuild 848 RMD160 02a98d979e837b8991a98da7acafc0fdde45277d SHA1 e9e1f512cf84d38c4fcb1f679a02cb68f62072ef SHA256 4f2ec078dee6c66f9fe7aadbc277fa0cfe87a38e4b688b900200c9a0195a0bc5
+MISC ChangeLog 1325 RMD160 b67336bcbf4b54229c4f7a69b1075ad2bdb37200 SHA1 f05d1919e3be4b2f24968b911c18137c20c4712a SHA256 6058745010c8bb11747222efc2d7a039a50d3f5480cb24711b2b73f76be5fb92
 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
+iF4EAREIAAYFAk22wXsACgkQmWq1bYTyC0PgywD/emcpw/c7cXNLruF8AAyqxpMP
+h67LBkYjfmjchkEokLMBAMMc8vSqb6ZTMAGwNv73SysFsCM/2wB/NbvE+0DouVTm
+=S1Nm
 -----END PGP SIGNATURE-----
diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
index 38bdf8693696..dc1212ad9ae7 100644
--- a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2011/04/26 12:51:29 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild,v 1.2 2011/04/26 12:58:41 angelos Exp $
 
 EAPI="2"
 
@@ -28,6 +28,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin combine_wave
+	dobin combine_wave || die
 	dodoc CHANGES README combine_wave.man
 }
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
index 3174577dfb92..ee7fe38da458 100644
--- 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
@@ -1,27 +1,26 @@
-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 @@
+diff --git a/combine_wave.c b/combine_wave.c
+index 5bfa4aa..391db25 100644
+--- a/combine_wave.c
++++ b/combine_wave.c
+@@ -601,9 +601,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
  
- 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;
- 					
+@@ -622,7 +622,7 @@ else
+ 
+ out_header -> sample_fq = left_header -> sample_fq;
+ out_header -> bit_p_spl = 16; // left_header -> bit_p_spl;
+-strcpy(out_header -> data_chunk, "data");
++memcpy(out_header -> data_chunk, "data", 4);
+ 
+ if(right_header -> data_length > left_header -> data_length) 
+ 	{