[elfutils/f12/master: 3/3] Update to 0.149

roland roland at fedoraproject.org
Mon Sep 13 23:56:59 UTC 2010


commit 1548e591c143812d862f389679359dbaedbdc306
Author: Roland McGrath <roland at redhat.com>
Date:   Mon Sep 13 16:56:18 2010 -0700

    Update to 0.149

 .gitignore                 |    2 +-
 elfutils-portability.patch |   86 +++++++++++++++++++++++++++++---------------
 elfutils-robustify.patch   |   38 ++++++++++----------
 elfutils.spec              |   46 ++++++++++++++++--------
 sources                    |    2 +-
 5 files changed, 109 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 650f54b..5d23003 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-elfutils-0.148.tar.bz2
+elfutils-0.149.tar.bz2
diff --git a/elfutils-portability.patch b/elfutils-portability.patch
index 4c03a8a..772ef91 100644
--- a/elfutils-portability.patch
+++ b/elfutils-portability.patch
@@ -82,7 +82,7 @@
  libebl_i386.so: $(cpu_i386)
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -2,6 +2,10 @@
+@@ -7,6 +7,10 @@
  
  	* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
  
@@ -93,7 +93,7 @@
  2009-09-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* configure.ac: Update for more modern autoconf.
-@@ -10,6 +14,10 @@
+@@ -15,6 +19,10 @@
  
  	* configure.ac (zip_LIBS): Check for liblzma too.
  
@@ -104,7 +104,7 @@
  2009-04-19  Roland McGrath  <roland at redhat.com>
  
  	* configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -21,6 +29,8 @@
+@@ -26,6 +34,8 @@
  
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
@@ -113,7 +113,7 @@
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -101,6 +111,10 @@
+@@ -106,6 +116,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -124,7 +124,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -148,6 +162,17 @@
+@@ -153,6 +167,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -572,7 +572,7 @@
  @MUDFLAP_FALSE at libmudflap = 
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
-@@ -9,6 +9,9 @@
+@@ -15,6 +15,9 @@
  
  2009-01-23  Roland McGrath  <roland at redhat.com>
  
@@ -582,7 +582,7 @@
  	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
  	substitution that can produce leading whitespace.
  
-@@ -338,6 +341,11 @@
+@@ -344,6 +347,11 @@
  	* defs/i386.doc: New file.
  	* defs/x86_64: New file.
  
@@ -633,7 +633,7 @@
  @MUDFLAP_FALSE at libmudflap = 
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -276,6 +276,10 @@
+@@ -299,6 +299,10 @@
  
  	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
  
@@ -644,7 +644,7 @@
  2009-08-10  Roland McGrath  <roland at redhat.com>
  
  	* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1044,6 +1048,11 @@
+@@ -1067,6 +1071,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -658,7 +658,7 @@
  
 --- elfutils/libdw/libdw.h
 +++ elfutils/libdw/libdw.h
-@@ -842,7 +842,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
+@@ -852,7 +852,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
  
  
  /* Inline optimizations.  */
@@ -669,7 +669,7 @@
  dwarf_whatattr (Dwarf_Attribute *attr)
 --- elfutils/libdw/Makefile.in
 +++ elfutils/libdw/Makefile.in
-@@ -191,6 +191,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -192,6 +192,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -677,7 +677,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -220,6 +221,7 @@ SHELL = @SHELL@
+@@ -221,6 +222,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -685,7 +685,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -282,7 +284,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
+@@ -283,7 +285,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
  	-I$(srcdir)/../libelf
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
  	$($(*F)_no_Werror),,-Werror) $(if \
@@ -696,7 +696,7 @@
  @MUDFLAP_FALSE at libmudflap = 
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1265,6 +1265,11 @@
+@@ -1283,6 +1283,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -710,7 +710,7 @@
  	* test2.c (main): Check sscanf result to quiet warning.
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -181,6 +181,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -182,6 +182,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -718,7 +718,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -210,6 +211,7 @@ SHELL = @SHELL@
+@@ -211,6 +212,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -726,7 +726,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -273,7 +275,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
+@@ -274,7 +276,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
  	-I$(srcdir)/../libdw
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
  	$($(*F)_no_Werror),,-Werror) $(if \
@@ -737,7 +737,7 @@
  @MUDFLAP_FALSE at libmudflap = 
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -624,6 +624,11 @@
+@@ -628,6 +628,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -778,7 +778,7 @@
  @MUDFLAP_FALSE at libmudflap = 
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -657,6 +657,11 @@
+@@ -666,6 +666,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -875,7 +875,7 @@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 --- elfutils/src/addr2line.c
 +++ elfutils/src/addr2line.c
-@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
+@@ -455,10 +455,10 @@ handle_address (const char *string, Dwfl
        bool parsed = false;
        int i, j;
        char *name = NULL;
@@ -890,7 +890,7 @@
  	  break;
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -165,8 +165,16 @@
+@@ -220,8 +220,16 @@
  	* readelf.c (attr_callback): Use print_block only when we don't use
  	print_ops.
  
@@ -907,7 +907,7 @@
  	* ar.c (do_oper_extract): Use pathconf instead of statfs.
  
  2009-08-01  Ulrich Drepper  <drepper at redhat.com>
-@@ -330,6 +338,8 @@
+@@ -385,6 +393,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -916,7 +916,7 @@
  2009-01-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -513,6 +523,11 @@
+@@ -568,6 +578,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -928,7 +928,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -764,6 +779,8 @@
+@@ -819,6 +834,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -937,7 +937,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -1203,6 +1220,10 @@
+@@ -1258,6 +1275,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -948,7 +948,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1279,6 +1300,10 @@
+@@ -1334,6 +1355,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -959,7 +959,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1627,6 +1652,11 @@
+@@ -1682,6 +1707,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1054,7 +1054,35 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -7845,7 +7845,7 @@ dump_archive_index (Elf *elf, const char
+@@ -4274,10 +4274,11 @@ struct listptr
+ #define listptr_offset_size(p)	((p)->dwarf64 ? 8 : 4)
+ #define listptr_address_size(p)	((p)->addr64 ? 8 : 4)
+ 
++static const char *listptr_name;
+ static int
+-compare_listptr (const void *a, const void *b, void *arg)
++compare_listptr (const void *a, const void *b)
+ {
+-  const char *name = arg;
++  const char *const name = listptr_name;
+   struct listptr *p1 = (void *) a;
+   struct listptr *p2 = (void *) b;
+ 
+@@ -4357,8 +4358,11 @@ static void
+ sort_listptr (struct listptr_table *table, const char *name)
+ {
+   if (table->n > 0)
+-    qsort_r (table->table, table->n, sizeof table->table[0],
+-	     &compare_listptr, (void *) name);
++    {
++      listptr_name = name;
++      qsort (table->table, table->n, sizeof table->table[0],
++	     &compare_listptr);
++    }
+ }
+ 
+ static bool
+@@ -8098,7 +8102,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -1090,7 +1118,7 @@
  	  break;
  	}
        if (errno != EINVAL && errno != ENOMEM)
-@@ -586,9 +595,11 @@ read_block (int fd, const char *fname, o
+@@ -584,9 +593,11 @@ read_block (int fd, const char *fname, o
        elfmap_off = from & ~(ps - 1);
        elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
  
diff --git a/elfutils-robustify.patch b/elfutils-robustify.patch
index 6d207a6..e65b48e 100644
--- a/elfutils-robustify.patch
+++ b/elfutils-robustify.patch
@@ -1,6 +1,6 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -649,10 +649,53 @@
+@@ -658,10 +658,53 @@
  	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.
  
@@ -865,7 +865,7 @@
  #endif  /* libelfP.h */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1615,6 +1615,16 @@
+@@ -1670,6 +1670,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -882,7 +882,7 @@
  2005-06-08  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -1660,6 +1670,19 @@
+@@ -1715,6 +1725,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  
@@ -1179,7 +1179,7 @@
  	   idx, section_name (ebl, idx),
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -1172,6 +1172,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+@@ -1178,6 +1178,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
    Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
  
    GElf_Sym sym_mem;
@@ -1188,7 +1188,7 @@
    printf ((grpref[0] & GRP_COMDAT)
  	  ? ngettext ("\
  \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
-@@ -1184,8 +1186,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+@@ -1190,8 +1192,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
  		      data->d_size / sizeof (Elf32_Word) - 1),
  	  elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
@@ -1199,7 +1199,7 @@
  	  ?: gettext ("<INVALID SYMBOL>"),
  	  data->d_size / sizeof (Elf32_Word) - 1);
  
-@@ -1336,7 +1338,8 @@ static void
+@@ -1342,7 +1344,8 @@ static void
  handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
  {
    int class = gelf_getclass (ebl->elf);
@@ -1209,7 +1209,7 @@
    Elf_Data *data;
    size_t cnt;
    size_t shstrndx;
-@@ -1351,6 +1354,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+@@ -1357,6 +1360,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1221,7 +1221,7 @@
    printf (ngettext ("\
  \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -1360,9 +1368,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+@@ -1366,9 +1374,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (int) shdr->sh_link,
@@ -1232,7 +1232,7 @@
    fputs_unlocked (gettext ("  Type              Value\n"), stdout);
  
    for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -1945,6 +1951,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -1951,6 +1957,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1246,7 +1246,7 @@
    /* Now we can compute the number of entries in the section.  */
    unsigned int nsyms = data->d_size / (class == ELFCLASS32
  				       ? sizeof (Elf32_Sym)
-@@ -1955,15 +1968,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -1961,15 +1974,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
  		    nsyms),
  	  (unsigned int) elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
@@ -1263,7 +1263,7 @@
  
    fputs_unlocked (class == ELFCLASS32
  		  ? gettext ("\
-@@ -2199,7 +2209,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+@@ -2205,7 +2215,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1278,7 +1278,7 @@
    printf (ngettext ("\
  \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2210,9 +2226,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+@@ -2216,9 +2232,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1289,7 +1289,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2265,8 +2279,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2271,8 +2285,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1305,7 +1305,7 @@
    printf (ngettext ("\
  \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2278,9 +2298,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2284,9 +2304,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1316,7 +1316,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2542,8 +2560,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2548,8 +2566,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
        filename = NULL;
      }
  
@@ -1332,7 +1332,7 @@
    printf (ngettext ("\
  \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'",
  		    "\
-@@ -2555,9 +2579,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2561,9 +2585,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1343,7 +1343,7 @@
  
    /* Now we can finally look at the actual contents of this section.  */
    for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -2609,7 +2631,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2615,7 +2637,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
    for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)
      ++counts[lengths[cnt]];
  
@@ -1362,7 +1362,7 @@
    printf (ngettext ("\
  \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2622,9 +2654,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2628,9 +2660,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
  	  shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1373,7 +1373,7 @@
  
    if (extrastr != NULL)
      fputs (extrastr, stdout);
-@@ -4312,6 +4342,16 @@ print_debug_aranges_section (Dwfl_Module
+@@ -4486,6 +4516,16 @@ print_debug_aranges_section (Dwfl_Module
        return;
      }
  
diff --git a/elfutils.spec b/elfutils.spec
index 74b77bc..6d72fa4 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,6 +1,6 @@
 Name: elfutils
 Summary: A collection of utilities and DSOs to handle compiled objects
-Version: 0.148
+Version: 0.149
 %global baserelease 1
 URL: https://fedorahosted.org/elfutils/
 %global source_url http://fedorahosted.org/releases/e/l/elfutils/%{version}/
@@ -13,18 +13,19 @@ Group: Development/Tools
 %global compat 0
 %endif
 
-%if 0%{?fedora} >= 8
-%global scanf_has_m 1
-%endif
-%if 0%{?rhel} >= 6
-%global scanf_has_m 1
-%endif
+%global portability		%{compat}
+%global scanf_has_m		!%{compat}
+%global separate_devel_static	1
 
-%if 0%{?fedora} >= 7
-%global separate_devel_static 1
+%if 0%{?rhel}
+%global portability		(%rhel < 6)
+%global scanf_has_m		(%rhel >= 6)
+%global separate_devel_static	(%rhel >= 6)
 %endif
-%if 0%{?rhel} >= 6
-%global separate_devel_static 1
+%if 0%{?fedora}
+%global portability		(%fedora < 9)
+%global scanf_has_m		(%fedora >= 8)
+%global separate_devel_static	(%fedora >= 7)
 %endif
 
 %if %{compat} || %{!?rhel:6}%{?rhel} < 6
@@ -122,7 +123,7 @@ Provides: elfutils-devel%{depsuffix} = %{version}-%{release}
 %endif
 Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
 Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
-%if !0%{?separate_devel_static}
+%if !%{separate_devel_static}
 Requires: elfutils-devel-static%{depsuffix} = %{version}-%{release}
 %endif
 
@@ -167,7 +168,7 @@ Group: Development/Tools
 Provides: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
 %endif
 Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
-%if !0%{?separate_devel_static}
+%if !%{separate_devel_static}
 Requires: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release}
 %endif
 Obsoletes: libelf-devel <= 0.8.2-2
@@ -193,16 +194,21 @@ for libelf.
 %prep
 %setup -q
 
+: 'compat=%compat'
+: 'portability=%portability'
+: 'separate_devel_static=%separate_devel_static'
+: 'scanf_has_m=%scanf_has_m'
+
 %patch1 -p1 -b .robustify
 
-%if %{compat}
+%if %{portability}
 %patch2 -p1 -b .portability
 sleep 1
 find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch
 sleep 1
 find . \( -name configure -o -name config.h.in \) -print | xargs touch
 %else
-%if !0%{?scanf_has_m}
+%if !%{scanf_has_m}
 sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c
 %endif
 %endif
@@ -319,6 +325,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libelf.a
 
 %changelog
+* Mon Sep 13 2010 Roland McGrath <roland at redhat.com> - 0.149-1
+- Update to 0.149
+  - libdw: Decode new DW_OP_GNU_implicit_pointer operation;
+       	   new function dwarf_getlocation_implicit_pointer.
+  - libdwfl: New function dwfl_dwarf_line.
+  - eu-addr2line: New flag -F/--flags to print more DWARF line info details.
+  - eu-readelf: better .debug_loc processing (#627729)
+  - eu-strings: Fix non-mmap file reading. (#609468)
+  - eu-strip: -g recognizes .gdb_index as a debugging section. (#631997)
+
 * Mon Jun 28 2010 Roland McGrath <roland at redhat.com> - 0.148-1
 - Update to 0.148
   - libdw: Accept DWARF 4 format: new functions dwarf_next_unit,
diff --git a/sources b/sources
index 6906f9a..927d580 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0bed1130135f17ad27533b0034dba8d  elfutils-0.148.tar.bz2
+8690cfcde541c83c0549623ea33c75f6  elfutils-0.149.tar.bz2


More information about the scm-commits mailing list