Support system library directories in dpkg-shlibdeps symlinked from

'/lib/ldconfig'. Closes: #356452

diff --git a/ChangeLog b/ChangeLog
index c7594066b63b9a3c45beb07d9927221b56a4ffc1..3e55728746a5f6067dd2d8d1d434ab1949a2245c 100644 (file)
--- 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 86d3b927332b0016e352e9eb2c2260bf42542e17..7323f6a0bdc3ea7ec5d27fb19dd88ccc7069da9a 100644 (file)
--- 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 202d2088f818fda51761904f032de9a10981a817..b98ea3271ff0b71f358ef11cad4aff3925548e37 100755 (executable)
--- 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> ) {