[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.14-54-g58870f9



The following commit has been merged in the master branch:
commit 58870f9b2dadc0ed9ec1e4691d2149cffc0be482
Author: Russ Allbery <rra@debian.org>
Date:   Sun Sep 13 22:08:14 2009 -0700

    Add some special cases for libc
    
    * checks/binaries
      + [RA] Allow ldconfig to be statically linked.
    * checks/shared-libs:
      + [RA] Allow ld.so to be executable.  (Closes: #538716)

diff --git a/checks/binaries b/checks/binaries
index 1b3e60d..2178d9b 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -311,12 +311,14 @@ foreach my $file (sort keys %{$info->file_info}) {
 	    # Some exceptions: files in /boot, /usr/lib/debug/*, named *-static or
 	    # *.static, or *-static as package-name.
 	    next if ($file =~ m%^./boot/%);
+	    next if ($file =~ /(?:\.|-)static$/);
+	    next if ($pkg =~ /-static$/);
 	    # klibc binaries appear to be static.
 	    next if ($objdump->{KLIBC});
-	    # Location of debugging symbols:
+	    # Location of debugging symbols.
 	    next if ($file =~ m%^./usr/lib/debug/%);
-	    next if ($file =~ /(?:\.|-)static$/);
-	    next if ($pkg =~ /-static$/);
+	    # ldconfig must be static.
+	    next if ($file eq './sbin/ldconfig');
 	    tag "statically-linked-binary", "$file";
 	}
     } else {
diff --git a/checks/shared-libs b/checks/shared-libs
index 88511b9..7418f9e 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -110,18 +110,21 @@ for my $cur_file (sort keys %{$info->index}) {
 	    tag "shlib-calls-exit", "$cur_file";
 	}
 
-        # don't apply the permission checks to links
-        # since this only results in doubled messages
-        if ($cur_file eq $real_file) { 
+        # Don't apply the permission checks to links since this only results
+        # in doubled messages.
+        if ($cur_file eq $real_file) {
             # executable?
+	    my $perms = sprintf("%04o", $real_perm);
             if ($real_perm & 0100 or $real_perm & 010 or $real_perm & 01) {
-                # yes.  But if the library has an INTERP section, it's designed
-                # to do something useful when executed, so don't report an error.
-                tag "shlib-with-executable-bit", $cur_file, sprintf("%04o", $real_perm)
-                    unless $objdump->{$real_file}->{INTERP};
+                # Yes.  But if the library has an INTERP section, it's
+                # designed to do something useful when executed, so don't
+                # report an error.  Also give ld.so a pass, since it's
+                # special.
+                tag "shlib-with-executable-bit", $cur_file, $perms
+                    unless ($objdump->{$real_file}->{INTERP}
+			    or $real_file =~ m,^lib(|32|64)/ld-[\d.]+\.so$,);
             } elsif ($real_perm != 0644) {
-                # bad permissions
-                tag "shlib-with-bad-permissions", $cur_file, sprintf("%04o", $real_perm);
+                tag "shlib-with-bad-permissions", $cur_file, $perms;
             }
         }
 
diff --git a/debian/changelog b/debian/changelog
index 1c44dbd..3d8bb14 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ lintian (2.2.15) UNRELEASED; urgency=low
   * checks/binaries{,.desc}:
     + [RA] Add a new check for OCaml bytecode executables.  Patch from
       Stéphane Glondu.  (Closes: #498138)
+    + [RA] Allow ldconfig to be statically linked.
   * checks/changelog-file:
     + [RA] Don't warn about a symlinked changelog file if the version
       contains ubuntu.  Thanks, Benjamin Drung.  (Closes: #536434)
@@ -103,6 +104,8 @@ lintian (2.2.15) UNRELEASED; urgency=low
       (Closes: #543873)
     + [RA] Add seed.  Thanks, Josselin Mouette.  (Closes: #543779)
     + [RA] Add pike 7.8.  Thanks, Magnus Holmgren.  (Closes: #543262)
+  * checks/shared-libs:
+    + [RA] Allow ld.so to be executable.  (Closes: #538716)
 
   * data/fields/essential:
     + [RA] New list of essential packages.

-- 
Debian package checker


Reply to: