rpms/ltrace/devel ltrace-0.5-gnuhash.patch, 1.2, 1.3 ltrace.spec, 1.40, 1.41

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Jul 15 00:38:55 UTC 2006


Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28413

Modified Files:
	ltrace-0.5-gnuhash.patch ltrace.spec 
Log Message:
More gnuhash fixes.


ltrace-0.5-gnuhash.patch:
 elf.c     |  107 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 elf.h     |    1 
 options.c |    2 -
 3 files changed, 92 insertions(+), 18 deletions(-)

Index: ltrace-0.5-gnuhash.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-0.5-gnuhash.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ltrace-0.5-gnuhash.patch	14 Jul 2006 22:50:16 -0000	1.2
+++ ltrace-0.5-gnuhash.patch	15 Jul 2006 00:38:52 -0000	1.3
@@ -10,7 +10,7 @@
  			data = elf_getdata(scn, NULL);
  			if (data == NULL || elf_getdata(scn, data) != NULL
  			    || data->d_off || data->d_size != shdr.sh_size)
-@@ -209,6 +211,33 @@ static void do_init_elf(struct ltelf *lt
+@@ -209,6 +211,30 @@ static void do_init_elf(struct ltelf *lt
  				error(EXIT_FAILURE, 0,
  				      "Unknown .hash sh_entsize in \"%s\"",
  				      filename);
@@ -22,10 +22,11 @@
 +
 +			lte->hash_type = SHT_GNU_HASH;
 +
-+			if (shdr.sh_entsize != 0) {
++			if (shdr.sh_entsize != 0
++			    && shdr.sh_entsize != 4) {
 +				error(EXIT_FAILURE, 0,
-+				      ".gnu.hash sh_entsize in \"%s\" should be 0",
-+				      filename);
++				      ".gnu.hash sh_entsize in \"%s\" should be 4, but is %d",
++				      filename, shdr.sh_entsize);
 +			}
 +
 +			data = elf_getdata(scn, NULL);
@@ -35,10 +36,6 @@
 +				      "Couldn't get .gnu.hash data from \"%s\"",
 +				      filename);
 +
-+			if (data->d_type != ELF_T_GNUHASH)
-+				error(EXIT_FAILURE, 0,
-+				      "Couldn't get .gnu.hash data from \"%s\"",
-+				      filename);
 +			lte->hash = (Elf32_Word *) data->d_buf;
 +#endif
  		} else if (shdr.sh_type == SHT_PROGBITS


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ltrace.spec	14 Jul 2006 23:50:23 -0000	1.40
+++ ltrace.spec	15 Jul 2006 00:38:52 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.0.45svn.3
+Release: 1.0.45svn.4
 Source: ltrace-0.5.tar.gz
 Patch2: ltrace-opd.patch
 Patch3: ltrace-ppc32fc5.patch
@@ -56,7 +56,7 @@
 %config /etc/ltrace.conf
 
 %changelog
-* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.3
+* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.4
 - adding .gnu.hash patch to support new ELF hash table section
 - adding testsuite patch to silent some bogus failures
 




More information about the fedora-cvs-commits mailing list