summaryrefslogtreecommitdiff
path: root/elfutils
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-11-26 22:57:29 +0000
committerjbj <devnull@localhost>2002-11-26 22:57:29 +0000
commit211e40766a5de1be22a7d7e5325a1dc1fc97c9a0 (patch)
treed964b255da35b89484cbe0fcd731412ea999d3f9 /elfutils
parent40e35cdce684eff593bd07fa5c44aac1497a1f36 (diff)
downloadlibrpm-tizen-211e40766a5de1be22a7d7e5325a1dc1fc97c9a0.tar.gz
librpm-tizen-211e40766a5de1be22a7d7e5325a1dc1fc97c9a0.tar.bz2
librpm-tizen-211e40766a5de1be22a7d7e5325a1dc1fc97c9a0.zip
Conflicts.
CVS patchset: 5891 CVS date: 2002/11/26 22:57:29
Diffstat (limited to 'elfutils')
-rw-r--r--elfutils/configure.ac2
-rw-r--r--elfutils/libelf/elf_rand.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/elfutils/configure.ac b/elfutils/configure.ac
index 4c0a9a9dd..f28dd42eb 100644
--- a/elfutils/configure.ac
+++ b/elfutils/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software Foundation,
dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
dnl
-AC_INIT([elfutils],[0.58],[drepper@redhat.com],[elfutils])
+AC_INIT([elfutils],[0.59],[drepper@redhat.com],[elfutils])
AM_INIT_AUTOMAKE([gnits 1.6.3 dist-bzip2])
AC_COPYRIGHT([Copyright (C) 1996-2001, 2002 Red Hat, Inc.])
AC_CONFIG_SRCDIR([libelf/elf_begin.c])
diff --git a/elfutils/libelf/elf_rand.c b/elfutils/libelf/elf_rand.c
index b6a560e4e..e91dcdd14 100644
--- a/elfutils/libelf/elf_rand.c
+++ b/elfutils/libelf/elf_rand.c
@@ -33,7 +33,7 @@ elf_rand (Elf *elf, size_t offset)
return 0;
/* Save the old offset and set the offset. */
- elf->state.ar.offset = offset;
+ elf->state.ar.offset = elf->start_offset + offset;
/* Get the next archive header. */
if (__libelf_next_arhdr (elf) != 0)