r454: * dh_makeshlibs: don't follow links to .so files. Instead, we will look

     for *.so* files. This should work for the variously broken db3,
     liballeg, and it will fix the problem with console-tools-dev, which
     contained (arguably broken) absolute symlinks to real files, which were
     followed. Closes: #85483

diff --git a/debian/changelog b/debian/changelog
index 686bb497cf34bf58834b9f1faf445c590a62e9bb..062d2c59d6ff22fef58660f43bb069a50dd63e61 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debhelper (3.0.11) unstable; urgency=low
+
+  * dh_makeshlibs: don't follow links to .so files. Instead, we will look
+    for *.so* files. This should work for the variously broken db3,
+    liballeg, and it will fix the problem with console-tools-dev, which
+    contained (arguably broken) absolute symlinks to real files, which were
+    followed. Closes: #85483
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 14 Mar 2001 14:55:58 -0800
+
 debhelper (3.0.10) unstable; urgency=medium
 
   * Fixed broken -e #SCRIPT# tests in init script start/stop/restart code.

diff --git a/dh_makeshlibs b/dh_makeshlibs
index fe31f5ff7319743df5b8b3dff84aa8c81654e0fd..e80066887583a6a4370413cf52353f29884675b2 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -82,7 +82,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
        doit("rm", "-f", "$tmp/DEBIAN/shlibs");
 
-       open (FIND, "find $tmp -xtype f -name '*.so*' |");
+       # So, we look for files or links to existing files with names that
+       # match "*.so*". Matching *.so.* is not good enough because of
+       # broken crap like db3. And we only look at real files not
+       # symlinks, so we don't accidentually add shlibs data to -dev
+       # packages. This may have a few false positives, which is ok,
+       # because only if we can get a library name and a major number from
+       # objdump is anything actually added.
+       open (FIND, "find $tmp -type f -name '*.so*' |");
        while (<FIND>) {
                my ($library, $major) = 
                        `objdump -p $_` =~ m/\s+SONAME\s+(.+)\.so\.(.+)/;