lintian: r1109 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2008-01-04 07:03:51 +0100 (Fri, 04 Jan 2008)
New Revision: 1109

Modified:
   trunk/checks/binaries
   trunk/checks/shared-libs
   trunk/debian/changelog
Log:
  + [RA] Exclude nsswitch modules from multiple SONAME and package
    naming checks.
  + [RA] Exclude nsswitch modules from shlibs file checks.

Modified: trunk/checks/binaries
===================================================================
--- trunk/checks/binaries	2008-01-04 05:34:30 UTC (rev 1108)
+++ trunk/checks/binaries	2008-01-04 06:03:51 UTC (rev 1109)
@@ -118,16 +118,18 @@
 }
 close(IN);
 
-# For the package naming check, filter out SONAMEs where all the files are
-# at paths other than /lib, /usr/lib, or /usr/X11R6/lib.  This avoids false
-# positives with plugins like Apache modules, which may have their own
-# SONAMEs but which don't matter for the purposes of this check.
+# For the package naming check, filter out SONAMEs where all the files are at
+# paths other than /lib, /usr/lib, or /usr/X11R6/lib.  This avoids false
+# positives with plugins like Apache modules, which may have their own SONAMEs
+# but which don't matter for the purposes of this check.  Also filter out
+# nsswitch modules
 sub lib_soname_path {
     my (@paths) = @_;
     foreach my $path (@paths) {
 	return 1 if $path =~ m%^(\.?/)?lib/[^/]+$%;
 	return 1 if $path =~ m%^(\.?/)?usr/lib/[^/]+$%;
 	return 1 if $path =~ m%^(\.?/)?usr/X11R6/lib/[^/]+$%;
+	return 1 if $path =~ m%^(\.?/)?lib/libnss_[^.]+\.so(\.[0-9]+)$%;
     }
     return 0;
 }

Modified: trunk/checks/shared-libs
===================================================================
--- trunk/checks/shared-libs	2008-01-04 05:34:30 UTC (rev 1108)
+++ trunk/checks/shared-libs	2008-01-04 06:03:51 UTC (rev 1109)
@@ -94,7 +94,8 @@
     next if m/^\s*$/o;
 
     if (m/^-- (\S+)\s*$/o) {
-	$file = $1; $file =~ s,^(\./)?,,;
+	$file = $1;
+	$file =~ s,^(\./)?,,;
     } elsif (m/^\s*SONAME\s+(\S+)/o) {
 	$SONAME{$file} = $1;
     } elsif (m/^\s*TEXTREL\s/o) {
@@ -297,7 +298,7 @@
     close VERSION;
     chomp $version;
 }
-@shlibs = keys %SONAME;
+@shlibs = grep { !m,^lib/libnss_[^.]+\.so(\.[0-9]+)$, } keys %SONAME;
 if ($#shlibs == -1) {
     # no shared libraries included in package, thus shlibs control file should
     # not be present

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-04 05:34:30 UTC (rev 1108)
+++ trunk/debian/changelog	2008-01-04 06:03:51 UTC (rev 1109)
@@ -5,6 +5,8 @@
       don't warn about unstripped binaries in ../lib/debug as well.
     + [RA] Allow rpath pointing to /usr/lib/games/<package>.  Thanks, Bas
       Wijnen.  (Closes: #456318)
+    + [RA] Exclude nsswitch modules from multiple SONAME and package
+      naming checks.
   * checks/changelog-file{.desc,}:
     + [RA] Don't spell-check lines that include the word "spelling".
       Thanks, Andreas Hoenen.  (Closes: #456515)
@@ -64,6 +66,7 @@
   * checks/shared-libs{.desc,}:
     + [RA] New check for version numbers in symbol files.  Based on a
       patch from Raphael Hertzog.  (Closes: #457067)
+    + [RA] Exclude nsswitch modules from shlibs file checks.
 
   * debian/control:
     + [RA] Suggest libtext-template-perl, needed for HTML reporting.