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 <gentoo-commits+bounces-390354-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1RCGZE-00051d-BE
	for garchives@archives.gentoo.org; Fri, 07 Oct 2011 19:58:48 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2D88621C0C9;
	Fri,  7 Oct 2011 19:58:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id DCDD921C0C9
	for <gentoo-commits@lists.gentoo.org>; Fri,  7 Oct 2011 19:58:40 +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 234D11B4018
	for <gentoo-commits@lists.gentoo.org>; Fri,  7 Oct 2011 19:58:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 53A1F80042
	for <gentoo-commits@lists.gentoo.org>; Fri,  7 Oct 2011 19:58:39 +0000 (UTC)
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" <blueness@gentoo.org>
Message-ID: <f7dd2775675d1181bf4d72d625effbffe789dcda.blueness@gentoo>
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: f7dd2775675d1181bf4d72d625effbffe789dcda
Date: Fri,  7 Oct 2011 19:58:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 55449356cfb3c869b2da64d24d93b240

commit:     f7dd2775675d1181bf4d72d625effbffe789dcda
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 19:58:34 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 19:58:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/elfix.git;a=3D=
commit;h=3Df7dd2775

scripts/revdep-pax: use ldd instead of ldconfig to get so2filename mappin=
gs

---
 scripts/revdep-pax |  130 +++++++++++++++++++++++++++++++---------------=
-----
 1 files changed, 79 insertions(+), 51 deletions(-)

diff --git a/scripts/revdep-pax b/scripts/revdep-pax
index 1a5a2bb..48b11d4 100755
--- a/scripts/revdep-pax
+++ b/scripts/revdep-pax
@@ -7,27 +7,34 @@ import pax
=20
 def get_ldd_linkings(elf):
 	try:
-		ldd_output =3D subprocess.check_output(["/usr/bin/ldd", elf])
+		#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)
 	except:
 		return []
 	ldd_lines =3D ldd_output.split('\n')
 	linkings =3D []
+	mappings =3D []
 	for m in range(0,len(ldd_lines)):
 		if not re.search('=3D>', ldd_lines[m]):
 			continue
 		ldd_lines[m] =3D ldd_lines[m].strip()
 		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 '':
 			continue
-		filename =3D  os.path.realpath(filename)
+		filename =3D os.path.realpath(filename)
 		linkings.append(soname)
-	return linkings
+		mappings.append([soname,filename])
+	return ( linkings, mappings )
+
=20
 def get_forward_linkings():
+	""" I'm still not sure we wan to use /var/db/pkg vs some path of binari=
es """
 	var_db_pkg =3D '/var/db/pkg'
 	forward_linkings =3D {}
+	so2filename_mappings =3D {}
 	for cat in os.listdir(var_db_pkg):
 		catdir =3D '%s/%s' % (var_db_pkg, cat)
 		for pkg in os.listdir(catdir):
@@ -40,13 +47,14 @@ def get_forward_linkings():
 					line =3D line.strip()
 					link =3D re.split('\s', line)
 					elf =3D link[0]
-					linkings =3D get_ldd_linkings(elf)
-					#linkings =3D re.split(',', link[1]) #this uses NEEDS to determine =
linkage
+					( linkings, mappings ) =3D get_ldd_linkings(elf)
 					forward_linkings[elf] =3D linkings=20
+					for m in mappings:
+						so2filename_mappings[m[0]] =3D m[1]
 			except:
 				break
=20
-	return forward_linkings=20
+	return ( forward_linkings, so2filename_mappings )
=20
=20
 def invert_linkings( forward_linkings ):
@@ -62,56 +70,76 @@ def invert_linkings( forward_linkings ):
 	return reverse_linkings=20
