From: Guillem Jover <guillem@debian.org>
Date: Sun, 9 Apr 2006 19:31:47 +0000 (+0000)
Subject: Support system library directories in dpkg-shlibdeps symlinked from
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7f4a5fc8a5c939d3b73f20ef3f4a919b7239406;p=dpkg

Support system library directories in dpkg-shlibdeps symlinked from
'/lib/ldconfig'. Closes: #356452
---

diff --git a/ChangeLog b/ChangeLog
index c7594066..3e557287 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-04-04   Branden Robinson  <branden@debian.org>,
+2006-04-09  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-shlibdeps.pl: Support system library directories
+	symlinked from '/lib/ldconfig/'.
+
+2006-04-09   Branden Robinson  <branden@debian.org>,
 	     Guillem Jover  <guillem@debian.org>
 
 	* src/main.c (execbackend): Pass '--admindir' over to dpkg-query
diff --git a/debian/changelog b/debian/changelog
index 86d3b927..7323f6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ dpkg (1.13.18~) UNRELEASED; urgency=low
   * Pass '--admindir' option over to dpkg-query when passing '--admindir' or
     '--root' to dpkg (initial patch by Branden Robinson).
     Closes: #153305, #271041, #282853, #307715, #355915
+  * Support system library directories in dpkg-shlibdeps symlinked from
+    '/lib/ldconfig'. Closes: #356452
 
   [ Christian Perrier ]
   * 
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 202d2088..b98ea327 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -117,6 +117,23 @@ if ($ENV{LD_LIBRARY_PATH}) {
     }
 }
 
+# Support system library directories.
+my $ldconfigdir = '/lib/ldconfig';
+if (opendir(DIR, $ldconfigdir)) {
+    my @dirents = readdir(DIR);
+    closedir(DIR);
+
+    for (@dirents) {
+	next if /^\./;
+	my $d = `readlink -f $ldconfigdir/$_`;
+	chomp $d;
+	unless (exists $librarypaths{$d}) {
+	    $librarypaths{$d} = 'ldconfig';
+	    push @librarypaths, $d;
+	}
+    }
+}
+
 open CONF, '</etc/ld.so.conf' or
     warn( "couldn't open /etc/ld.so.conf: $!" );
 while( <CONF> ) {