Added support for glibc-2.6 to valgrind (bug #185551)

Package-Manager: portage-2.1.3_rc5

4 files changed, 300 insertions, 10 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index c192c5c303cf..246b6330752b 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.77 2007/05/05 18:11:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.78 2007/07/17 17:44:15 griffon26 Exp $
+
+  17 Jul 2007; Maurice van der Pot <griffon26@gentoo.org>
+  +files/valgrind-3.2.3-glibc-2.6.patch, valgrind-3.2.3.ebuild:
+  Added support for glibc-2.6, which closes bug 185551 reported by
+  Billy DeVincentis <billydv1@verizon.net>
 
   05 May 2007; nixnut <nixnut@gentoo.org> valgrind-3.2.3.ebuild:
   Stable on ppc wrt bug 176707
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 135552ee3f45..64c39699fe82 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX valgrind-3.2.1-glibc-2.5.patch 4985 RMD160 24600456338aa280809b9377ea03d055b2b9fd51 SHA1 3ad5e74bdbca2826a8f9e7d91ccc703a56837fe6 SHA256 26d1a8fe0630c3408db782616965cfd2dc14b480c90c51c0ddad4dd85db29836
 MD5 66cac40654067aff726b9e2c401c4dfd files/valgrind-3.2.1-glibc-2.5.patch 4985
 RMD160 24600456338aa280809b9377ea03d055b2b9fd51 files/valgrind-3.2.1-glibc-2.5.patch 4985
@@ -10,6 +13,10 @@ AUX valgrind-3.2.1-pkg-config.patch 599 RMD160 29c25e514438ae24c4e83be97bf270737
 MD5 b6bffc35d2312ad25f95a208de6647b1 files/valgrind-3.2.1-pkg-config.patch 599
 RMD160 29c25e514438ae24c4e83be97bf27073788b2cdd files/valgrind-3.2.1-pkg-config.patch 599
 SHA256 a5175ee4cf32fef8ef521a7eeed346c4cf9761906147a4ad23076e30e02dd4ae files/valgrind-3.2.1-pkg-config.patch 599
+AUX valgrind-3.2.3-glibc-2.6.patch 5825 RMD160 52e5c472eeeb418ea77ef1f3f3e4489d4d4f5031 SHA1 46d07bb66518a43795d0cee06ae5a5e58331b4ee SHA256 23bd0d40098d6a16f09152e77ba61bd97332be499b1a106e9bae9000ab200c29
+MD5 5e15d974cd371bd97ad5b957f54970a2 files/valgrind-3.2.3-glibc-2.6.patch 5825
+RMD160 52e5c472eeeb418ea77ef1f3f3e4489d4d4f5031 files/valgrind-3.2.3-glibc-2.6.patch 5825
+SHA256 23bd0d40098d6a16f09152e77ba61bd97332be499b1a106e9bae9000ab200c29 files/valgrind-3.2.3-glibc-2.6.patch 5825
 AUX valgrind-3.2.3-pkg-config.patch 670 RMD160 26d8f37182da50110e4c40c5be0ec9d06185d7fd SHA1 83bda9ceebc7c13586c5bcd49c809c72e2e7511d SHA256 ffd44e653b95326ef1915f406e35cca9a0898ba3e101965d0f6e4229c72c38d5
 MD5 56c668771fc165efb41e30605881b474 files/valgrind-3.2.3-pkg-config.patch 670
 RMD160 26d8f37182da50110e4c40c5be0ec9d06185d7fd files/valgrind-3.2.3-pkg-config.patch 670
@@ -25,14 +32,14 @@ EBUILD valgrind-3.2.1.ebuild 2927 RMD160 5531757b597e68afccafea01ba3a63eea839013
 MD5 9bf9dfe0665fb086deb19375baafe475 valgrind-3.2.1.ebuild 2927
 RMD160 5531757b597e68afccafea01ba3a63eea839013c valgrind-3.2.1.ebuild 2927
 SHA256 be06feb84c605791424db4305da8e702d3b5a2d2255a833e182cee535a4a6d08 valgrind-3.2.1.ebuild 2927
-EBUILD valgrind-3.2.3.ebuild 2869 RMD160 82a063d60078a04eea604870229619cb75909968 SHA1 41d5a516831b36966bae1f2bc1b6b5d6dc4cca44 SHA256 c30a70547bf5b7f862bb2b3c6db75dc91ee66693efd75727870f003509611055
-MD5 06233982e0b42a8bf6d987955b74a288 valgrind-3.2.3.ebuild 2869
-RMD160 82a063d60078a04eea604870229619cb75909968 valgrind-3.2.3.ebuild 2869
-SHA256 c30a70547bf5b7f862bb2b3c6db75dc91ee66693efd75727870f003509611055 valgrind-3.2.3.ebuild 2869
-MISC ChangeLog 11001 RMD160 1e1be986d6a3b79b4ba19fad00cc4dd88c1856c8 SHA1 d70340ce3810f37ff0cba284df8111e4093b1de9 SHA256 cecbb41fb39434b8fd723ffe88a523700acce1379cec68e9d0833adbd8c4ab0c
-MD5 6ceb07683b960a026b4d8a242abee820 ChangeLog 11001
-RMD160 1e1be986d6a3b79b4ba19fad00cc4dd88c1856c8 ChangeLog 11001
-SHA256 cecbb41fb39434b8fd723ffe88a523700acce1379cec68e9d0833adbd8c4ab0c ChangeLog 11001
+EBUILD valgrind-3.2.3.ebuild 2913 RMD160 6e622a602c75ed8e7def9e7b33068ff34610e535 SHA1 32e552e5e2975a73ab0f6d08a3162fd12e35bf84 SHA256 c6a829a403c32127c14ec6095eb11123a606b8b899669fc29fa6b7ed8925387a
+MD5 2e7da4ae11f85d7353ceccf40e980329 valgrind-3.2.3.ebuild 2913
+RMD160 6e622a602c75ed8e7def9e7b33068ff34610e535 valgrind-3.2.3.ebuild 2913
+SHA256 c6a829a403c32127c14ec6095eb11123a606b8b899669fc29fa6b7ed8925387a valgrind-3.2.3.ebuild 2913
+MISC ChangeLog 11237 RMD160 3790e33159c29dde5f957654147e8761f06a7077 SHA1 b44252b38d0d6163c720ab81c5a5557bcbe6641f SHA256 992d9e04f7f992b4a52f46ef481ef976ffd0f2cbeeab41f8c267febb4e67c39c
+MD5 eedc914eebaf2ed48ade051a8790bfcb ChangeLog 11237
+RMD160 3790e33159c29dde5f957654147e8761f06a7077 ChangeLog 11237
+SHA256 992d9e04f7f992b4a52f46ef481ef976ffd0f2cbeeab41f8c267febb4e67c39c ChangeLog 11237
 MISC metadata.xml 1003 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 SHA1 f76bd7adb86b156832175f968d60c6372fcf8968 SHA256 2bf62ba94d772ac968485392127cf4f4303cccf5a1e6d0733d80507005ca7847
 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 metadata.xml 1003
@@ -46,3 +53,10 @@ SHA256 4ce1d531330a2a0af6e45dc2758c22e9053b93a53f740a97ce6a2f3c9e7ac4f2 files/di
 MD5 ded6e2e906dd6407d3c38a1f207baba8 files/digest-valgrind-3.2.3 250
 RMD160 ef9bb48abce2a7d73e29e5809b37df230fdf397e files/digest-valgrind-3.2.3 250
 SHA256 c8597bd67dd8460be263e80557d2accb57b4a820c93aa802de76f2c8bd649352 files/digest-valgrind-3.2.3 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGnP/4MGnpIbeahxwRAmIDAJ9O5vxzCKGSvPWlmmvvQaNFrnJtigCeI9JC
+mIc2rjGRRXpFzlQ+94ftUrA=
+=VRAC
+-----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.6.patch b/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.6.patch
new file mode 100644
index 000000000000..867ad0e0db07
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.6.patch
@@ -0,0 +1,269 @@
+diff -ruN valgrind-3.2.3/configure.in valgrind-3.2.3-fixed/configure.in
+--- valgrind-3.2.3/configure.in	2007-07-17 19:32:42.956775000 +0200
++++ valgrind-3.2.3-fixed/configure.in	2007-07-17 19:34:18.042194471 +0200
+@@ -359,6 +359,16 @@
+ ],
+ glibc="2.5")
+ 
++AC_EGREP_CPP([GLIBC_26], [
++#include <features.h>
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 6)
++  GLIBC_26
++ #endif
++#endif
++],
++glibc="2.6")
++
+ AC_MSG_CHECKING([the glibc version])
+ 
+ case "${glibc}" in
+@@ -386,9 +396,15 @@
+ 	DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}"
+ 	;;
+ 
++     2.6)
++	AC_MSG_RESULT(2.6 family)
++	AC_DEFINE([GLIBC_2_6], 1, [Define to 1 if you're using glibc 2.6.x])
++	DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}"
++	;;
++
+      *)
+ 	AC_MSG_RESULT(unsupported version)
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6])
+ 	;;
+ esac
+ 
+diff -ruN valgrind-3.2.3/glibc-2.6.supp valgrind-3.2.3-fixed/glibc-2.6.supp
+--- valgrind-3.2.3/glibc-2.6.supp	1970-01-01 01:00:00.000000000 +0100
++++ valgrind-3.2.3-fixed/glibc-2.6.supp	2007-07-17 19:34:18.042194471 +0200
+@@ -0,0 +1,216 @@
++
++##----------------------------------------------------------------------##
++
++# Errors to suppress by default with glibc 2.4.x
++
++# Format of this file is:
++# {
++#     name_of_suppression
++#     tool_name:supp_kind
++#     (optional extra info for some suppression types)
++#     caller0 name, or /name/of/so/file.so
++#     caller1 name, or ditto
++#     (optionally: caller2 name)
++#     (optionally: caller3 name)
++#  }
++#
++# For Memcheck, the supp_kinds are:
++#
++#     Param Value1 Value2 Value4 Value8 Value16
++#     Free Addr1 Addr2 Addr4 Addr8 Addr16
++#     Cond (previously known as Value0)
++#
++# and the optional extra info is:
++#     if Param: name of system call param
++#     if Free: name of free-ing fn)
++
++{
++   dl-hack1
++   Memcheck:Cond
++   fun:_dl_start
++   fun:_start
++}
++
++{
++   dl-hack2
++   Memcheck:Cond
++   obj:/lib*/ld-2.6*.so
++   obj:/lib*/ld-2.6*.so
++   obj:/lib*/ld-2.6*.so
++   obj:/lib*/ld-2.6*.so
++}
++
++{
++   dl-hack3
++   Memcheck:Cond
++   obj:/lib*/ld-2.6*so*
++   obj:/lib*/ld-2.6*so*
++   obj:/lib*/ld-2.6*so*
++}
++
++##----------------------------------------------------------------------##
++{
++   glibc-2.5.x-on-SUSE-10.2-(PPC)-1
++   Memcheck:Cond
++   fun:_dl_start_final
++   fun:_dl_start
++   fun:_start
++}
++{
++   glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
++   Memcheck:Cond
++   fun:index
++   obj:*ld-2.6.*.so
++}
++{
++   glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
++   Memcheck:Addr4
++   fun:index
++   fun:expand_dynamic_string_token
++}
++{
++   glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
++   Memcheck:Addr4
++   fun:index
++   obj:*ld-2.6.*.so
++}
++{
++   glibc-2.3.5-on-SuSE-10.1-(PPC)-3
++   Memcheck:Addr4
++   fun:*wordcopy_fwd_dest_aligned*
++   fun:mem*cpy
++   obj:*lib*2.6.*.so
++}
++
++##----------------------------------------------------------------------##
++## Various structure padding things on SUSE 10.2
++##
++{
++   X11-64bit-padding-1a
++   Memcheck:Param
++   write(buf)
++   fun:__write_nocancel
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   fun:X*
++}
++{
++   X11-64bit-padding-1b
++   Memcheck:Param
++   write(buf)
++   fun:__write_nocancel
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   fun:_X*
++}
++{
++   X11-64bit-padding-1c
++   Memcheck:Param
++   write(buf)
++   fun:__write_nocancel
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++}
++{
++   X11-64bit-padding-1d
++   Memcheck:Param
++   write(buf)
++   fun:__write_nocancel
++   obj:/usr/lib*/libICE.so*
++   obj:/usr/lib*/libICE.so*
++   obj:/usr/lib*/libICE.so*
++}
++{
++   X11-64bit-padding-2a
++   Memcheck:Param
++   writev(vector[...])
++   fun:do_writev
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++}
++{
++   X11-64bit-padding-2b
++   Memcheck:Param
++   writev(vector[...])
++   fun:do_writev
++   fun:writev
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++}
++
++{
++   glibc24-64bit-padding-1a
++   Memcheck:Param
++   socketcall.sendto(msg)
++   fun:send
++   fun:get_mapping
++   fun:__nscd_get_map_ref
++   fun:nscd*
++}
++{
++   glibc24-64bit-padding-1b
++   Memcheck:Param
++   socketcall.sendto(msg)
++   fun:__sendto_nocancel
++   obj:/*libc-2.6.so
++   obj:/*libc-2.6.so
++   obj:/*libc-2.6.so
++}
++{
++   glibc24-64bit-padding-1c
++   Memcheck:Param
++   socketcall.send(msg)
++   fun:send
++   fun:__nscd_get_map_ref
++   fun:nscd_get*_r
++   fun:*nscd*
++   obj:/*libc-2.6.so
++}
++
++
++{
++   X11-64bit-padding-3a
++   Memcheck:Param
++   write(buf)
++   obj:/*libpthread-2.4.so*
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++}
++
++{
++   X11-64bit-padding-4a
++   Memcheck:Param
++   socketcall.sendto(msg)
++   fun:send
++   obj:/*libc-2.6.so
++   obj:/*libc-2.6.so
++   obj:/*libc-2.6.so
++}
++{
++   X11-64bit-padding-4b
++   Memcheck:Param
++   socketcall.send(msg)
++   fun:send
++   obj:/*libc-2.6.so
++   obj:/*libc-2.6.so
++   obj:/*libc-2.6.so
++}
++
++##----------------------------------------------------------------------##
++# MontaVista Linux 4.0.1 on ppc32
++{
++    MVL-401-linuxthreads-pthread_create
++    Memcheck:Param
++    write(buf)
++    fun:pthread_create
++}
++{
++   MVL-401-linuxthreads-pthread_create
++   Memcheck:Param
++   write(buf)
++   obj:/lib/libpthread-0.10.so
++   fun:pthread_create
++}
+diff -ruN valgrind-3.2.3/Makefile.am valgrind-3.2.3-fixed/Makefile.am
+--- valgrind-3.2.3/Makefile.am	2007-01-02 15:52:30.000000000 +0100
++++ valgrind-3.2.3-fixed/Makefile.am	2007-07-17 19:35:03.672794808 +0200
+@@ -17,7 +17,7 @@
+ DIST_SUBDIRS  = $(SUBDIRS)
+ 
+ SUPP_FILES = \
+-	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \
++	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp glibc-2.6.supp \
+ 	xfree-3.supp xfree-4.supp
+ 
+ dist_val_DATA = $(SUPP_FILES) default.supp
diff --git a/dev-util/valgrind/valgrind-3.2.3.ebuild b/dev-util/valgrind/valgrind-3.2.3.ebuild
index f93859f7ad8b..49d5470f76f3 100644
--- a/dev-util/valgrind/valgrind-3.2.3.ebuild
+++ b/dev-util/valgrind/valgrind-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.3.ebuild,v 1.7 2007/06/25 21:59:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.3.ebuild,v 1.8 2007/07/17 17:44:15 griffon26 Exp $
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -43,6 +43,8 @@ src_unpack() {
 		epatch "${FILESDIR}/valgrind-3.2.1-only64bit.patch"
 	fi
 
+	epatch "${FILESDIR}/${P}-glibc-2.6.patch"
+
 	# Regenerate autotools files
 	eautoreconf
 }