=20
=20
-def get_soname2file_mappings():
-	ldconfig_output =3D subprocess.check_output(["/sbin/ldconfig", "-p"])
-	ldconfig_lines =3D ldconfig_output.split('\n')
-	ldconfig_lines.pop(0)			#first line is a header
-	ldconfig_lines.pop()			#last line empty because of previous split
-	mappings =3D {}
-	for m in range(0,len(ldconfig_lines)):
-		ldconfig_lines[m] =3D ldconfig_lines[m].strip()
-		mapp =3D re.split('=3D>', ldconfig_lines[m] )
-		soname =3D re.sub('\(.*$', '', mapp[0]).strip()
-		abi =3D re.search('\(.+\)', mapp[0]).group(0)
-		abi =3D abi.strip().strip('(').strip(')').strip()
-		filename =3D mapp[1].strip()
-		filename =3D  os.path.realpath(filename)
-		mappings[soname] =3D [ filename, pax.getflags(filename), abi ]
-	return mappings=20
-
-forward_linkings =3D get_forward_linkings()
-reverse_linkings =3D invert_linkings( forward_linkings )
-soname2file_mappings =3D get_soname2file_mappings()
+def print_forward_linkings( forward_linkings ):
+	missing_elfs =3D []
+	missing_links =3D []
+	for elf in forward_linkings:
+		try:
+			print elf, '(',  pax.getflags(elf), ')'
+		except:
+			missing_elfs.append(elf)
+			continue
+		for elf_dep in forward_linkings[elf]:
+			try:
+				filename =3D so2filename_mappings[elf_dep]
+				flags =3D pax.getflags(filename)
+				print '\t', elf_dep, '\t', filename, '(', flags, ')'
+			except:
+				missing_links.append(elf_dep)
+
+
+	missing_elfs =3D set(missing_elfs)
+	print '\n\n'
+	print '**** Missing elfs ****'
+	for m in missing_elfs:
+		print m
+
+	missing_links =3D set(missing_links)
+	print '\n\n'
+	print '**** Missing forward linkings ****'
+	for m in missing_links:
+		print m
+
+	print '\n\n'
+
+
+def print_reverse_linkings( reverse_linkings ):
+	missing_elfs =3D []
+	missing_links =3D []
+	for elf in reverse_linkings:
+		try:
+			filename =3D so2filename_mappings[elf]
+			flags =3D pax.getflags(filename)
+			print elf, '\t', filename, '(', flags, ')'
+		except:
+			missing_elfs.append(elf)
+		for elf_dep in reverse_linkings[elf]:
+			try:
+				flags =3D pax.getflags(elf_dep)
+				print '\t', elf_dep, '(', flags, ')'
+			except:
+				missing_links.append(elf_dep)
=20
+	missing_elfs =3D set(missing_elfs)
+	print '\n\n'
+	print '**** Missing elfs ****'
+	for m in missing_elfs:
+		print m
=20
-""" Print out mapping: binary -> library, library, library ... """
-unmapped =3D []
-for elf in forward_linkings:
-	print elf
-	for elf_dep in forward_linkings[elf]:
-		print "\t", elf_dep
-		#try:
-		#	print "\t\t", soname2file_mappings[elf_dep]
-		#except:
-		#	unmapped.append(elf_dep)
-		#	print "%s doesn't have a mapping" % elf_dep
+	missing_links =3D set(missing_links)
+	print '\n\n'
+	print '**** Missing reverse linkings ****'
+	for m in missing_links:
+		print m
=20
-raw_input()
+	print '\n\n'
=20
-print unmapped
=20
-raw_input()
+( forward_linkings, so2filename_mappings ) =3D get_forward_linkings()
+reverse_linkings =3D invert_linkings( forward_linkings )
+
+print_forward_linkings( forward_linkings )
+#print_reverse_linkings( reverse_linkings )
=20
=20
-""" Print out mapping: library -> binary, binary, binary ...
-for elf_dep in reverse_linkings:
-	print elf_dep
-	for elf in reverse_linkings[elf_dep]:
-		print "\t", elf
-		#if not path.exists(elf):
-		#	print "%s doesn't exist!" % elf
-raw_input()
=20
-for s in soname2file_mappings:
-	print s, soname2file_mappings[s]
-"""