[pax-utils] update to 0.9.2

[Dominik Mierzejewski]

commit 4fbb19d56394c5472dad9616c15ea069de6a8769
Author: Dominik 'Rathann' Mierzejewski <dominik at greysector.net>
Date:   Tue Dec 2 14:43:36 2014 +0100

    update to 0.9.2
    
    - fix lddtree to search for ld.so in more locations (patch by Jakub Čajka)

 .gitignore                         |    1 +
 pax-utils-lddtree-ld.so-path.patch |   32 ++++++++++++++++++++++++++++++++
 pax-utils.spec                     |    8 +++++++-
 sources                            |    2 +-
 4 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c64735..e4fc8f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ pax-utils-0.2.1.tar.bz2
 /pax-utils-0.7.tar.xz
 /pax-utils-0.8.1.tar.xz
 /pax-utils-0.9.1.tar.xz
+/pax-utils-0.9.2.tar.xz
diff --git a/pax-utils-lddtree-ld.so-path.patch b/pax-utils-lddtree-ld.so-path.patch
new file mode 100644
index 0000000..5d4b6ef
--- /dev/null
+++ b/pax-utils-lddtree-ld.so-path.patch
@@ -0,0 +1,32 @@
+diff -up pax-utils-0.9.2/lddtree.py.ld.so-path pax-utils-0.9.2/lddtree.py
+--- pax-utils-0.9.2/lddtree.py.ld.so-path	2014-12-02 14:40:46.725490372 +0100
++++ pax-utils-0.9.2/lddtree.py	2014-12-02 14:41:52.483804496 +0100
+@@ -379,6 +379,8 @@ def ParseELF(path, root='/', prefix='',
+             'needed': [],
+         }
+         # XXX: Should read it and scan for /lib paths.
++        if os.path.islink(interp):
++            interp = readlink(interp, root, prefixed=True)
+         ldpaths['interp'] = [
+             normpath(root + os.path.dirname(interp)),
+             normpath(root + prefix + '/usr' + os.path.dirname(interp).lstrip(prefix)),
+diff -up pax-utils-0.9.2/lddtree.sh.ld.so-path pax-utils-0.9.2/lddtree.sh
+--- pax-utils-0.9.2/lddtree.sh.ld.so-path	2014-11-20 03:27:55.000000000 +0100
++++ pax-utils-0.9.2/lddtree.sh	2014-12-02 14:40:46.725490372 +0100
+@@ -179,9 +179,16 @@ show_elf() {
+ 	for lib in ${libs//,/ } ; do
+ 		lib=${lib##*/}
+ 		[[ ,${my_allhits}, == *,${lib},* ]] && continue
++        if [[ ${interp} == ${lib} ]] ; then
++            ldso_path_bak=${lib_paths_ldso}
++            lib_paths_ldso="/lib "+${lib_paths_ldso}
++        fi
+ 		find_elf "${lib}" "${resolved}"
+ 		rlib=${_find_elf}
+ 		show_elf "${rlib:-${lib}}" $((indent + 4)) "${parent_elfs}"
++        if [[ ${interp} == ${lib} ]] ; then
++            lib_paths_ldso=${ldso_path_bak}
++        fi
+ 	done
+ }
+ 
diff --git a/pax-utils.spec b/pax-utils.spec
index 5ebfb2d..7e24f12 100644
--- a/pax-utils.spec
+++ b/pax-utils.spec
@@ -1,10 +1,11 @@
 Summary: PaX aware and related utilities for ELF binaries
 Name: pax-utils
-Version: 0.9.1
+Version: 0.9.2
 Release: 1%{?dist}
 # http://packages.gentoo.org/package/app-misc/pax-utils
 URL: http://hardened.gentoo.org/pax-utils.xml
 Source0: http://distfiles.gentoo.org/distfiles/%{name}-%{version}.tar.xz
+Patch0: %{name}-lddtree-ld.so-path.patch
 License: GPLv2
 BuildRequires: libcap-devel
 # required for testsuite
@@ -17,6 +18,7 @@ used on any distro.
 
 %prep
 %setup -q
+%patch0 -p1 -b .ld.so-path
 
 %build
 %configure --with-caps
@@ -43,6 +45,10 @@ make check
 %{_mandir}/man1/scanmacho.1*
 
 %changelog
+* Tue Dec 02 2014 Dominik Mierzejewski <rpm at greysector.net> - 0.9.2-1
+- update to 0.9.2
+- fix lddtree to search for ld.so in more locations (patch by Jakub Čajka)
+
 * Tue Oct 28 2014 Dominik Mierzejewski <rpm at greysector.net> - 0.9.1-1
 - update to 0.9.1
 - adapt specfile to upstream introduction of autotools
diff --git a/sources b/sources
index 386fc61..0102126 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e47c9c59832e99fe9793d23610e3462c  pax-utils-0.9.1.tar.xz
+34c41888cec67759c21333bef13e950c  pax-utils-0.9.2.tar.xz