From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RDP9z-0001DA-SO for garchives@archives.gentoo.org; Mon, 10 Oct 2011 23:21:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94C7B21C3FF; Mon, 10 Oct 2011 23:21:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5663021C3FF for ; Mon, 10 Oct 2011 23:21:15 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2C1E1B4010 for ; Mon, 10 Oct 2011 23:21:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B366C80042 for ; Mon, 10 Oct 2011 23:21:13 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: Subject: [gentoo-commits] proj/elfix:master commit in: scripts/ X-VCS-Repository: proj/elfix X-VCS-Files: scripts/revdep-pax X-VCS-Directories: scripts/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b92738dd6e63b951a482027e784460951e4b9967 Date: Mon, 10 Oct 2011 23:21:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2c30553b7c3291f824f297a0ed03d3ba commit: b92738dd6e63b951a482027e784460951e4b9967 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Oct 10 23:21:09 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Oct 10 23:21:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/elfix.git;a=3D= commit;h=3Db92738dd scripts/revdep-pax: add verbosity to output --- scripts/revdep-pax | 189 +++++++++++++++++++++++++++++++---------------= ------ 1 files changed, 114 insertions(+), 75 deletions(-) diff --git a/scripts/revdep-pax b/scripts/revdep-pax index bdf6004..4e35f1e 100755 --- a/scripts/revdep-pax +++ b/scripts/revdep-pax @@ -7,12 +7,12 @@ import subprocess import re import pax =20 -def get_ldd_linkings(elf): +def get_ldd_linkings(binary): try: #When subprocess.DEVNULL makes it to python, change this: http://bugs.= python.org/issue5870 - ldd_output =3D subprocess.check_output(['/usr/bin/ldd', elf], stderr=3D= subprocess.PIPE) + ldd_output =3D subprocess.check_output(['/usr/bin/ldd', binary], stder= r=3Dsubprocess.PIPE) except: - # We should record these elfs which are probably static + # We should record these binaries which are probably statically linked return [] ldd_lines =3D ldd_output.split('\n') linkings =3D [] @@ -24,12 +24,12 @@ def get_ldd_linkings(elf): mapp =3D re.split('=3D>', ldd_lines[m] ) soname =3D mapp[0].strip() soname =3D os.path.basename(soname) # This is for ./libSDL-1.2.so.0 - filename =3D re.sub('\(.*$', '', mapp[1]).strip() - if filename =3D=3D '': + library =3D re.sub('\(.*$', '', mapp[1]).strip() + if library =3D=3D '': continue - filename =3D os.path.realpath(filename) + library =3D os.path.realpath(library) linkings.append(soname) - mappings[soname] =3D filename + mappings[soname] =3D library=20 return ( linkings, mappings ) =20 =20 @@ -49,9 +49,9 @@ def get_forward_linkings(): for line in needs: line =3D line.strip() link =3D re.split('\s', line) - elf =3D link[0] - ( linkings, mappings ) =3D get_ldd_linkings(elf) - forward_linkings[elf] =3D linkings=20 + binary =3D link[0] + ( linkings, mappings ) =3D get_ldd_linkings(binary) + forward_linkings[binary] =3D linkings=20 so2filename_mappings.update(mappings) except: continue @@ -61,38 +61,52 @@ def get_forward_linkings(): =20 def invert_linkings( forward_linkings ): reverse_linkings =3D {} - for elf in forward_linkings: - for elf_dep in forward_linkings[elf]: - reverse_linkings[elf_dep] =3D [] + for binary in forward_linkings: + for library in forward_linkings[binary]: + reverse_linkings[library] =3D [] =20 - for elf in forward_linkings: - for elf_dep in forward_linkings[elf]: - reverse_linkings[elf_dep].append(elf) + for binary in forward_linkings: + for library in forward_linkings[binary]: + reverse_linkings[library].append(binary) =20 return reverse_linkings=20 =20 =20 -def print_forward_linkings( forward_linkings, so2filename_mappings ): - missing_elfs =3D [] +def print_forward_linkings( forward_linkings, so2filename_mappings, verb= ose ): + missing_binaries =3D [] missing_links =3D [] - for elf in forward_linkings: + for binary in forward_linkings: + try: - print elf, '(', pax.getflags(elf), ')' + binary_flags =3D pax.getflags(binary) + s =3D "%s ( %s )" % ( binary, binary_flags ) except: - missing_elfs.append(elf) + missing_binaries.append(binary) continue - for elf_dep in forward_linkings[elf]: + + count =3D 0 + for soname in forward_linkings[binary]: try: - filename =3D so2filename_mappings[elf_dep] - flags =3D pax.getflags(filename) - print '\t', elf_dep, '\t', filename, '(', flags, ')' + library =3D so2filename_mappings[soname] + library_flags =3D pax.getflags(library) + s =3D "%s\n\t%s\t%s ( %s )" % ( s, soname, library, library_flags ) + if binary_flags !=3D library_flags: + count =3D count + 1 except: - missing_links.append(elf_dep) + missing_links.append(soname) + + if verbose: + print s + if count =3D=3D 0: + print 'No mismatches' + else: + if count !=3D 0: + print s =20 - missing_elfs =3D set(missing_elfs) + missing_binaries =3D set(missing_binaries) print '\n\n' - print '**** Missing elfs ****' - for m in missing_elfs: + print '**** Missing binaries ****' + for m in missing_binaries: print m =20 missing_links =3D set(missing_links) @@ -104,27 +118,42 @@ def print_forward_linkings( forward_linkings, so2fi= lename_mappings ): print '\n\n' =20 =20 -def print_reverse_linkings( reverse_linkings, so2filename_mappings ): - missing_elfs =3D [] +def print_reverse_linkings( reverse_linkings, so2filename_mappings, verb= ose ): + missing_sonames =3D [] missing_links =3D [] - for elf in reverse_linkings: + + for soname in reverse_linkings: + try: - filename =3D so2filename_mappings[elf] - flags =3D pax.getflags(filename) - print elf, '\t', filename, '(', flags, ')' + library =3D so2filename_mappings[soname] + library_flags =3D pax.getflags(library) + s =3D "%s\t%s ( %s )" % ( soname, library, library_flags ) except: - missing_elfs.append(elf) - for elf_dep in reverse_linkings[elf]: + missing_libraries.append(soname) + continue + + count =3D 0 + for binary in reverse_linkings[soname]: try: - flags =3D pax.getflags(elf_dep) - print '\t', elf_dep, '(', flags, ')' + binary_flags =3D pax.getflags(binary) + s =3D "%s\n\t%s ( %s )" % ( s, binary, binary_flags ) + if library_flags !=3D binary_flags: + count =3D count + 1 except: - missing_links.append(elf_dep) + missing_links.append(binary) =20 - missing_elfs =3D set(missing_elfs) + if verbose: + print s + if count =3D=3D 0: + print 'No mismatches' + else: + if count !=3D 0: + print s + + missing_sonames =3D set(missing_sonames) print '\n\n' - print '**** Missing elfs ****' - for m in missing_elfs: + print '**** Missing sonames ****' + for m in missing_sonames: print m =20 missing_links =3D set(missing_links) @@ -136,29 +165,32 @@ def print_reverse_linkings( reverse_linkings, so2fi= lename_mappings ): print '\n\n' =20 =20 -def usage(): - print 'Package Name : elfix\n' +def run_usage(): + print 'Package Name : elfix' print 'Bug Reports : http://bugs.gentoo.org/' - print 'Program Name : revdep-pax\n' - print 'Description : Get or set pax flags on an ELF object\n\n' - print 'Usage : revdep-pax [-fv] | [-rv] | -v [-b BINARY] | -v [-= s SONAME] | -h\n\n' - print 'Options : -f print out all the forward mappings for= all system binaries\n' - print ' : -r print out all the reverse mappints for= all system sonames\n' - print ' : -b BINARY print all the forward mappings only fo= r BINARY\n' - print ' : -s SONAME print all the reverse mappings only fo= r SONAME\n' - print ' : -v verbose, otherwise just print mismatch= ed pax flags \n' - print ' : -h print out this help\n\n' - - -def run_forward(): + print 'Program Name : revdep-pax' + print 'Description : Get or set pax flags on an ELF object' + print + print 'Usage : revdep-pax [-fv] | [-rv] | -v [-b BINARY] | -v [-= s SONAME] | -h' + print + print 'Options : -f print out all the forward mappings for= all system binaries' + print ' : -r print out all the reverse mappints for= all system sonames' + print ' : -b BINARY print all the forward mappings only fo= r BINARY' + print ' : -s SONAME print all the reverse mappings only fo= r SONAME' + print ' : -v verbose, otherwise just print mismatch= ed pax flags' + print ' : -h print out this help' + print + + +def run_forward(verbose): ( forward_linkings, so2filename_mappings ) =3D get_forward_linkings() - print_forward_linkings( forward_linkings, so2filename_mappings ) + print_forward_linkings( forward_linkings, so2filename_mappings, verbose= ) =20 =20 -def run_reverse(): +def run_reverse(verbose): ( forward_linkings, so2filename_mappings ) =3D get_forward_linkings() reverse_linkings =3D invert_linkings( forward_linkings ) - print_reverse_linkings( reverse_linkings, so2filename_mappings ) + print_reverse_linkings( reverse_linkings, so2filename_mappings, verbose= ) =20 =20 def run_binary(binary, verbose): @@ -170,19 +202,20 @@ def run_binary(binary, verbose): count =3D 0 for soname in linkings: try: - filename =3D mappings[soname] - soname_flags =3D pax.getflags(filename) + library =3D mappings[soname] + library_flags =3D pax.getflags(library) if verbose: - print '\t', soname, '\t', filename, '(', soname_flags, ')' + print '\t', soname, '\t', library, '(', library_flags, ')' else: - if binary_flags !=3D soname_flags: - print '\t', soname, '\t',filename, '(', soname_flags, ')' + if binary_flags !=3D library_flags: + print '\t', soname, '\t', library, '(', library_flags, ')' count =3D count + 1 except: print "file for soname %s not found" % soname =20 if count =3D=3D 0: - print '\nNo mismatches' + print + print 'No mismatches' =20 =20 def run_soname(soname, verbose): @@ -191,17 +224,24 @@ def run_soname(soname, verbose): linkings =3D reverse_linkings[soname] library =3D so2filename_mappings[soname] =20 - flags =3D pax.getflags(library) - if verbose: - print soname, '\t', library, '(', flags, ')' + library_flags =3D pax.getflags(library) + print soname, '\t', library, '(', library_flags, ')' + + count =3D 0 for binary in linkings: try: - flags =3D pax.getflags(binary) + binary_flags =3D pax.getflags(binary) if verbose: - print '\t', binary, '(', flags, ')' + print '\t', binary, '(', binary_flags, ')' + else: + if library_flags !=3D binary_flags: + print '\t', binary, '(', binary_flags, ')' + count =3D count + 1 except: print "cannot obtain pax flags for %s" % binary =20 + if count =3D=3D 0: + print '\nNo mismatches' =20 def main(): try: @@ -242,21 +282,20 @@ def main(): print 'Please file a bug' sys.exit(1) =20 - if do_usage: run_usage() =20 if do_forward: - run_forward() + run_forward(verbose) =20 if do_reverse: - run_reverse() + run_reverse(verbose) =20 if binary !=3D None: run_binary(binary, verbose) =20 if soname !=3DNone: - run_soname(soname) + run_soname(soname, verbose) =20 if __name__ =3D=3D '__main__': main()