From fc721895c184c2a8a73d37c69391dea569e9ec38d2fa3fc8f68ca74a4acf6e71 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 21 Sep 2009 19:26:59 +0000
Subject: [PATCH] Accepting request 20544 from Base:System

Copy from Base:System/ptools based on submit request 20544 from user janblunck

OBS-URL: https://build.opensuse.org/request/show/20544
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ptools?expand=0&rev=2
---
 output-l_addr.diff | 25 +++++++++++++++++++++++++
 ptools.changes     |  5 +++++
 ptools.spec        | 16 ++++------------
 3 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 output-l_addr.diff

diff --git a/output-l_addr.diff b/output-l_addr.diff
new file mode 100644
index 0000000..1873e50
--- /dev/null
+++ b/output-l_addr.diff
@@ -0,0 +1,25 @@
+diff --git a/src/pbuildid.c b/src/pbuildid.c
+index 3e480aa..445d6bf 100644
+--- a/src/pbuildid.c
++++ b/src/pbuildid.c
+@@ -234,7 +234,7 @@ static void so_print_buildid(struct core_map_info *core_map, const char *name,
+ 					 note_phdr->p_filesz);
+ 		if (len) {
+ 			unsigned int i;
+-			printf("%s ", name);
++			printf("%s %#" PRIx64 " ", name, ehdr_addr);
+ 			for (i = 0; i < len; i++)
+ 				printf("%02" PRIx8, build_id[i]);
+ 			printf("\n");
+@@ -915,8 +915,9 @@ static int process_core(Elf *elf, GElf_Ehdr *ehdr)
+ 							 nphdr->p_filesz);
+ 				if (len) {
+ 					unsigned int i;
+-					printf("%s ",
+-					       core_fname ? core_fname : "");
++					printf("%s %#" PRIx64 " ",
++					       core_fname ? core_fname : "",
++					       core_l_addr);
+ 					for (i = 0; i < len; i++)
+ 						printf("%02" PRIx8,
+ 						       build_id[i]);
diff --git a/ptools.changes b/ptools.changes
index bc231b6..c57d7ba 100644
--- a/ptools.changes
+++ b/ptools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb  3 10:37:08 CET 2009 - jblunck@suse.de
+
+- Print out the load address of shared objects as well.
+
 -------------------------------------------------------------------
 Mon Nov 10 22:36:48 CET 2008 - jblunck@suse.de
 
diff --git a/ptools.spec b/ptools.spec
index b79792c..b37406a 100644
--- a/ptools.spec
+++ b/ptools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ptools (Version 0.1)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -21,10 +21,11 @@ Url:            ftp://ftp.suse.com/pub/people/jblunck/ptools/
 Name:           ptools
 Summary:        The process tools collection
 Version:        0.1
-Release:        2
+Release:        3
 License:        GPL v2 or later
 Group:          Development/Tools/Debuggers
 Source:         %{name}-%{version}.tar.bz2
+Patch0:         output-l_addr.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libelf-devel popt-devel
 AutoReqProv:    on
@@ -42,6 +43,7 @@ Authors:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -60,13 +62,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pbuildid.1*
 
 %changelog
-* Mon Nov 10 2008 jblunck@suse.de
-- Relocate the AT_SYSINFO_EHDR to match the link_map->l_addr
-- Check the version of the linker protocol used by the dynamic linker
-- Parse section headers when processing executables
-- Add pbuildid manual page
-- Various cleanups
-* Fri Nov 07 2008 jblunck@suse.de
-- Add --kernel and --vdso command line.
-* Thu Nov 06 2008 jblunck@suse.de
-- The initial package of this tools. Only includes pbuildid for the moment.