From 6104ca6eeddd5aa0f3470178ea50f9af820e65d72076af2c69ca6ec9c06b72eb Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 20 Aug 2009 12:07:23 +0000 Subject: [PATCH 1/3] Copy from home:rguenther/elfutils via accept of submit request 18355 Request was accepted with message: OBS-URL: https://build.opensuse.org/package/show/Base:System/elfutils?expand=0&rev=4 --- elfutils-old-scanf-fix.diff | 19 ++++++++----------- elfutils.changes | 5 +++++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/elfutils-old-scanf-fix.diff b/elfutils-old-scanf-fix.diff index 28dfd35..d186b00 100644 --- a/elfutils-old-scanf-fix.diff +++ b/elfutils-old-scanf-fix.diff @@ -1,6 +1,8 @@ ---- src/addr2line.c-dist 2008-12-05 08:42:12.000000000 +0100 -+++ src/addr2line.c 2008-12-05 08:45:22.000000000 +0100 -@@ -373,8 +373,8 @@ handle_address (const char *string, Dwfl +Index: src/addr2line.c +=================================================================== +--- src/addr2line.c.orig 2009-04-21 16:50:01.000000000 +0200 ++++ src/addr2line.c 2009-08-20 13:11:58.000000000 +0200 +@@ -446,11 +446,11 @@ handle_address (const char *string, Dwfl { bool parsed = false; int n; @@ -9,18 +11,13 @@ + char name[4096]; /* FIXME */ + if (sscanf (string, "(%[^)])%" PRIiMAX "%n", name, &addr, &n) == 2 && string[n] == '\0') - { - /* It was (section)+offset. This makes sense if there is -@@ -415,7 +415,7 @@ handle_address (const char *string, Dwfl - } - } - } + parsed = adjust_to_section (name, &addr, dwfl); - else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 -+ else if (sscanf (string, "%[^-+]%" PRIiMAX "%n", name, &addr, &n) == 2 ++ else if (sscanf (string, "%[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 && string[n] == '\0') { /* It was symbol+offset. */ -@@ -436,7 +436,6 @@ handle_address (const char *string, Dwfl +@@ -471,7 +471,6 @@ handle_address (const char *string, Dwfl } } diff --git a/elfutils.changes b/elfutils.changes index 0694773..42b1f1a 100644 --- a/elfutils.changes +++ b/elfutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 20 13:13:21 CEST 2009 - rguenther@suse.de + +- Fix elfutils-old-scanf-fix.diff patch. + ------------------------------------------------------------------- Thu Aug 13 16:11:47 CEST 2009 - tiwai@suse.de From 974a293c78374f8df2505b368239012e263f7459cbf4e852717f0f8bb7c79b6f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 21 Aug 2009 14:18:45 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/elfutils?expand=0&rev=5 --- elfutils-old-scanf-fix.diff | 19 +++++++++++-------- elfutils.changes | 5 ----- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/elfutils-old-scanf-fix.diff b/elfutils-old-scanf-fix.diff index d186b00..28dfd35 100644 --- a/elfutils-old-scanf-fix.diff +++ b/elfutils-old-scanf-fix.diff @@ -1,8 +1,6 @@ -Index: src/addr2line.c -=================================================================== ---- src/addr2line.c.orig 2009-04-21 16:50:01.000000000 +0200 -+++ src/addr2line.c 2009-08-20 13:11:58.000000000 +0200 -@@ -446,11 +446,11 @@ handle_address (const char *string, Dwfl +--- src/addr2line.c-dist 2008-12-05 08:42:12.000000000 +0100 ++++ src/addr2line.c 2008-12-05 08:45:22.000000000 +0100 +@@ -373,8 +373,8 @@ handle_address (const char *string, Dwfl { bool parsed = false; int n; @@ -11,13 +9,18 @@ Index: src/addr2line.c + char name[4096]; /* FIXME */ + if (sscanf (string, "(%[^)])%" PRIiMAX "%n", name, &addr, &n) == 2 && string[n] == '\0') - parsed = adjust_to_section (name, &addr, dwfl); + { + /* It was (section)+offset. This makes sense if there is +@@ -415,7 +415,7 @@ handle_address (const char *string, Dwfl + } + } + } - else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 -+ else if (sscanf (string, "%[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 ++ else if (sscanf (string, "%[^-+]%" PRIiMAX "%n", name, &addr, &n) == 2 && string[n] == '\0') { /* It was symbol+offset. */ -@@ -471,7 +471,6 @@ handle_address (const char *string, Dwfl +@@ -436,7 +436,6 @@ handle_address (const char *string, Dwfl } } diff --git a/elfutils.changes b/elfutils.changes index 42b1f1a..0694773 100644 --- a/elfutils.changes +++ b/elfutils.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 20 13:13:21 CEST 2009 - rguenther@suse.de - -- Fix elfutils-old-scanf-fix.diff patch. - ------------------------------------------------------------------- Thu Aug 13 16:11:47 CEST 2009 - tiwai@suse.de From 4b1d6e5ea4a761f057f7cacd389db2d480d0c37f7ae8276873569c0e17c6086b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 21 Aug 2009 14:18:46 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/elfutils revision 10.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/elfutils?expand=0&rev=e02a764b58766649460424373c29dcbd --- elfutils-old-scanf-fix.diff | 19 ++++++++----------- elfutils.changes | 5 +++++ elfutils.spec | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/elfutils-old-scanf-fix.diff b/elfutils-old-scanf-fix.diff index 28dfd35..d186b00 100644 --- a/elfutils-old-scanf-fix.diff +++ b/elfutils-old-scanf-fix.diff @@ -1,6 +1,8 @@ ---- src/addr2line.c-dist 2008-12-05 08:42:12.000000000 +0100 -+++ src/addr2line.c 2008-12-05 08:45:22.000000000 +0100 -@@ -373,8 +373,8 @@ handle_address (const char *string, Dwfl +Index: src/addr2line.c +=================================================================== +--- src/addr2line.c.orig 2009-04-21 16:50:01.000000000 +0200 ++++ src/addr2line.c 2009-08-20 13:11:58.000000000 +0200 +@@ -446,11 +446,11 @@ handle_address (const char *string, Dwfl { bool parsed = false; int n; @@ -9,18 +11,13 @@ + char name[4096]; /* FIXME */ + if (sscanf (string, "(%[^)])%" PRIiMAX "%n", name, &addr, &n) == 2 && string[n] == '\0') - { - /* It was (section)+offset. This makes sense if there is -@@ -415,7 +415,7 @@ handle_address (const char *string, Dwfl - } - } - } + parsed = adjust_to_section (name, &addr, dwfl); - else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 -+ else if (sscanf (string, "%[^-+]%" PRIiMAX "%n", name, &addr, &n) == 2 ++ else if (sscanf (string, "%[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 && string[n] == '\0') { /* It was symbol+offset. */ -@@ -436,7 +436,6 @@ handle_address (const char *string, Dwfl +@@ -471,7 +471,6 @@ handle_address (const char *string, Dwfl } } diff --git a/elfutils.changes b/elfutils.changes index 0694773..42b1f1a 100644 --- a/elfutils.changes +++ b/elfutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 20 13:13:21 CEST 2009 - rguenther@suse.de + +- Fix elfutils-old-scanf-fix.diff patch. + ------------------------------------------------------------------- Thu Aug 13 16:11:47 CEST 2009 - tiwai@suse.de diff --git a/elfutils.spec b/elfutils.spec index 7dcedad..669da11 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -21,7 +21,7 @@ Name: elfutils License: GPL v2 or later Version: 0.142 -Release: 1 +Release: 2 Summary: Higher-level library to access ELF Group: System/Libraries Url: http://elfutils.fedorahosted.org