rpms/frysk/FC-6 frysk-20070106-TestFStack.patch, NONE, 1.1 frysk-20070124-libunwind.patch, NONE, 1.1 frysk.spec, 1.110, 1.111
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 24 22:43:06 UTC 2007
Author: skasal
Update of /cvs/dist/rpms/frysk/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11866
Modified Files:
frysk.spec
Added Files:
frysk-20070106-TestFStack.patch frysk-20070124-libunwind.patch
Log Message:
Synchronize with RHEL-5.
frysk-20070106-TestFStack.patch:
TestFStack.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
--- NEW FILE frysk-20070106-TestFStack.patch ---
2007-01-06 Andrew Cagney <cagney at redhat.com>
* TestFStack.java: Use wild cards, instead of Build.SRCDIR.
Index: frysk-core/frysk/util/TestFStack.java
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/util/TestFStack.java,v
retrieving revision 1.29
diff -u -r1.29 TestFStack.java
--- frysk-core/frysk/util/TestFStack.java 18 Dec 2006 18:24:38 -0000 1.29
+++ frysk-core/frysk/util/TestFStack.java 24 Jan 2007 21:01:53 -0000
@@ -42,7 +42,6 @@
import java.util.logging.Level;
-import frysk.core.Build;
import frysk.event.Event;
import frysk.event.RequestStopEvent;
import frysk.proc.Manager;
@@ -54,17 +53,15 @@
String mainThread = "Task #\\d+\n" + "(#[\\d]+ 0x[\\da-f]+ in .*\n)*"
+ "#[\\d]+ 0x[\\da-f]+ in server \\(\\) from: "
- + Build.SRCDIR
- + "/frysk/pkglibdir/funit-child.c#[\\d]+\n"
+ + ".*/frysk/pkglibdir/funit-child.c#[\\d]+\n"
+ "#[\\d]+ 0x[\\da-f]+ in main \\(\\) from: "
- + Build.SRCDIR
- + "/frysk/pkglibdir/funit-child.c#[\\d]+\n"
+ + ".*/frysk/pkglibdir/funit-child.c#[\\d]+\n"
+ "#[\\d]+ 0x[\\da-f]+ in __libc_start_main \\(\\)\n"
+ "#[\\d]+ 0x[\\da-f]+ in _start \\(\\)\n";
String thread = "Task #\\d+\n" + "(#[\\d]+ 0x[\\da-f]+ in .*\n)*"
+ "#[\\d]+ 0x[\\da-f]+ in server \\(\\) from: "
- + Build.SRCDIR + "/frysk/pkglibdir/funit-child.c#[\\d]+\n"
+ + ".*/frysk/pkglibdir/funit-child.c#[\\d]+\n"
+ "#[\\d]+ 0x[\\da-f]+ in start_thread \\(\\)\n"
+ "#[\\d]+ 0x[\\da-f]+ in (__)?clone \\(\\)\n";
frysk-20070124-libunwind.patch:
lib/unwind/cni/FrameCursor.cxx | 48 +++++++++++++++++++++++------------------
libunwind/ChangeLog | 7 +++++
libunwind/src/elfxx.c | 4 +++
3 files changed, 38 insertions(+), 21 deletions(-)
--- NEW FILE frysk-20070124-libunwind.patch ---
frysk-imports/lib/unwind/ChangeLog:
2007-01-24 Jan Kratochvil <jan.kratochvil at redhat.com>
Mike Cvet <mcvet at redhat.com>
* cni/FrameCursor.cxx (create_frame_cursor): Fix retrieved address.
Temporarily remove assertion failing due to libunwind Bug 3917.
Index: frysk-imports/lib/unwind/cni/FrameCursor.cxx
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/unwind/cni/FrameCursor.cxx,v
diff -u -r1.2 FrameCursor.cxx
--- frysk-imports/lib/unwind/cni/FrameCursor.cxx 14 Dec 2006 20:21:03 -0000 1.2
+++ frysk-imports/lib/unwind/cni/FrameCursor.cxx 24 Jan 2007 21:08:24 -0000
@@ -36,40 +36,48 @@
// modification, you must delete this exception statement from your
// version and license this file solely under the GPL without
// exception.
+
#include <libunwind.h>
#include <gcj/cni.h>
+#include <stdlib.h>
#include "lib/unwind/FrameCursor.h"
+#include "lib/unwind/UnwindException.h"
void
lib::unwind::FrameCursor::create_frame_cursor (jlong _cursor)
{
::unw_cursor_t *cursor = (::unw_cursor_t *) _cursor;
-
- ::unw_cursor_t *native_cursor = (::unw_cursor_t *) JvMalloc(sizeof(::unw_cursor_t));
-
+
+ ::unw_cursor_t *native_cursor = (::unw_cursor_t *) JvMalloc (sizeof (::unw_cursor_t));
+
// Create a local copy of the unwind cursor
- memcpy(native_cursor, cursor, sizeof(::unw_cursor_t));
-
- this->nativeCursor = (gnu::gcj::RawDataManaged *) native_cursor;
+ memcpy (native_cursor, cursor, sizeof (::unw_cursor_t));
+
+ this -> nativeCursor = (gnu::gcj::RawDataManaged *) native_cursor;
- unw_proc_info_t proc_info;
- int result = unw_get_proc_info(cursor, &proc_info);
int len = 256;
char buf[len];
unw_word_t offset;
-
- if(!unw_get_proc_name(cursor, buf, len, &offset))
- {
- this->methodName = JvNewStringUTF(buf);
-
- if(result == 0)
- this->address = (jlong) offset + proc_info.start_ip;
- }
-
- unw_word_t tmp;
- unw_get_reg (cursor, UNW_REG_SP, &tmp);
- this -> cfa = tmp;
+ unw_word_t ip;
+ unw_word_t sp;
+
+ if (unw_get_reg (cursor, UNW_REG_IP, &ip))
+ throw new lib::unwind::UnwindException (
+ JvNewStringUTF ("Could not get program counter for the current stack.")
+ );
+
+ this -> address = ip;
+
+ if (unw_get_reg (cursor, UNW_REG_SP, &sp))
+ throw new lib::unwind::UnwindException (
+ JvNewStringUTF ("Could not get stack pointer for the current stack.")
+ );
+
+ this -> cfa = sp;
+
+ if (!unw_get_proc_name (cursor, buf, len, &offset))
+ this -> methodName = JvNewStringUTF (buf);
}
jlong
Index: frysk-imports/libunwind/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-imports/libunwind/ChangeLog,v
diff -u -r1.33 ChangeLog
--- frysk-imports/libunwind/ChangeLog 18 Dec 2006 21:44:19 -0000 1.33
+++ frysk-imports/libunwind/ChangeLog 24 Jan 2007 21:08:25 -0000
@@ -1,6 +1,11 @@
+2007-01-24 Jan Kratochvil <jan.kratochvil at redhat.com>
+
+ * src/elfxx.c (lookup_symbol): Fix false preceding zero-sized function
+ resolving (printed `_start' symbols for stripped binaries).
+
2006-12-18 Jan Kratochvil <jan.kratochvil at redhat.com>
- * src/elfxx.c (elf_w): Fix regression in the 2006-12-10 bugfix;
+ * src/elfxx.c (lookup_symbol): Fix regression in the 2006-12-10 bugfix;
on already prelink(8)ed libraries loaded at a different address.
No testcase provided as prelink(8) need `root' privileges.
Index: frysk-imports/libunwind/src/elfxx.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/libunwind/src/elfxx.c,v
diff -u -r1.6 elfxx.c
--- frysk-imports/libunwind/src/elfxx.c 18 Dec 2006 21:44:19 -0000 1.6
+++ frysk-imports/libunwind/src/elfxx.c 24 Jan 2007 21:08:25 -0000
@@ -49,6 +49,7 @@
Elf_W (Off) soff, str_soff;
Elf_W (Shdr) *shdr, *str_shdr;
Elf_W (Addr) val, min_dist = ~(Elf_W (Addr))0;
+ Elf_W (Addr) val_max_below = 0;
int i, ret = 0;
char *strtab;
@@ -109,6 +110,9 @@
if (ip < val)
continue;
+ if (val + sym->st_size < val_max_below)
+ continue;
+ val_max_below = val + sym->st_size;
if (sym->st_size && ip >= val + sym->st_size)
continue;
Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-6/frysk.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- frysk.spec 22 Dec 2006 19:25:56 -0000 1.110
+++ frysk.spec 24 Jan 2007 22:42:59 -0000 1.111
@@ -1,7 +1,7 @@
Summary: Frysk execution analysis tool
Name: frysk
Version: 0.0.1.2006.12.22.rh1
-Release: 1%{?dist}
+Release: 5%{?dist}
License: GPL
Group: Development/System
URL: http://sourceware.org/frysk
@@ -20,6 +20,10 @@
# Temporarily disable install-dejagnu:
Patch2: frysk-no-dejagnu.patch
+# Fix #224248:
+Patch3: frysk-20070106-TestFStack.patch
+Patch4: frysk-20070124-libunwind.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: glib-java >= 0.2.6
@@ -107,6 +111,10 @@
%endif
%patch1
%patch2
+%patch3
+%patch4
+# This is needed for the libunwind.patch, because we do not run bootstrap.sh:
+echo 'lib/unwind/cni/FrameCursor.o: lib/unwind/UnwindException.h' >>frysk-imports/Makefile.in
%build
@@ -125,7 +133,7 @@
uname -a
gcc --version
-# FIXME: Warninggs should be fixed, not suppressed:
+# FIXME: Warnings should be fixed, not suppressed:
RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
%configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" --disable-arch32-tests
@@ -133,6 +141,13 @@
touch frysk-gui/glade.catalog
touch frysk-gui/checked-glade-xml
+%ifarch x86_64 ppc64
+# A workaround for bug 3881:
+make -C frysk-imports pkglibdir='$(pkglib32dir)' frysk/pkglibdir/fsystest.8
+make -C frysk-core pkglibdir='$(pkglib32dir)' frysk/pkglibdir/funit{,-child,-exec,-exit,-threads}.8
+make -C frysk-gui pkglibdir='$(pkglib32dir)' frysk/pkglibdir/ftail.8
+%endif
+
make %{?_smp_mflags}
%if %{run_make_check}
@@ -149,11 +164,18 @@
make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags}
+# Fix timestamp of a generated script:
+touch -r frysk-gui/frysk/gui/ChangeLog $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
+# ...and a few other ones:
+for f in test2866.py test2985.py test3380.py; do
+ touch -r frysk-gui/frysk/gui/test/dogtail_scripts/$f $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f
+done
+
# Workaround for #211824:
-rm $RPM_BUILD_ROOT/%{_datadir}/java/*.jar
+rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar
# We are not yet ready to be in the menu:
-rm $RPM_BUILD_ROOT/%{_datadir}/applications/frysk.desktop
+rm $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop
%post -p /sbin/ldconfig
@@ -181,7 +203,7 @@
%{_libdir}/libfrysk-jline.so
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/messages.properties
-%{_mandir}/man*/*
+%{_mandir}/man1/*
%files devel
%defattr(-,root,root)
@@ -196,6 +218,7 @@
%dir %{_datadir}/%{name}/test
%{_datadir}/%{name}/test/test*
%{_datadir}/%{name}/dogtail_scripts
+%{_mandir}/man8/*
%files gnome
%defattr(-,root,root)
@@ -210,11 +233,29 @@
%{_datadir}/pixmaps/fryskTrayIcon48.png
%changelog
+* Wed Jan 24 2007 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.22.rh1-5
+- Add frysk-20070106-TestFStack.patch frysk-20070124-libunwind.patch .
+- Resolves: #224248
+
+* Wed Jan 17 2007 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.22.rh1-4
+- Second iteration to make section 8 man pages platform-independent.
+- Resolves: #222468
+
+* Wed Jan 17 2007 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.22.rh1-3
+- Make the contents of section 8 man pages platform-independent.
+- Resolves: #222468
+- Move section 8 man pages to frysk-devel, where the corresponding utilities
+ reside.
+
+* Wed Jan 17 2007 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.22.rh1-2
+- Fix time stamps of installed *.py files, which ...
+- Resolves: #222468
+
* Tue Dec 19 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.22.rh1-1
- New upstream version.
- libexecdir -> libdir and other file list updates
- Remove frysk-arch32-disable.patch, use --disable-arch32-tests instead.
-- Add frysk-no-dejagnu.patch and create $RPM_BUILD_ROOT/${pkgdatadir},
+- Add frysk-no-dejagnu.patch and create $RPM_BUILD_ROOT${pkgdatadir},
to work around a bug in install-dejagnu-testsuite-local rule.
- Resolves: #218819
More information about the fedora-cvs-commits
mailing list