[SCM] Debian package checker branch, master, updated. 2.2.10-86-g6da1332
The following commit has been merged in the master branch:
commit 6da1332d68652734c97e304251ff835d7f758bd7
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Thu Jun 4 22:01:35 2009 +0100
Warn about non "*.conf" files in /etc/modprobe.d
* checks/files{,.desc}:
+ [ADB] Check for files in /etc/modprobe.d with filenames which do not
end in ".conf". Based on a patch by Raphael Geissert.
(Closes: #521595)
diff --git a/checks/files b/checks/files
index e69076c..96a0b5f 100644
--- a/checks/files
+++ b/checks/files
@@ -245,6 +245,10 @@ foreach my $file (sort keys %{$info->index}) {
tag "non-standard-file-permissions-for-etc-init.d-script",
sprintf("$file %04o != 0755",$operm);
}
+ #----------------- /etc/modprobe.d
+ elsif ($file =~ m,^etc/modprobe\.d/(.+)$, and $1 !~ m,\.conf$, and $index_info->{type} !~ m/^d/) {
+ tag "non-conf-file-in-modprobe.d", $file;
+ }
#----------------- /etc/pam.conf
elsif ($file =~ m,^etc/pam.conf, and $pkg ne "libpam-runtime" ) {
tag "config-file-reserved", "$file by libpam-runtime";
diff --git a/checks/files.desc b/checks/files.desc
index 8b42559..e1c36d6 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -977,3 +977,16 @@ Severity: serious
Certainty: possible
Info: The given Flash file has a filename which suggests that it may be
one of a number of known Flash files with non-free content.
+
+Tag: non-conf-file-in-modprobe.d
+Severity: important
+Certainty: certain
+Ref: http://lists.debian.org/debian-devel/2009/03/msg00119.html
+Info: Files in <tt>/etc/modprobe.d</tt> should use filenames ending in
+ <tt>.conf</tt>. modprobe currently warns about files which do not match
+ this convention and at some point in the future the files will no longer
+ be processed.
+ .
+ If the file is an example containing only comments, consider installing
+ it in another location as files in <tt>/etc/modprobe.d</tt> are
+ read each time modprobe is run (which is often at boot time).
diff --git a/debian/changelog b/debian/changelog
index 1d3eaa5..0caffcc 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ lintian (2.2.11) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
- missing-comma-between-items
+ - non-conf-file-in-modprobe.d
- non-free-flash
- section-area-mismatch
+ Removed:
@@ -55,6 +56,9 @@ lintian (2.2.11) UNRELEASED; urgency=low
+ [ADB] Add a new tag indicating that the filename of a Flash file
it may be a known non-free file. Patch by Raphael Geissert.
(Closes: #516250)
+ + [ADB] Check for files in /etc/modprobe.d with filenames which do not
+ end in ".conf". Based on a patch by Raphael Geissert.
+ (Closes: #521595)
* checks/manpages:
+ [ADB] Remove support for detecting whether man supports the --warnings
flag. The version of man shipped in lenny supports it so the
diff --git a/t/tests/files-general/debian/debian/install b/t/tests/files-general/debian/debian/install
index a250062..37f6343 100644
--- a/t/tests/files-general/debian/debian/install
+++ b/t/tests/files-general/debian/debian/install
@@ -1,3 +1,4 @@
lintian-16x16.png usr/share/apps/lintian/icons/hicolor/22x22
lintian-22x22.png usr/share/apps/lintian/icons/hicolor/22x22
---lzma usr/share/doc/lintian
+--lzma etc/modprobe.d
+lintian.conf etc/modprobe.d
diff --git a/t/tests/files-general/debian/lintian.conf b/t/tests/files-general/debian/lintian.conf
new file mode 100644
index 0000000..7f6693c
--- /dev/null
+++ b/t/tests/files-general/debian/lintian.conf
@@ -0,0 +1 @@
+Test file which should not be flagged by the modprobe.d checks
diff --git a/t/tests/files-general/desc b/t/tests/files-general/desc
index 90dce6c..4539d78 100644
--- a/t/tests/files-general/desc
+++ b/t/tests/files-general/desc
@@ -6,3 +6,4 @@ Test-For:
dir-or-file-in-var-lock
dir-or-file-in-var-run
icon-size-and-directory-name-mismatch
+ non-conf-file-in-modprobe.d
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index 677feae..d72c75b 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -1,3 +1,4 @@
E: files-general: dir-or-file-in-var-lock var/lock/lintian/
E: files-general: dir-or-file-in-var-run var/run/lintian/
+E: files-general: non-conf-file-in-modprobe.d etc/modprobe.d/--lzma
W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/22x22/lintian-16x16.png 16x16
--
Debian package checker
Reply to: