diff --git a/ltrace-0.5-opd.patch b/ltrace-0.5-opd.patch new file mode 100644 index 0000000..6a34220 --- /dev/null +++ b/ltrace-0.5-opd.patch @@ -0,0 +1,23 @@ +diff -urp ltrace-0.5/elf.c ltrace-0.5-pm/elf.c +--- ltrace-0.5/elf.c 2006-08-23 17:45:47.000000000 +0200 ++++ ltrace-0.5-pm/elf.c 2006-08-23 17:47:58.000000000 +0200 +@@ -342,12 +342,18 @@ static GElf_Addr opd2addr(struct ltelf * + if (!lte->opd) + return (GElf_Addr) (long) addr; + ++#ifdef __ia64__ ++ /* XXX: On Itaniums, gelf seems to return function address ++ instead of address of function descriptor. */ ++ ret_val = (GElf_Addr)addr; ++#else + base = (long)lte->opd->d_buf; + offset = (long)addr - (long)lte->opd_addr; + if (offset > lte->opd_size) + error(EXIT_FAILURE, 0, "static plt not in .opd"); + + ret_val = (GElf_Addr) * (long *)(base + offset); ++#endif + return ret_val; + } + +Only in ltrace-0.5-pm: elf.c~ diff --git a/ltrace.spec b/ltrace.spec index ca678fe..9bcc773 100644 --- a/ltrace.spec +++ b/ltrace.spec @@ -1,11 +1,11 @@ Summary: Tracks runtime library calls from dynamically linked executables. Name: ltrace Version: 0.5 -Release: 1.3.45svn%{?dist} +Release: 2.45svn%{?dist} Source: ltrace-0.5.tar.gz Patch0: 1152117672-exec-patch Patch1: 1153220107-fork-patch -Patch2: ltrace-opd.patch +Patch2: ltrace-0.5-opd.patch Patch3: ltrace-ppc32fc5.patch Patch4: ltrace-0.5-gnuhash.patch Patch5: ltrace-0.5-testsuite.patch @@ -28,6 +28,8 @@ execution of processes. %prep %setup -q +%patch0 -p0 +%patch1 -p1 %patch2 -p1 %patch3 -p0 %patch4 -p1 @@ -45,10 +47,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} docdir=%{_docdir}/ltrace-%{versio %check echo ====================TESTING========================= -%ifarch ppc -%else make check -%endif echo ====================TESTING END===================== %clean @@ -62,8 +61,11 @@ rm -rf $RPM_BUILD_ROOT %config /etc/ltrace.conf %changelog -* Tue Aug 22 2006 Petr Machata - 0.5-1.1.45svn +* Wed Aug 23 2006 Petr Machata - 0.5-2.45svn +- use "{X}.{release}svn" release string per naming guidelines - adding fork and exec patches from IBM + +* Tue Aug 22 2006 Petr Machata - 0.5-1.1.45svn - using dist tag * Fri Aug 18 2006 Jesse Keating - 0.5-1.0.45svn.6