Update to 0.126

This commit is contained in:
roland 2007-02-05 22:40:47 +00:00
parent 4a88b3dba1
commit 23355783ec
3 changed files with 47 additions and 46 deletions

View File

@ -1,6 +1,6 @@
--- elfutils/backends/ChangeLog
+++ elfutils/backends/ChangeLog
@@ -123,6 +123,11 @@
@@ -130,6 +130,11 @@
* sparc_init.c: Likewise.
* x86_64_init.c: Likewise.
@ -12,7 +12,7 @@
2005-11-19 Roland McGrath <roland@redhat.com>
* ppc64_reloc.def: REL30 -> ADDR30.
@@ -145,6 +150,9 @@
@@ -152,6 +157,9 @@
* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
(CLEANFILES): Add libebl_$(m).so.
@ -139,7 +139,7 @@
ac_ct_CC = @ac_ct_CC@
--- elfutils/configure
+++ elfutils/configure
@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.125'
@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.126'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
ac_unique_file="libelf/libelf.h"
@ -461,7 +461,7 @@
libcpu_i386_a_SOURCES = i386_dis.c
--- elfutils/libdw/ChangeLog
+++ elfutils/libdw/ChangeLog
@@ -322,6 +322,11 @@
@@ -329,6 +329,11 @@
2005-05-31 Roland McGrath <roland@redhat.com>
@ -525,7 +525,7 @@
$(COMPILE)))
--- elfutils/libdwfl/ChangeLog
+++ elfutils/libdwfl/ChangeLog
@@ -371,6 +371,11 @@
@@ -409,6 +409,11 @@
2005-07-21 Roland McGrath <roland@redhat.com>
@ -586,7 +586,7 @@
--- elfutils/libebl/ChangeLog
+++ elfutils/libebl/ChangeLog
@@ -451,6 +451,11 @@
@@ -460,6 +460,11 @@
* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
tracking works right.
@ -617,7 +617,7 @@
INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
--- elfutils/libebl/Makefile.in
+++ elfutils/libebl/Makefile.in
@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -132,6 +132,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
@ -625,7 +625,7 @@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
@@ -172,6 +173,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
USE_NLS = @USE_NLS@
VERSION = 1
@ -633,7 +633,7 @@
XGETTEXT = @XGETTEXT@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
@@ -214,9 +216,9 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@ -647,7 +647,7 @@
--- elfutils/libelf/ChangeLog
+++ elfutils/libelf/ChangeLog
@@ -183,6 +183,11 @@
@@ -206,6 +206,11 @@
If section content hasn't been read yet, do it before looking for the
block size. If no section data present, infer size of section header.
@ -779,7 +779,7 @@
ac_ct_CC = @ac_ct_CC@
--- elfutils/src/ChangeLog
+++ elfutils/src/ChangeLog
@@ -42,6 +42,10 @@
@@ -76,6 +76,10 @@
* elflint.c (valid_e_machine): Add EM_ALPHA.
Reported by Christian Aichinger <Greek0@gmx.net>.
@ -790,7 +790,7 @@
2006-08-08 Ulrich Drepper <drepper@redhat.com>
* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
@@ -118,6 +122,10 @@
@@ -152,6 +156,10 @@
* Makefile.am: Add hacks to create dependency files for non-generic
linker.
@ -801,7 +801,7 @@
2006-06-12 Ulrich Drepper <drepper@redhat.com>
* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
@@ -466,6 +474,11 @@
@@ -500,6 +508,11 @@
* readelf.c (print_debug_loc_section): Fix indentation for larger
address size.
@ -844,12 +844,12 @@
$(if $($(*F)_no_Werror),,-Werror) \
- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
$(if $($(*F)_no_Wformat),,-Wformat=2)
$(if $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
--- elfutils/src/Makefile.in
+++ elfutils/src/Makefile.in
@@ -202,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -212,6 +212,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
@ -857,7 +857,7 @@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -242,6 +243,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
@@ -252,6 +253,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -865,19 +865,20 @@
XGETTEXT = @XGETTEXT@
YACC = @YACC@ -d
ac_ct_CC = @ac_ct_CC@
@@ -286,12 +288,12 @@ target_alias = @target_alias@
@@ -296,13 +298,13 @@ target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
@MUDFLAP_FALSE@ $(native_ld_cflags) $(if \
@MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \
-@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
+@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
@MUDFLAP_FALSE@ $($(*F)_no_Wformat),,-Wformat=2)
@MUDFLAP_FALSE@ $($(*F)_no_Wformat),,-Wformat=2) \
@MUDFLAP_FALSE@ $(CFLAGS_$(*F))
@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \
@MUDFLAP_TRUE@ $(native_ld_cflags) $(if \
@MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) $(if \
-@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
+@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
@MUDFLAP_TRUE@ $($(*F)_no_Wformat),,-Wformat=2)
@MUDFLAP_TRUE@ $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
-I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
--- elfutils/src/strings.c
@ -961,7 +962,7 @@
cannot set access and modification date of '%s'"), fname);
--- elfutils/tests/ChangeLog
+++ elfutils/tests/ChangeLog
@@ -419,6 +419,11 @@
@@ -449,6 +449,11 @@
* Makefile.am (TESTS): Add run-elflint-test.sh.
(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
@ -993,7 +994,7 @@
endif
--- elfutils/tests/Makefile.in
+++ elfutils/tests/Makefile.in
@@ -294,6 +294,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -297,6 +297,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
@ -1001,7 +1002,7 @@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -334,6 +335,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
@@ -337,6 +338,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -1009,7 +1010,7 @@
XGETTEXT = @XGETTEXT@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
@@ -375,10 +377,10 @@ sbindir = @sbindir@
@@ -378,10 +380,10 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@

View File

@ -17,7 +17,7 @@ libelf/
* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to
elf->map_address. Check if first section header fits into object's
bounds.
* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Fix comment pasto.
* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)):
Check if section header table fits into object's bounds.
* elf_begin.c (get_shnum): Ensure section headers fits into
object's bounds.
@ -84,9 +84,9 @@ src/
/* All the data is already mapped. Use it. */
if (ehdr->e_ident[EI_DATA] == MY_ELFDATA
&& (ALLOW_UNALIGNED
--- elfutils-0.122/libelf/elf32_getshdr.c
+++ elfutils-0.122/libelf/elf32_getshdr.c
@@ -101,11 +101,12 @@ elfw2(LIBELFBITS,getshdr) (scn)
--- elfutils-0.126/libelf/elf32_getshdr.c
+++ elfutils-0.126/libelf/elf32_getshdr.c
@@ -101,7 +101,8 @@ elfw2(LIBELFBITS,getshdr) (scn)
goto out;
size_t shnum;
@ -96,15 +96,10 @@ src/
goto out;
size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr));
- /* Allocate memory for the program headers. We know the number
+ /* Allocate memory for the section headers. We know the number
of entries from the ELF header. */
ElfW2(LIBELFBITS,Shdr) *shdr = elf->state.ELFW(elf,LIBELFBITS).shdr =
(ElfW2(LIBELFBITS,Shdr) *) malloc (size);
@@ -128,6 +129,16 @@ elfw2(LIBELFBITS,getshdr) (scn)
+ ehdr->e_shoff)
& (__alignof__ (ElfW2(LIBELFBITS,Shdr)) - 1)) != 0));
@@ -118,6 +119,16 @@ elfw2(LIBELFBITS,getshdr) (scn)
if (elf->map_address != NULL)
{
+ /* First see whether the information in the ELF header is
+ valid and it does not ask for too much. */
+ if (unlikely (ehdr->e_shoff >= elf->maximum_size)
@ -115,9 +110,10 @@ src/
+ goto free_and_out;
+ }
+
/* Now copy the data and at the same time convert the byte
order. */
if (ALLOW_UNALIGNED
ElfW2(LIBELFBITS,Shdr) *notcvt;
/* All the data is already mapped. If we could use it
--- elfutils-0.122/libelf/elf32_newphdr.c
+++ elfutils-0.122/libelf/elf32_newphdr.c
@@ -124,6 +124,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count)

View File

@ -1,5 +1,5 @@
%define eu_version 0.125
%define eu_release 3
%define eu_version 0.126
%define eu_release 1
%if %{?_with_compat:1}%{!?_with_compat:0}
%define compat 1
@ -35,8 +35,6 @@ Patch0: elfutils-strip-copy-symtab.patch
Source2: testfile16.symtab.bz2
Source3: testfile16.symtab.debug.bz2
Patch3: elfutils-0.125-warn_unused_result.patch
# ExcludeArch: xxx
BuildRoot: %{_tmppath}/%{name}-root
@ -166,7 +164,6 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch
%endif
%patch2 -p1
%patch3 -p0
%build
# Remove -Wall from default flags. The makefiles enable enough warnings
@ -181,7 +178,7 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D__NO_INLINE__"
%endif
%configure CFLAGS="$RPM_OPT_FLAGS -fexceptions"
make %{?_smp_mflags}
make -s %{?_smp_mflags}
%install
rm -rf ${RPM_BUILD_ROOT}
@ -203,8 +200,7 @@ chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so*
}
%check
# XXX elflint not happy on ia64
make check || :
make check
%clean
rm -rf ${RPM_BUILD_ROOT}
@ -221,6 +217,7 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-,root,root)
%doc README TODO
%{_bindir}/eu-addr2line
%{_bindir}/eu-ar
%{_bindir}/eu-elfcmp
%{_bindir}/eu-elflint
%{_bindir}/eu-findtextrel
@ -274,6 +271,13 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libelf.a
%changelog
* Mon Feb 5 2007 Roland McGrath <roland@redhat.com> - 0.126-1
- Update to 0.126
- New program eu-ar.
- libdw: fix missing dwarf_getelf (#227206)
- libdwfl: dwfl_module_addrname for st_size=0 symbols (#227167, #227231)
- Resolves: RHBZ #227206, RHBZ #227167, RHBZ #227231
* Wed Jan 10 2007 Roland McGrath <roland@redhat.com> - 0.125-3
- Fix overeager warn_unused_result build failures.