From 7c8a504679debdfce8cba43746e39db5d04bf0291036e60a3d8e2e154435e113 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 23 Jan 2007 00:31:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/valgrind?expand=0&rev=2 --- 3_2_BRANCH.diff | 274 --------------------------- drd-fixes.diff | 20 -- valgrind-3.2.1.tar.bz2 | 3 - valgrind-3.2.2.tar.bz2 | 3 + valgrind-6012-drd-2006-08-26.tar.bz2 | 3 - valgrind.changes | 6 + valgrind.spec | 22 +-- 7 files changed, 17 insertions(+), 314 deletions(-) delete mode 100644 3_2_BRANCH.diff delete mode 100644 drd-fixes.diff delete mode 100644 valgrind-3.2.1.tar.bz2 create mode 100644 valgrind-3.2.2.tar.bz2 delete mode 100644 valgrind-6012-drd-2006-08-26.tar.bz2 diff --git a/3_2_BRANCH.diff b/3_2_BRANCH.diff deleted file mode 100644 index cab62b6..0000000 --- a/3_2_BRANCH.diff +++ /dev/null @@ -1,274 +0,0 @@ -Index: glibc-2.5.supp -=================================================================== ---- glibc-2.5.supp (.../tags/VALGRIND_3_2_1) (revision 0) -+++ glibc-2.5.supp (.../branches/VALGRIND_3_2_BRANCH) (revision 6240) -@@ -0,0 +1,200 @@ -+ -+##----------------------------------------------------------------------## -+ -+# 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.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 -+} -Index: configure.in -=================================================================== ---- configure.in (.../tags/VALGRIND_3_2_1) (revision 6240) -+++ configure.in (.../branches/VALGRIND_3_2_BRANCH) (revision 6240) -@@ -8,7 +8,7 @@ - ##------------------------------------------------------------## - - # Process this file with autoconf to produce a configure script. --AC_INIT(Valgrind, 3.2.1, valgrind-users@lists.sourceforge.net) -+AC_INIT(Valgrind, 3.2.2.SVN, valgrind-users@lists.sourceforge.net) - AC_CONFIG_SRCDIR(coregrind/m_main.c) - AM_CONFIG_HEADER(config.h) - AM_INIT_AUTOMAKE -@@ -349,6 +349,16 @@ AC_EGREP_CPP([GLIBC_24], [ - ], - glibc="2.4") - -+AC_EGREP_CPP([GLIBC_25], [ -+#include -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 5) -+ GLIBC_25 -+ #endif -+#endif -+], -+glibc="2.5") -+ - AC_MSG_CHECKING([the glibc version]) - - case "${glibc}" in -@@ -370,9 +380,15 @@ case "${glibc}" in - DEFAULT_SUPP="glibc-2.4.supp ${DEFAULT_SUPP}" - ;; - -+ 2.5) -+ AC_MSG_RESULT(2.5 family) -+ AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x]) -+ DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}" -+ ;; -+ - *) - AC_MSG_RESULT(unsupported version) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2, 2.3 or 2.4]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5]) - ;; - esac - -Index: Makefile.am -=================================================================== ---- Makefile.am (.../tags/VALGRIND_3_2_1) (revision 6240) -+++ Makefile.am (.../branches/VALGRIND_3_2_BRANCH) (revision 6240) -@@ -17,7 +17,7 @@ SUBDIRS = include coregrind . tests perf - DIST_SUBDIRS = $(SUBDIRS) - - SUPP_FILES = \ -- glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp \ -+ glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \ - xfree-3.supp xfree-4.supp - - dist_val_DATA = $(SUPP_FILES) default.supp - -Property changes on: . -___________________________________________________________________ -Name: svn:externals - - VEX svn://svn.valgrind.org/vex/tags/VEX_3_2_1 - - + VEX svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH - - diff --git a/drd-fixes.diff b/drd-fixes.diff deleted file mode 100644 index ed32f6c..0000000 --- a/drd-fixes.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- drd/drd_main.c -+++ drd/drd_main.c -@@ -110,7 +110,7 @@ - addr, size, VG_(get_running_tid)()); - } - #endif -- sg = thread_get_segment(VG_(running_tid)); -+ sg = thread_get_segment(VG_(get_running_tid)()); - bm_access_range(sg->bm, addr, size, eLoad); - } - -@@ -124,7 +124,7 @@ - addr, size, VG_(get_running_tid)()); - } - #endif -- sg = thread_get_segment(VG_(running_tid)); -+ sg = thread_get_segment(VG_(get_running_tid)()); - bm_access_range(sg->bm, addr, size, eStore); - } - diff --git a/valgrind-3.2.1.tar.bz2 b/valgrind-3.2.1.tar.bz2 deleted file mode 100644 index a3dd551..0000000 --- a/valgrind-3.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33 -size 4052885 diff --git a/valgrind-3.2.2.tar.bz2 b/valgrind-3.2.2.tar.bz2 new file mode 100644 index 0000000..d431e06 --- /dev/null +++ b/valgrind-3.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea8ed4d0d1d39372ca1ba8a6b7ad45e16efc63f62bca595bb6273743751795a +size 4016243 diff --git a/valgrind-6012-drd-2006-08-26.tar.bz2 b/valgrind-6012-drd-2006-08-26.tar.bz2 deleted file mode 100644 index 03dfa9c..0000000 --- a/valgrind-6012-drd-2006-08-26.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0bded47390734e31b082ddb570349db46ea205e9a89bca6cccfe437319a6084 -size 19454 diff --git a/valgrind.changes b/valgrind.changes index 838a17d..d0f00da 100644 --- a/valgrind.changes +++ b/valgrind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 22 17:07:04 CET 2007 - dmueller@suse.de + +- update to 3.2.2: + * many fixes for ppc 32/64 (#fate 301640) + ------------------------------------------------------------------- Tue Oct 17 11:09:11 CEST 2006 - dmueller@suse.de diff --git a/valgrind.spec b/valgrind.spec index b75f26f..e012e5f 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -1,7 +1,7 @@ # -# spec file for package valgrind (Version 3.2.1) +# spec file for package valgrind (Version 3.2.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -21,20 +21,16 @@ BuildRequires: gcc-32bit glibc-32bit %endif %endif URL: http://valgrind.org/ -License: Other License(s), see package +License: GNU General Public License (GPL) Group: Development/Tools/Debuggers Summary: Memory Management Debugger BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 3.2.1 -Release: 10 +Version: 3.2.2 +Release: 1 Source0: %{name}-%{version}.tar.bz2 # svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_2_1 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH > 3_2_BRANCH.diff # svn di svn://svn.valgrind.org/vex/tags/VEX_3_2_1 svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH > VEX_3_2_BRANCH.diff -Patch0: 3_2_BRANCH.diff -#Patch1: VEX_3_1_BRANCH.diff -Source1: valgrind-6012-drd-2006-08-26.tar.bz2 Patch3: valgrind-6012.patch -Patch4: drd-fixes.diff Patch5: omega_RC_01.patch Provides: callgrind Obsoletes: callgrind @@ -75,13 +71,8 @@ Authors: %prep %setup -q -n %{name}-%{version} -%patch cd VEX -#%patch1 cd .. -tar xf %SOURCE1 -#%patch3 -%patch4 %ifarch %ix86 x86_64 %patch5 %endif @@ -109,6 +100,9 @@ mv $RPM_BUILD_ROOT/usr/share/doc/valgrind $RPM_BUILD_ROOT/usr/share/doc/packages %doc %_mandir/*/* %changelog -n valgrind +* Mon Jan 22 2007 - dmueller@suse.de +- update to 3.2.2: + * many fixes for ppc 32/64 (#fate 301640) * Tue Oct 17 2006 - dmueller@suse.de - disable omega plugin for ppc/ppc64 * Mon Oct 16 2006 - dmueller@suse.de