Added -fsigned-char to sox-12.17.4-r2 and sox-12.17.5-r1 to fix bug #35745. Patch for wav segfaults in sox-12.17.5-r1, also bug #35745

5 files changed, 35 insertions, 12 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 876cedd3b59a..93e9cef884fc 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/sox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.32 2004/09/14 07:43:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.33 2004/10/17 23:43:09 josejx Exp $
+
+  18 Oct 2004; Joseph Jezak <josejx@gentoo.org>
+  +files/sox-wav-segfault.patch, sox-12.17.4-r2.ebuild,
+  sox-12.17.5-r1.ebuild:
+  Added -fsigned-char to sox-12.17.4-r2 and sox-12.17.5-r1 to fix bug #35745.
+  Patch for wav segfaults in sox-12.17.5-r1, also bug #35745
 
   14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> :
   Removing sox-12.17.5 as it installs exactly the same thing as -r1. -r1 should
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 0e746b592d11..1119e4e395e9 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,11 +1,12 @@
-MD5 21231305b1397228e808e34ea97a151f ChangeLog 3995
+MD5 850aafc2e13258db65ceace8660c14b9 ChangeLog 4260
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 bed3d88f07d84824e45c7baf1231fc5d sox-12.17.3-r3.ebuild 1042
-MD5 d32154408709c55d29a181b543ef57f7 sox-12.17.5-r1.ebuild 1907
-MD5 262c7476349bc47f8a4cff33c51815fa sox-12.17.4-r2.ebuild 1505
+MD5 58d48629a7a079e4b351cf17c1cf7ebf sox-12.17.4-r2.ebuild 1586
+MD5 a20bdc43dfeb3eeccb9624c09854c84e sox-12.17.5-r1.ebuild 2041
 MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r3 63
-MD5 55b945c4cad98947d37be88cf3c5ef7e files/sox-soundcard.patch 275
 MD5 64aef0b430e70836aae794f8e91ea8dc files/digest-sox-12.17.4-r2 63
-MD5 8a1b39117b61aeb3d136106f13347185 files/sox-wave-overflow.patch 736
-MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
 MD5 12cd6316db89eaf0efe7f5f33b5be707 files/digest-sox-12.17.5-r1 63
+MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
+MD5 55b945c4cad98947d37be88cf3c5ef7e files/sox-soundcard.patch 275
+MD5 8a1b39117b61aeb3d136106f13347185 files/sox-wave-overflow.patch 736
+MD5 923124d7fbe0a70712b4991ae52a968b files/sox-wav-segfault.patch 255
diff --git a/media-sound/sox/files/sox-wav-segfault.patch b/media-sound/sox/files/sox-wav-segfault.patch
new file mode 100644
index 000000000000..efdda66477f6
--- /dev/null
+++ b/media-sound/sox/files/sox-wav-segfault.patch
@@ -0,0 +1,11 @@
+--- wav.c	2004-08-25 23:12:11.660273688 -0400
++++ sox-12.17.5/wav.c	2004-08-25 23:12:21.706746392 -0400
+@@ -1088,7 +1088,7 @@
+ 
+     if (ft->comment) 
+     {
+-        free(ft->comment);
++        /* free(ft->comment); */
+         ft->comment = 0;
+     }
+ 
diff --git a/media-sound/sox/sox-12.17.4-r2.ebuild b/media-sound/sox/sox-12.17.4-r2.ebuild
index 8e525cfd200f..f6fa75293f8b 100644
--- a/media-sound/sox/sox-12.17.4-r2.ebuild
+++ b/media-sound/sox/sox-12.17.4-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.4-r2.ebuild,v 1.3 2004/08/11 20:40:35 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.4-r2.ebuild,v 1.4 2004/10/17 23:43:09 josejx Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils flag-o-matic
 
 DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
@@ -19,7 +19,6 @@ DEPEND="virtual/libc
 	mad? ( media-sound/madplay )"
 
 src_compile () {
-
 	# Needed on mips and probablly others
 	gnuconfig_update
 
@@ -29,6 +28,8 @@ src_compile () {
 
 	# Wave buffer overflow fix.  Adresses Bug #57962
 	epatch ${FILESDIR}/sox-wave-overflow.patch
+	# Wave segfault fix.  Adresses Bug #35745
+	append-flags -fsigned-char
 
 	use oggvorbis || myconf="${myconf} --disable-ogg-vorbis"
 	use mad || myconf="${myconf} --disable-mad"
diff --git a/media-sound/sox/sox-12.17.5-r1.ebuild b/media-sound/sox/sox-12.17.5-r1.ebuild
index 1c19297f301e..d36e15c57349 100644
--- a/media-sound/sox/sox-12.17.5-r1.ebuild
+++ b/media-sound/sox/sox-12.17.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5-r1.ebuild,v 1.2 2004/09/14 07:43:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5-r1.ebuild,v 1.3 2004/10/17 23:43:09 josejx Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils flag-o-matic
 
 DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
@@ -30,6 +30,10 @@ src_compile () {
 	epatch ${FILESDIR}/${PN}-soundcard.patch
 	epatch ${FILESDIR}/${PN}-install.patch
 
+	# Fixes wav segfaults. See Bug #35745.
+	append-flags -fsigned-char
+	use ppc && epatch ${FILESDIR}/${PN}-wav-segfault.patch
+
 	myconf="${myconf} `use_enable oggvorbis ogg-vorbis`"
 	myconf="${myconf} `use_enable mad`"
 	myconf="${myconf} `use_enable encode lame`"