[SCM] Debian package checker branch, master, updated. 2.2.14-4-g04ab26c

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 04ab26c900d5e24a6f7c2a68f67cc825f23a3229
Author: Russ Allbery <rra@debian.org>
Date:   Thu Aug 27 23:24:39 2009 -0700

    Suppress some directory and permission tags for base-files
    
    * checks/files:
      + [RA] Suppress non-standard-dir-perm for /tmp, /var/tmp, /var/local,
        /var/lock, and /usr/src if they have their normal owner and
        permissions.  This suppresses some Lintian tags for base-files.
      + [RA] Allow base-files to ship /var/backups and /var/local.

diff --git a/checks/files b/checks/files
index 22ea1b8..2456782 100644
--- a/checks/files
+++ b/checks/files
@@ -500,6 +500,10 @@ foreach my $file (sort keys %{$info->index}) {
 	if ( $file =~ m,^var/(?:adm|catman|named|nis|preserve)/, ) {
 	    tag "FSSTND-dir-in-var", "$file";
 	}
+	# base-files is special
+	elsif ($pkg eq 'base-files' && $file =~ m,^var/(?:backups|local)/,) {
+	    # ignore
+	}
 	# FHS dirs with exception in Debian policy
 	elsif ( $file !~ m,^var/(?:account|lib|cache|crash|games|lock|log|opt|run|spool|state|tmp|www|yp)/,) {
 	    tag "non-standard-dir-in-var", "$file";
@@ -887,9 +891,22 @@ foreach my $file (sort keys %{$info->index}) {
 	# special cases first:
         # game directory with setgid bit
 	if ($file =~ m,var/(?:lib/)?games/\S+, and $operm == 02775
-            and $owner =~ m,root/games,) {
+            and $owner eq 'root/games') {
             # do nothing, this is allowed, but not mandatory
         }
+	elsif (($file eq 'tmp/' or $file eq 'var/tmp/'
+		or $file eq 'var/lock/')
+	       and $operm == 01777 and $owner eq 'root/root') {
+	    # actually shipping files here is warned about elsewhere
+	}
+	elsif ($file eq 'usr/src/' and $operm == 02775
+	       and $owner eq 'root/src') {
+	    # /usr/src as created by base-files is a special exception
+	}
+	elsif ($file eq 'var/local/' and $operm == 02775
+	       and $owner eq 'root/staff') {
+	    # actually shipping files here is warned about elsewhere
+	}
 	# otherwise, complain if it's not 0755.
 	elsif ($operm != 0755) {
 	    tag "non-standard-dir-perm", $file,
diff --git a/debian/changelog b/debian/changelog
index e5d3585..a0df0a0 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ lintian (2.2.15) UNRELEASED; urgency=low
     + [RA] Exclude base-files from the needlesly-depends-on-awk tag
       and from the warning about depending on a virtual package without
       a real package for the awk virtual package.
+  * checks/files:
+    + [RA] Suppress non-standard-dir-perm for /tmp, /var/tmp, /var/local,
+      /var/lock, and /usr/src if they have their normal owner and
+      permissions.  This suppresses some Lintian tags for base-files.
+    + [RA] Allow base-files to ship /var/backups and /var/local.
   * checks/manpages:
     + [ADB] Add HTTPS to the list of recognised protocols for URLs in manpages
       which should not cause manpage-has-errors-from-man to be emitted.

-- 
Debian package checker