From 0f07571bd165ec2c365669430771cac9d28979e21257762edc2d2c07a66eaa94 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 27 Jan 2009 01:19:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libunwind?expand=0&rev=6 --- libunwind-0.98.6.diff | 70 ++++++++++++++++++++++++++++++++----------- libunwind.changes | 5 ++++ libunwind.spec | 25 +++++++++++----- 3 files changed, 74 insertions(+), 26 deletions(-) diff --git a/libunwind-0.98.6.diff b/libunwind-0.98.6.diff index 67a682a..6d7a709 100644 --- a/libunwind-0.98.6.diff +++ b/libunwind-0.98.6.diff @@ -1,3 +1,15 @@ +--- configure.in ++++ configure.in +@@ -83,8 +83,7 @@ AC_CONFIG_LINKS(include/libunwind.h:incl + include/tdep.h:include/tdep-$target_arch.h) + + AC_ARG_ENABLE(debug, +-[ --enable-debug turn on debug support (slows down execution)], +-[enable_debug=yes], []) ++[ --enable-debug turn on debug support (slows down execution)]) + + LIBUNWIND___THREAD + --- include/internal.h +++ include/internal.h @@ -201,11 +201,11 @@ extern int unwi_dyn_validate_cache (unw_ @@ -13,6 +25,39 @@ # define Debug(level,format...) \ do { \ if (unwi_debug_level > level) \ +--- src/ia64/Gscript.c ++++ src/ia64/Gscript.c +@@ -113,7 +113,7 @@ get_script_cache (unw_addr_space_t as, s + sigprocmask (SIG_SETMASK, &unwi_full_sigmask, saved_sigmaskp); + if (likely (caching == UNW_CACHE_GLOBAL)) + { +- Debug (16, "%s: acquiring lock\n"); ++ Debug (16, "acquiring lock\n"); + mutex_lock (&cache->lock); + } + #endif +--- src/os-linux.h ++++ src/os-linux.h +@@ -226,7 +226,7 @@ maps_next (struct map_iterator *mi, + { + /* copy down the remaining bytes, if any */ + if (bytes_left > 0) +- memcpy (mi->buf_end - mi->buf_size, mi->buf, bytes_left); ++ memmove (mi->buf_end - mi->buf_size, mi->buf, bytes_left); + + mi->buf = mi->buf_end - mi->buf_size; + nread = read (mi->fd, mi->buf + bytes_left, +@@ -238,8 +238,8 @@ maps_next (struct map_iterator *mi, + /* Move contents to the end of the buffer so we + maintain the invariant that all bytes between + mi->buf and mi->buf_end are valid. */ +- memcpy (mi->buf_end - nread - bytes_left, mi->buf, +- nread + bytes_left); ++ memmove (mi->buf_end - nread - bytes_left, mi->buf, ++ nread + bytes_left); + mi->buf = mi->buf_end - nread - bytes_left; + } + --- src/x86_64/Gresume.c +++ src/x86_64/Gresume.c @@ -35,6 +35,7 @@ HIDDEN inline int @@ -49,25 +94,14 @@ endif check_SCRIPTS_cdep = run-ptrace-mapper run-ptrace-misc check_PROGRAMS_cdep = Gtest-bt Ltest-bt Gtest-exc Ltest-exc \ ---- tests/Makefile.in -+++ tests/Makefile.in -@@ -73,7 +73,6 @@ am__EXEEXT_1 = test-proc-info$(EXEEXT) t - @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ Lia64-test-rbs$(EXEEXT) \ - @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ Gia64-test-readonly$(EXEEXT) \ - @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ Lia64-test-readonly$(EXEEXT) \ --@ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ ia64-test-setjmp$(EXEEXT) \ - @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ ia64-test-sig$(EXEEXT) - am__EXEEXT_4 = - @REMOTE_ONLY_FALSE@am__EXEEXT_5 = forker$(EXEEXT) mapper$(EXEEXT) \ -@@ -459,7 +458,7 @@ check_SCRIPTS_common = run-check-namespa - @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ Gia64-test-nat Lia64-test-nat \ - @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ Gia64-test-rbs Lia64-test-rbs \ - @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ Gia64-test-readonly Lia64-test-readonly \ --@ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ ia64-test-setjmp ia64-test-sig -+@ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ ia64-test-sig +@@ -83,7 +83,6 @@ LIBUNWIND = ../src/libunwind-$(arch).la + LDADD = $(LIBUNWIND) - check_SCRIPTS = $(check_SCRIPTS_common) $(check_SCRIPTS_cdep) \ - $(check_SCRIPTS_arch) + test_setjmp_LDADD = ../src/libunwind-setjmp.la +-ia64_test_setjmp_LDADD = ../src/libunwind-setjmp.la + test_ptrace_LDADD = ../src/libunwind-ptrace.a $(LIBUNWIND) + Ltest_concurrent_LDADD = $(LIBUNWIND) -lpthread + Gtest_concurrent_LDADD = $(LIBUNWIND) -lpthread --- tests/ia64-test-setjmp.c +++ tests/ia64-test-setjmp.c @@ -34,6 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE diff --git a/libunwind.changes b/libunwind.changes index 38c4561..4da40c2 100644 --- a/libunwind.changes +++ b/libunwind.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 26 19:37:58 CET 2009 - schwab@suse.de + +- Fix overlapping memcpy. + ------------------------------------------------------------------- Tue May 13 18:09:29 CEST 2008 - schwab@suse.de diff --git a/libunwind.spec b/libunwind.spec index 527f336..fb65dbb 100644 --- a/libunwind.spec +++ b/libunwind.spec @@ -1,10 +1,17 @@ # # spec file for package libunwind (Version 0.98.6) # -# Copyright (c) 2008 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. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -16,7 +23,7 @@ BuildRequires: gcc-c++ Url: http://savannah.nongnu.org/projects/libunwind/ Summary: Unwind Library Version: 0.98.6 -Release: 1 +Release: 25 Group: System/Base License: X11/MIT Source: libunwind-%{version}.tar.gz @@ -56,8 +63,8 @@ Authors: %patch %build -#chmod +w aclocal.m4 configure -#autoreconf -fi +chmod +w aclocal.m4 configure +autoreconf -fi ./configure "CFLAGS=$RPM_OPT_FLAGS" --prefix=/usr --mandir=%{_mandir} \ --libdir=%{_libdir} --build=%{_target_cpu}-suse-linux make %{?jobs:-j%jobs} @@ -97,6 +104,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man?/* %changelog +* Mon Jan 26 2009 schwab@suse.de +- Fix overlapping memcpy. * Tue May 13 2008 schwab@suse.de - Update to libunwind 0.98.6. ** Fix address-leak triggered by invalid byte-order. Fixed by Andreas Schwab. @@ -118,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT - build with nonexecutable stack * Fri Jul 22 2005 schwab@suse.de - Remove broken tests. -* Tue May 03 2005 schwab@suse.de +* Mon May 02 2005 schwab@suse.de - Fix broken test. * Sat Apr 23 2005 schwab@suse.de - Only libunwind needs to be in /lib. @@ -144,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT - Update to libunwind 0.98.1. * Wed Sep 29 2004 schwab@suse.de - Fix installed headers. -* Fri Sep 10 2004 schwab@suse.de +* Thu Sep 09 2004 schwab@suse.de - Update to libunwind 0.98. - Enable building on x86_64. * Thu Aug 19 2004 schwab@suse.de