rpms/chrpath/devel chrpath-0.13-NULL-entry.patch, NONE, 1.1 chrpath.spec, 1.6, 1.7

[athimm]

Author: athimm

Update of /cvs/extras/rpms/chrpath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8708/devel

Modified Files:
	chrpath.spec 
Added Files:
	chrpath-0.13-NULL-entry.patch 
Log Message:
Fix last NULL in .dynamic section.

chrpath-0.13-NULL-entry.patch:
 killrpath.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE chrpath-0.13-NULL-entry.patch ---
diff -uNr chrpath-0.13.old/killrpath.c chrpath-0.13/killrpath.c
--- chrpath-0.13.old/killrpath.c	2003-06-24 00:46:15.000000000 +0200
+++ chrpath-0.13/killrpath.c	2009-07-19 23:05:11.000000000 +0200
@@ -73,8 +73,11 @@
        if ( ! elf_dynpath_tag(dyns[i].d_tag) )
         dynpos++;
      }
-   for (; dynpos < i; dynpos++)
+   for (; dynpos < i; dynpos++) {
      dyns[dynpos].d_tag = DT_NULL;
+     dyns[dynpos].d_un.d_val = 0x0;
+   }
+
 
    if (lseek(fd, phdr.p_offset, SEEK_SET) == -1
        || write(fd, dyns, phdr.p_filesz) != (int)phdr.p_filesz)


Index: chrpath.spec
===================================================================
RCS file: /cvs/extras/rpms/chrpath/devel/chrpath.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- chrpath.spec	24 Feb 2009 07:32:16 -0000	1.6
+++ chrpath.spec	23 Jul 2009 15:27:24 -0000	1.7
@@ -1,10 +1,11 @@
 Summary: Modify rpath of compiled programs
 Name: chrpath
 Version: 0.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL+
 Group: Development/Tools
 URL: ftp://ftp.hungry.com/pub/hungry/chrpath/
+Patch0: chrpath-0.13-NULL-entry.patch
 Source0: ftp://ftp.hungry.com/pub/hungry/chrpath/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -15,6 +16,7 @@ is supported.
 
 %prep
 %setup -q
+%patch0 -p1 -b .NULL
 
 %build
 %configure
@@ -36,8 +38,8 @@ rm -rf %{buildroot}
 %{_mandir}/man1/chrpath.1*
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Jul 23 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.13-5
+- Fix last entry in .dynamic (by Christian Krause <chkr at plauener.de>).
 
 * Sat Sep  8 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.13-2
 - License: GPL+