Added valgrind-3.0.1-r1 fixing bug #111233 and an issue mentioned in bug #101402

(Portage version: 2.0.53_rc7)

6 files changed, 190 insertions, 23 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index e1b1811bb32f..0869d8473839 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.53 2005/08/30 20:01:54 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.54 2005/11/06 14:55:28 griffon26 Exp $
+
+*valgrind-3.0.1-r1 (06 Nov 2005)
+
+  06 Nov 2005; Maurice van der Pot <griffon26@gentoo.org>
+  +files/valgrind-3.0.1-mfence.patch, +files/valgrind-3.0.1-pic-fix.patch,
+  +valgrind-3.0.1-r1.ebuild:
+  The mfence patch fixes the failed assertion mentioned by Brian Tarricone 
+  <bjt23@cornell.edu> in bug #101402. The pic patch was supplied by Ned Ludd
+  <solar@gentoo.org> to fix bug #111233.
 
 *valgrind-3.0.1 (30 Aug 2005)
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 1f8e7d023930..a71d8fc013cc 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,28 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
-MD5 fc311d6ac7b19d831f6e18e9588c2053 valgrind-3.0.1.ebuild 1690
-MD5 c0a200046e327d2c145fc55f2611607f ChangeLog 5691
-MD5 16efe20081a8edc14768a1ea1e4664be valgrind-3.0.0.ebuild 1799
-MD5 9c6171e63f2c500b26cd6c2dd98d42e8 valgrind-2.2.0-r2.ebuild 1716
-MD5 98fd3a4e78d2c75a2de9d2f7595a649c valgrind-2.4.0.ebuild 1407
-MD5 cb18085a00f509803e6e539543cb20f9 valgrind-2.4.1.ebuild 1881
-MD5 fc1dda2b6f2603a4244ad25f555f2034 files/valgrind-2.2.0-no-exec-stack.patch 1711
+MD5 96574ff6674a68800d9f43c03d61d247 ChangeLog 6082
 MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139
-MD5 d10a593e8cb1c5074c438adc226d1c81 files/valgrind-2.2.0-current-macro-clash.patch 1871
 MD5 c6fe697b4c25fb9e5c7482496ebabf06 files/digest-valgrind-2.4.0 140
-MD5 e878f97b4c6308515baf5abaee045ce7 files/valgrind-2.4.0-pie-fix.patch 2335
-MD5 af6b49666df28ad2a40f2f644fefce83 files/digest-valgrind-3.0.0 68
 MD5 a5dde62cbb4bb255219643b61493b950 files/digest-valgrind-2.4.1 68
+MD5 af6b49666df28ad2a40f2f644fefce83 files/digest-valgrind-3.0.0 68
+MD5 bcce75140a2ec484339b6d1844e20a0a files/digest-valgrind-3.0.1 68
+MD5 bcce75140a2ec484339b6d1844e20a0a files/digest-valgrind-3.0.1-r1 68
+MD5 d10a593e8cb1c5074c438adc226d1c81 files/valgrind-2.2.0-current-macro-clash.patch 1871
+MD5 fc1dda2b6f2603a4244ad25f555f2034 files/valgrind-2.2.0-no-exec-stack.patch 1711
+MD5 e878f97b4c6308515baf5abaee045ce7 files/valgrind-2.4.0-pie-fix.patch 2335
 MD5 c67ef295757f9c8b4e9be146f6c4f873 files/valgrind-2.4.1-dont-trample-cflags.patch 442
 MD5 d177de2c2f79d24d4ad74644ee49f667 files/valgrind-2.4.1-static-const.patch 4397
 MD5 24971d28d91da6c61168fa217d10b47b files/valgrind-3.0.0-pie-fix.patch 864
