Made valgrind build with hardened gcc

Package-Manager: portage-2.0.51.16

11 files changed, 101 insertions, 29 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index d09a846241a9..d0bc4748abf6 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/valgrind
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.40 2004/12/19 18:36:31 griffon26 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.41 2005/02/13 15:55:25 griffon26 Exp $
+
+*valgrind-2.2.0-r2 (13 Feb 2005)
+
+  13 Feb 2005; Maurice van der Pot <griffon26@gentoo.org>
+  +valgrind-2.2.0-r2.ebuild:
+  Prevent valgrind from ignoring CFLAGS in environment to allow building
+  with hardened gcc (see bug #75789 reported by Dominik Schäfer
+  <schaedpq@despammed.com>)
+  Make valgrind less dependent on actual name of kernel headers as
+  suggested by Mihai Limbasan <mihailim@gmail.com> in bug #80176.
 
 *valgrind-2.2.0-r1 (19 Dec 2004)
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 22c7bace2cb5..6b3b9317676a 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,30 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dc34cde41d17fbdb81e1a79453934e69 ChangeLog 2238
 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
-MD5 87ba65472b071a1a696226f0e36937d5 valgrind-2.0.0.ebuild 1173
-MD5 f07a6833b689f5e27ddc6f11cce48fbb valgrind-2.1.0.ebuild 1018
-MD5 a0b171b6dab7cb44a9eab9bf70738b7c valgrind-2.1.1.ebuild 926
-MD5 36b52cc7f792a5f6944af5e3488fc3cd valgrind-2.1.1-r1.ebuild 1140
-MD5 74af16c4f9ed08248153f39e9181c7be valgrind-2.1.2.ebuild 1099
-MD5 f89777a4817a47cc876c1a51cf1b2298 valgrind-2.2.0.ebuild 1384
-MD5 d0f7f2d1dbd5944b2c90c79f02fde00d valgrind-2.2.0-r1.ebuild 1429
+MD5 4871b943d694b8d009f993c244356257 valgrind-2.2.0-r1.ebuild 1428
+MD5 858f9b45289860be33b5ad306ab24ec4 ChangeLog 2659
+MD5 56c234fea4ecbeb1a5337ab118ebb04f valgrind-2.2.0-r2.ebuild 1594
+MD5 be4e2e968179239e51aafd78be4d95af valgrind-2.0.0.ebuild 1172
+MD5 e6dc16df8e136f735bc577092f7b6383 valgrind-2.1.0.ebuild 1017
+MD5 7e4a680daca3ed212226f6364c958420 valgrind-2.1.1-r1.ebuild 1143
+MD5 07f48be25380e77aa5a44fec2b408998 valgrind-2.1.1.ebuild 925
+MD5 b99a507d5351da63d87c61f3fe0072ad valgrind-2.1.2.ebuild 1101
+MD5 2371f70b5ed5e88767cade219fd7cc65 valgrind-2.2.0.ebuild 1388
 MD5 286d10f4514e8a85360ce6ba5654ae93 files/digest-valgrind-2.0.0 67
 MD5 a69fe5652a8ca5fb1d04521fe0c56850 files/digest-valgrind-2.1.0 138
 MD5 f50184c09d0376e66b1b79d0b45e94c2 files/digest-valgrind-2.1.1 67
-MD5 95845f5c26fd00027163547288c17e54 files/valgrind-configure.in-2.6.diff 336
 MD5 f50184c09d0376e66b1b79d0b45e94c2 files/digest-valgrind-2.1.1-r1 67
-MD5 1ba26123d6543d9b4faa808595fbb5b8 files/valgrind-2.1.1-pic.patch 8338
 MD5 dd98566219aee764f036fae263b1ce61 files/digest-valgrind-2.1.2 67
+MD5 1ba26123d6543d9b4faa808595fbb5b8 files/valgrind-2.1.1-pic.patch 8338
 MD5 96f4ea73f94e4b969cd764574aeef978 files/valgrind-2.1.2-kernel-headers.patch 826
+MD5 95845f5c26fd00027163547288c17e54 files/valgrind-configure.in-2.6.diff 336
 MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0 139
 MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r1 139
 MD5 fc1dda2b6f2603a4244ad25f555f2034 files/valgrind-2.2.0-no-exec-stack.patch 1711
+MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBzxysArHZZzCEUG0RAqfoAJ49Iqb4iXPjjVZNmwvNa7NWm/FzVgCfWvko
-pnqI0fyJEcSMEeDjbn6Y7Nk=
-=V3iX
+iD8DBQFCD3h2MGnpIbeahxwRAnboAKCz9OTULAmPtF5xyszIqoQSJGGlqgCgg0Jv
++c6Ma4p5DsPO9l6K+ul4UP4=
+=xKxH
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/digest-valgrind-2.2.0-r2 b/dev-util/valgrind/files/digest-valgrind-2.2.0-r2
new file mode 100644
index 000000000000..b7acbc96ccc1
--- /dev/null
+++ b/dev-util/valgrind/files/digest-valgrind-2.2.0-r2
@@ -0,0 +1,2 @@
+MD5 30dc51f6fc94751b90b04af9c2e2c656 valgrind-2.2.0.tar.bz2 964987
+MD5 a9f5bf8d548ceed56343f8298887bb43 valgrind-2.2.0-ppc.tar.bz2 1000093
diff --git a/dev-util/valgrind/valgrind-2.0.0.ebuild b/dev-util/valgrind/valgrind-2.0.0.ebuild
index a76a1fb32df7..9952d6b88064 100644
--- a/dev-util/valgrind/valgrind-2.0.0.ebuild
+++ b/dev-util/valgrind/valgrind-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-2.0.0.ebuild,v 1.7 2004/07/02 05:14:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.0.0.ebuild,v 1.8 2005/02/13 15:55:25 griffon26 Exp $
 
 inherit flag-o-matic eutils
 RESTRICT="nostrip"
