diff --git a/package/base/valgrind/glibc26-fix.patch b/package/base/valgrind/glibc26-fix.patch deleted file mode 100644 index 6ca6ad74d..000000000 --- a/package/base/valgrind/glibc26-fix.patch +++ /dev/null @@ -1,258 +0,0 @@ - -A backport of the glibc-2.6 support patch from valgrind svn trunk -(svn diff -r6743:6744 svn://svn.valgrind.org/valgrind/trunk) - ---- ./configure.in (revision 6743) -+++ ./configure.in (revision 6744) -@@ -359,6 +359,16 @@ - ], - glibc="2.5") - -+AC_EGREP_CPP([GLIBC_26], [ -+#include -+#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 - ---- ./glibc-2.6.supp (revision 0) -+++ ./glibc-2.6.supp (revision 6744) -@@ -0,0 +1,215 @@ -+ -+##----------------------------------------------------------------------## -+ -+# 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 Jump -+# Free Addr1 Addr2 Addr4 Addr8 Addr16 -+# Cond (previously known as Value0) -+# -+# and the optional extra info is: -+# if Param: name of system call param -+ -+{ -+ dl-hack1 -+ Memcheck:Cond -+ fun:_dl_start -+ fun:_start -+} -+ -+{ -+ dl-hack2 -+ Memcheck:Cond -+ obj:/lib*/ld-2.5*.so -+ obj:/lib*/ld-2.5*.so -+ obj:/lib*/ld-2.5*.so -+ obj:/lib*/ld-2.5*.so -+} -+ -+{ -+ dl-hack3 -+ Memcheck:Cond -+ obj:/lib*/ld-2.5*so* -+ obj:/lib*/ld-2.5*so* -+ obj:/lib*/ld-2.5*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.5.*.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.5.*.so -+} -+{ -+ glibc-2.3.5-on-SuSE-10.1-(PPC)-3 -+ Memcheck:Addr4 -+ fun:*wordcopy_fwd_dest_aligned* -+ fun:mem*cpy -+ obj:*lib*2.5.*.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.5.so -+ obj:/*libc-2.5.so -+ obj:/*libc-2.5.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.5.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.5.so -+ obj:/*libc-2.5.so -+ obj:/*libc-2.5.so -+} -+{ -+ X11-64bit-padding-4b -+ Memcheck:Param -+ socketcall.send(msg) -+ fun:send -+ obj:/*libc-2.5.so -+ obj:/*libc-2.5.so -+ obj:/*libc-2.5.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 --git a/package/base/valgrind/valgrind.conf b/package/base/valgrind/valgrind.conf deleted file mode 100644 index af7ea56da..000000000 --- a/package/base/valgrind/valgrind.conf +++ /dev/null @@ -1,5 +0,0 @@ -# needed for glibc26-fix.patch taken from valgrind svn -# this will pretty sure be part of the next valgrind release -# so autogen=1 as well as the patch won't be needed anymore by then -versionhotfix 3.2.3 -autogen=1 diff --git a/package/base/valgrind/valgrind.desc b/package/base/valgrind/valgrind.desc index 860b9c7cd..da13ce09b 100644 --- a/package/base/valgrind/valgrind.desc +++ b/package/base/valgrind/valgrind.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X --?--5---9 155.900 -[D] 1050492828 valgrind-3.2.3.tar.bz2 http://valgrind.org/downloads/ +[D] 1918114794 valgrind-3.3.0.tar.bz2 http://valgrind.org/downloads/