-MD5 bcce75140a2ec484339b6d1844e20a0a files/digest-valgrind-3.0.1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDFLsnMGnpIbeahxwRAnblAKCujbxLNGuaMTeTVV4Y7/pkD6PILACgp5tb
-0InkqH9bkQAJ//1vfeNGao0=
-=cN6Y
------END PGP SIGNATURE-----
+MD5 9af0c7aae878323f117ea148ee2930d4 files/valgrind-3.0.1-mfence.patch 600
+MD5 fc133b72d5c0341cc194c9cee839c058 files/valgrind-3.0.1-pic-fix.patch 3565
+MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
+MD5 9c6171e63f2c500b26cd6c2dd98d42e8 valgrind-2.2.0-r2.ebuild 1716
+MD5 98fd3a4e78d2c75a2de9d2f7595a649c valgrind-2.4.0.ebuild 1407
+MD5 cb18085a00f509803e6e539543cb20f9 valgrind-2.4.1.ebuild 1881
+MD5 16efe20081a8edc14768a1ea1e4664be valgrind-3.0.0.ebuild 1799
+MD5 74a1f08cad0a31f0f7f3cc24d595a6b2 valgrind-3.0.1-r1.ebuild 1884
+MD5 fc311d6ac7b19d831f6e18e9588c2053 valgrind-3.0.1.ebuild 1690
diff --git a/dev-util/valgrind/files/digest-valgrind-3.0.1-r1 b/dev-util/valgrind/files/digest-valgrind-3.0.1-r1
new file mode 100644
index 000000000000..ded1c704ce7a
--- /dev/null
+++ b/dev-util/valgrind/files/digest-valgrind-3.0.1-r1
@@ -0,0 +1 @@
+MD5 c29efdb7d1a93440f5644a6769054681 valgrind-3.0.1.tar.bz2 2688531
diff --git a/dev-util/valgrind/files/valgrind-3.0.1-mfence.patch b/dev-util/valgrind/files/valgrind-3.0.1-mfence.patch
new file mode 100644
index 000000000000..abf6f9caf8fe
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.0.1-mfence.patch
@@ -0,0 +1,11 @@
+diff -ruN valgrind-3.0.1/VEX/priv/host-x86/hdefs.c valgrind-3.0.1-fixed/VEX/priv/host-x86/hdefs.c
+--- valgrind-3.0.1/VEX/priv/host-x86/hdefs.c	2005-08-10 20:03:36.000000000 +0200
++++ valgrind-3.0.1-fixed/VEX/priv/host-x86/hdefs.c	2005-09-15 21:28:49.638912328 +0200
+@@ -2312,7 +2312,6 @@
+       if (0) vex_printf("EMIT FENCE\n");
+       switch (i->Xin.MFence.subarch) {
+          case VexSubArchX86_sse0:
+-            vassert(0); /* awaiting test case */
+             /* lock addl $0,0(%esp) */
+             *p++ = 0xF0; *p++ = 0x83; *p++ = 0x44; 
+             *p++ = 0x24; *p++ = 0x00; *p++ = 0x00;
diff --git a/dev-util/valgrind/files/valgrind-3.0.1-pic-fix.patch b/dev-util/valgrind/files/valgrind-3.0.1-pic-fix.patch
new file mode 100644
index 000000000000..9356684ff6ac
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.0.1-pic-fix.patch
@@ -0,0 +1,88 @@
+--- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/addrcheck/Makefile.am	2005-08-24 21:37:08.000000000 +0200
++++ valgrind-3.0.1/addrcheck/Makefile.am	2005-10-31 22:57:24.000000000 +0100
+@@ -6,6 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/memcheck
+ val_PROGRAMS = vgtool_addrcheck.so vgpreload_addrcheck.so
+ 
+ vgtool_addrcheck_so_SOURCES = ac_main.c
++vgtool_addrcheck_so_CFLAGS = -fpic
+ vgtool_addrcheck_so_LDFLAGS = -shared
+ vgtool_addrcheck_so_LDADD = \
+ 	../memcheck/mac_leakcheck.o \
+@@ -13,6 +14,7 @@ vgtool_addrcheck_so_LDADD = \
+ 	../memcheck/mac_shared.o
+ 
+ vgpreload_addrcheck_so_SOURCES = 
++vgpreload_addrcheck_so_CFLAGS = -fpic
+ vgpreload_addrcheck_so_LDADD = \
+ 	../memcheck/mac_replace_strmem.o
+ vgpreload_addrcheck_so_DEPENDENCIES = \
+--- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/cachegrind/Makefile.am	2005-08-10 17:28:20.000000000 +0200
++++ valgrind-3.0.1/cachegrind/Makefile.am	2005-10-31 23:10:08.000000000 +0100
+@@ -14,5 +14,6 @@ val_PROGRAMS = vgtool_cachegrind.so
+ vgtool_cachegrind_so_SOURCES = \
+ 	cg_main.c \
+ 	cg-@VG_ARCH@.c
++vgtool_cachegrind_so_CFLAGS = -fpic
+ vgtool_cachegrind_so_LDFLAGS = -shared
+ 
+--- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/helgrind/Makefile.am	2005-08-10 17:27:51.000000000 +0200
++++ valgrind-3.0.1/helgrind/Makefile.am	2005-10-31 23:11:55.000000000 +0100
+@@ -3,11 +3,13 @@ include $(top_srcdir)/Makefile.tool.am
+ val_PROGRAMS = vgtool_helgrind.so vgpreload_helgrind.so
+ 
+ vgtool_helgrind_so_SOURCES = hg_main.c
++vgtool_helgrind_so_CFLAGS = -fpic
+ vgtool_helgrind_so_LDFLAGS = -shared
+ 
+ vgpreload_helgrind_so_SOURCES = 
+ vgpreload_helgrind_so_DEPENDENCIES = \
+ 	$(LIBREPLACEMALLOC)
++vgpreload_helgrind_so_CFLAGS = -fpic
+ vgpreload_helgrind_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
+ 	-Wl,--whole-archive \
+ 	$(LIBREPLACEMALLOC) \
+--- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/lackey/Makefile.am	2005-08-10 17:28:36.000000000 +0200
++++ valgrind-3.0.1/lackey/Makefile.am	2005-10-31 23:09:49.000000000 +0100
+@@ -3,5 +3,6 @@ include $(top_srcdir)/Makefile.tool.am
+ val_PROGRAMS = vgtool_lackey.so
+ 
+ vgtool_lackey_so_SOURCES = lk_main.c
++vgtool_lackey_so_CFLAGS = -fpic
+ vgtool_lackey_so_LDFLAGS = -shared
+ 
+--- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/massif/Makefile.am	2005-08-10 17:28:11.000000000 +0200
++++ valgrind-3.0.1/massif/Makefile.am	2005-10-31 23:11:32.000000000 +0100
+@@ -5,11 +5,13 @@ SUBDIRS += hp2ps
+ val_PROGRAMS = vgtool_massif.so vgpreload_massif.so
+ 
+ vgtool_massif_so_SOURCES = ms_main.c
++vgtool_massif_so_CFLAGS = -fpic
+ vgtool_massif_so_LDFLAGS = -shared
+ 
+ vgpreload_massif_so_SOURCES = 
+ vgpreload_massif_so_DEPENDENCIES = \
+ 	$(LIBREPLACEMALLOC)
++vgpreload_massif_so_CFLAGS = -fpic
+ vgpreload_massif_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
+ 	-Wl,--whole-archive \
+ 	$(LIBREPLACEMALLOC) \
+--- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/memcheck/Makefile.am	2005-08-10 17:28:08.000000000 +0200
++++ valgrind-3.0.1/memcheck/Makefile.am	2005-10-31 23:23:19.000000000 +0100
+@@ -1,7 +1,7 @@
+ include $(top_srcdir)/Makefile.tool.am
+ 
+ ## Build Memcheck at a higher optimisation level
+-AM_CFLAGS += -O2
++AM_CFLAGS += -O2 -fpic
+ 
+ val_PROGRAMS = vgtool_memcheck.so vgpreload_memcheck.so
+ 
+--- valgrind-3.0.1-hacked/work/valgrind-3.0.1-old/none/Makefile.am	2005-08-10 17:28:34.000000000 +0200
++++ valgrind-3.0.1/none/Makefile.am	2005-10-31 23:11:09.000000000 +0100
+@@ -3,5 +3,6 @@ include $(top_srcdir)/Makefile.tool.am
+ val_PROGRAMS = vgtool_none.so
+ 
+ vgtool_none_so_SOURCES 	 = nl_main.c
++vgtool_none_so_CFLAGS   = -fpic
+ vgtool_none_so_LDFLAGS   = -shared
+ 
diff --git a/dev-util/valgrind/valgrind-3.0.1-r1.ebuild b/dev-util/valgrind/valgrind-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..761afd25ce8b
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.0.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.0.1-r1.ebuild,v 1.1 2005/11/06 14:55:28 griffon26 Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~ppc ~x86"
+IUSE="X"
+
+# bug #49147 (bogus stacktrace in gdb with --db-attach=yes) does not seem to be applicable anymore
+#RESTRICT="strip"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Gets rid of text relocations (bug #111233)
+	epatch "${FILESDIR}/${P}-pic-fix.patch"
+	aclocal
+	automake
+
+	# make sure our CFLAGS are respected
+	einfo "Changing configure to respect CFLAGS"
+	sed -i -e 's:CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure
+
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.in
+
+	# http://bugs.kde.org/show_bug.cgi?id=112167
+	epatch "${FILESDIR}/${P}-mfence.patch"
+}
+
+src_compile() {
+	local myconf
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     ???
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	#filter-flags -fstack-protector
+	replace-flags -ggdb3 -ggdb2
+
+	# Optionally build in X suppression files
+	use X && myconf="--with-x" || myconf="--with-x=no"
+
+	econf ${myconf} || die "Configure failed!"
+	emake || die "Make failed!"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed!"
+	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README*
+}
+