Fixes amd64 segfault - bug #128378

Package-Manager: portage-2.1_pre7-r5

4 files changed, 24 insertions, 11 deletions

diff --git a/media-sound/gramofile/ChangeLog b/media-sound/gramofile/ChangeLog
index 668f0db6d7f3..0afd013882b5 100644
--- a/media-sound/gramofile/ChangeLog
+++ b/media-sound/gramofile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gramofile
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/ChangeLog,v 1.13 2006/02/11 20:31:04 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/ChangeLog,v 1.14 2006/04/19 22:22:35 malc Exp $
+
+  19 Apr 2006; <malc@gentoo.org> gramofile-1.6-r1.ebuild:
+  Undefine -DREDHAT50 in bplaysrc/Makefile to get a valid prototype for
+  basename on amd64 to avoid segfault - bug #128378
 
   11 Feb 2006; Patrick McLean <chutzpah@gentoo.org> metadata.xml,
   gramofile-1.6.ebuild, gramofile-1.6-r1.ebuild:
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
index 05cc92226b61..79a568920da2 100644
--- a/media-sound/gramofile/Manifest
+++ b/media-sound/gramofile/Manifest
@@ -1,18 +1,18 @@
-MD5 eb50246afa70efa18034da13db439e85 ChangeLog 1743
-RMD160 91548a1f1b87c5e6da76430f51fe46ed91b19375 ChangeLog 1743
-SHA256 0a378f6518fd4ecbf92d28740516f30f525f7f3486b6f256dd90a3f512d91ef8 ChangeLog 1743
+MD5 0f1f7cde20c082100deda41414dc743e ChangeLog 1922
+RMD160 319dbd2c893f38795035cdb2eb98a21e62ad755d ChangeLog 1922
+SHA256 bf678b1b439444a393901408cfd617ee3f1a60c4f1011ec0d3579c0e23b51814 ChangeLog 1922
 MD5 9b67a0ae80d507fff7c72c73a58c9506 files/digest-gramofile-1.6 180
 RMD160 6206443c2385da66d6509e0895c8c01c09a7a064 files/digest-gramofile-1.6 180
 SHA256 3aabb99ca293536bebd7298e3a81647cb74e0962c31dec11306a601286c81fb0 files/digest-gramofile-1.6 180
-MD5 9b67a0ae80d507fff7c72c73a58c9506 files/digest-gramofile-1.6-r1 180
-RMD160 6206443c2385da66d6509e0895c8c01c09a7a064 files/digest-gramofile-1.6-r1 180
-SHA256 3aabb99ca293536bebd7298e3a81647cb74e0962c31dec11306a601286c81fb0 files/digest-gramofile-1.6-r1 180
+MD5 83aca4abfeb7452a9528e1a79566dc91 files/digest-gramofile-1.6-r1 678
+RMD160 0b066ed43ce9b817795c7d6a1231a6e10dc43351 files/digest-gramofile-1.6-r1 678
+SHA256 d45078166027c78fd7e21a9e344d22e127510b09cb087b73d906f15d186fa069 files/digest-gramofile-1.6-r1 678
 MD5 40aee998927430b81f1b483ccaed615c files/gramofile-1.6-64bit.patch 1332
 RMD160 810c3b49030a01106bc2791a1a4cdc6a132ca070 files/gramofile-1.6-64bit.patch 1332
 SHA256 c29ee2fb213f43f053b474d365408ae00b352d26749e13488295b6a8026e8f41 files/gramofile-1.6-64bit.patch 1332
-MD5 1659325bc6322211881643510cad508c gramofile-1.6-r1.ebuild 1176
-RMD160 9e4f8008000c281a0013ef015076a0a39cf3957b gramofile-1.6-r1.ebuild 1176
-SHA256 a9bafe2632e7934496171b5a8b87b916f40acfae20f68732d29987f2c8ce83b7 gramofile-1.6-r1.ebuild 1176
+MD5 5a6ce2f2bfdec6cc3d37aae2a8ea2ca8 gramofile-1.6-r1.ebuild 1327
+RMD160 ce1131826363c5375e281eac2c65c18c30c532ee gramofile-1.6-r1.ebuild 1327
+SHA256 5cd52ce2e988f98b2f71bcc0decb06f21cfcad783d00d6c76ce905ec5eaa486e gramofile-1.6-r1.ebuild 1327
 MD5 732a933573033ab5b1a79d287701971c gramofile-1.6.ebuild 1134
 RMD160 f6f11a1d9756adbc8e32efbbefe0fc96546cffe1 gramofile-1.6.ebuild 1134
 SHA256 53827f0dd7551fc040f2b8f9de319bc84a7e1039d472138e92c8baf9fabc71de gramofile-1.6.ebuild 1134
diff --git a/media-sound/gramofile/files/digest-gramofile-1.6-r1 b/media-sound/gramofile/files/digest-gramofile-1.6-r1
index 42ed41e916e7..ee2a8690f785 100644
--- a/media-sound/gramofile/files/digest-gramofile-1.6-r1
+++ b/media-sound/gramofile/files/digest-gramofile-1.6-r1
@@ -1,3 +1,9 @@
 MD5 986c86c6fa17c064bc17c2936cc833e0 gramofile-1.6.tar.gz 108596
+RMD160 3f7c8a8e8053e92ece830bbb1138fc7ed1c49967 gramofile-1.6.tar.gz 108596
+SHA256 d1c9fe01f3b49c8c9141c3e09c15f519dcb9ffdcaabcfa51ece0c41540ba69e2 gramofile-1.6.tar.gz 108596
 MD5 6e38044d77f8e4d63dfd7e0b441cf39f tappin3a.patch 1593
+RMD160 d96ade2e74d4c09e87e1ac8fc69c12c846cb20e7 tappin3a.patch 1593
+SHA256 94f66806b1097c98a4a7f5c18b2c67e79052f9464f6c8b67cd1f87b140a94fe0 tappin3a.patch 1593
 MD5 8b21276b022d4e0ed224be9eb0181391 tappin3b.patch 40893
+RMD160 8dbecfa8457dededf8f6090f3458a32a0fbeef88 tappin3b.patch 40893
+SHA256 1e50e73e0a82326584c6b30d2f1600231d3835a89932dd9e1274fd106e29f998 tappin3b.patch 40893
diff --git a/media-sound/gramofile/gramofile-1.6-r1.ebuild b/media-sound/gramofile/gramofile-1.6-r1.ebuild
index 0d86a6f067ab..bacf41e07e9e 100644
--- a/media-sound/gramofile/gramofile-1.6-r1.ebuild
+++ b/media-sound/gramofile/gramofile-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/gramofile-1.6-r1.ebuild,v 1.2 2006/02/11 20:31:04 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/gramofile-1.6-r1.ebuild,v 1.3 2006/04/19 22:22:35 malc Exp $
 
 inherit eutils
 
@@ -29,6 +29,9 @@ src_unpack() {
 
 src_compile() {
 	sed -i -e "s/CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER/CFLAGS \= -Wall `echo ${CFLAGS}` -DTURBO_MEDIAN -DTURBO_BUFFER/" Makefile
+	# We need the prototype on amd64 or basename defaults to returning int -
+	# causint segfault... bug #128378
+	sed -i -e "s/-DREDHAT50//" bplaysrc/Makefile
 	make || die
 }