diff --git a/dev-util/valgrind/valgrind-2.1.0.ebuild b/dev-util/valgrind/valgrind-2.1.0.ebuild
index 58c8298f7076..11a65669ca3c 100644
--- a/dev-util/valgrind/valgrind-2.1.0.ebuild
+++ b/dev-util/valgrind/valgrind-2.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-2.1.0.ebuild,v 1.8 2004/07/02 05:14:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.1.0.ebuild,v 1.9 2005/02/13 15:55:25 griffon26 Exp $
 
 inherit flag-o-matic
 
diff --git a/dev-util/valgrind/valgrind-2.1.1-r1.ebuild b/dev-util/valgrind/valgrind-2.1.1-r1.ebuild
index 0a83c15800d2..9165ec05e9b1 100644
--- a/dev-util/valgrind/valgrind-2.1.1-r1.ebuild
+++ b/dev-util/valgrind/valgrind-2.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-2.1.1-r1.ebuild,v 1.4 2004/07/10 17:23:18 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.1.1-r1.ebuild,v 1.5 2005/02/13 15:55:25 griffon26 Exp $
 
 inherit flag-o-matic eutils
 RESTRICT="nostrip"
diff --git a/dev-util/valgrind/valgrind-2.1.1.ebuild b/dev-util/valgrind/valgrind-2.1.1.ebuild
index 26f002c5051f..1e18d10e5190 100644
--- a/dev-util/valgrind/valgrind-2.1.1.ebuild
+++ b/dev-util/valgrind/valgrind-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-2.1.1.ebuild,v 1.4 2004/07/02 05:14:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.1.1.ebuild,v 1.5 2005/02/13 15:55:25 griffon26 Exp $
 
 inherit flag-o-matic eutils
 RESTRICT="nostrip"
diff --git a/dev-util/valgrind/valgrind-2.1.2.ebuild b/dev-util/valgrind/valgrind-2.1.2.ebuild
index 0e1203834097..5bd6380e903c 100644
--- a/dev-util/valgrind/valgrind-2.1.2.ebuild
+++ b/dev-util/valgrind/valgrind-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-2.1.2.ebuild,v 1.3 2004/08/07 16:36:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.1.2.ebuild,v 1.4 2005/02/13 15:55:25 griffon26 Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/dev-util/valgrind/valgrind-2.2.0-r1.ebuild b/dev-util/valgrind/valgrind-2.2.0-r1.ebuild
index 3a965c6b5e81..af8151999893 100644
--- a/dev-util/valgrind/valgrind-2.2.0-r1.ebuild
+++ b/dev-util/valgrind/valgrind-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-2.2.0-r1.ebuild,v 1.2 2004/12/26 20:18:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.2.0-r1.ebuild,v 1.3 2005/02/13 15:55:25 griffon26 Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/dev-util/valgrind/valgrind-2.2.0-r2.ebuild b/dev-util/valgrind/valgrind-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..59c9b03b6894
--- /dev/null
+++ b/dev-util/valgrind/valgrind-2.2.0-r2.ebuild
@@ -0,0 +1,58 @@
+# 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-2.2.0-r2.ebuild,v 1.1 2005/02/13 15:55:25 griffon26 Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="An open-source memory debugger for x86-GNU/Linux and ppc-GNU/Linux"
+HOMEPAGE="http://valgrind.kde.org"
+SRC_URI="x86? ( http://developer.kde.org/~sewardj/${P}.tar.bz2 )
+		 ppc? ( http://ozlabs.org/~paulus/${P}-ppc.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86 ~ppc"
+IUSE="X"
+RESTRICT="nostrip"
+
+RDEPEND="virtual/libc
+	X? ( virtual/x11 )"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	use ppc && cd "${WORKDIR}/${P}-ppc" || cd ${S}
+
+	#ugly but working workaround
+	if has_version '>=virtual/os-headers-2.6.7' ; then
+		einfo "Removing net/if.h from the includes in vg_unsafe.h"
+		sed -i -e "s:#include <net/if.h>::" \
+			coregrind/vg_unsafe.h ||die
+	fi
+
+	epatch "${FILESDIR}/${P}-no-exec-stack.patch"
+
+	# make sure our CFLAGS are respected
+	einfo "Changing configure to respect CFLAGS"
+	sed -i -e 's:CFLAGS="":#CFLAGS="":' configure
+}
+
+src_compile() {
+	use ppc && cd "${WORKDIR}/${P}-ppc"
+
+	local myconf
+
+	filter-flags -fPIC -fstack-protector -fomit-frame-pointer
+
+	use X && myconf="--with-x" || myconf="--with-x=no"
+	# note: it does not appear safe to play with CFLAGS
+	econf ${myconf} || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	use ppc && cd "${WORKDIR}/${P}-ppc"
+	einstall docdir="${D}/usr/share/doc/${PF}/html" || die
+	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README* TODO
+}
diff --git a/dev-util/valgrind/valgrind-2.2.0.ebuild b/dev-util/valgrind/valgrind-2.2.0.ebuild
index 8422cf8ade76..f5bfd0944fe5 100644
--- a/dev-util/valgrind/valgrind-2.2.0.ebuild
+++ b/dev-util/valgrind/valgrind-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-2.2.0.ebuild,v 1.4 2004/09/24 01:44:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.2.0.ebuild,v 1.5 2005/02/13 15:55:25 griffon26 Exp $
 
 inherit flag-o-matic eutils