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

[SCM] Debian package checker branch, master, updated. 2.5.8-15-g8e86233



The following commit has been merged in the master branch:
commit 8e86233dae8328ae66422ab88c2e21e366653dd5
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Jun 14 11:57:36 2012 +0200

    c/files: update the cron filename check
    
    Rename run-parts-cron-filename-contains-full-stop and have it catch
    "+" in the filename as well.  Add reference to policy 9.5.1 in the tag
    description.
    
    There are no overrides according to lintian.d.o, so renaming the tag
    should not cause any breakage.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/files b/checks/files
index 60b346d..f3f24f2 100644
--- a/checks/files
+++ b/checks/files
@@ -319,11 +319,13 @@ foreach my $file ($info->sorted_index) {
     # ---------------- /etc
     if ($file =~ m,^etc/,) {
         # ---------------- /etc/cron.daily, etc.
-        if ($file =~ m,^etc/cron\.(?:daily|hourly|monthly|weekly|d)/[^\.].*\., ) {
-            tag 'run-parts-cron-filename-contains-full-stop', $file;
+        if ($file =~ m,^etc/cron\.(?:daily|hourly|monthly|weekly|d)/[^\.].*[\+\.], ) {
+            # NB: cron ships ".placeholder" files, which shouldn't be run.
+            tag 'run-parts-cron-filename-contains-illegal-char', $file;
         }
         # ---------------- /etc/cron.d
-        elsif ($file =~ m,^etc/cron\.d/\S, and $operm != 0644) {
+        elsif ($file =~ m,^etc/cron\.d/[^\.], and $operm != 0644) {
+            # NB: cron ships ".placeholder" files in etc/cron.d, which we shouldn't tag.
             tag 'bad-permissions-for-etc-cron.d-script', sprintf('%s %04o != 0644',$file,$operm);
         }
         # ---------------- /etc/emacs.*
diff --git a/checks/files.desc b/checks/files.desc
index c58e798..4ad5ee2 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -317,12 +317,14 @@ Info: The symbolic link has needless segments like ".." and "." in the
  will fix this problem for you.
 Ref: policy 10.5
 
-Tag: run-parts-cron-filename-contains-full-stop
+Tag: run-parts-cron-filename-contains-illegal-chars
 Severity: normal
 Certainty: certain
 Info: The script in /etc/cron.&lt;time-interval&gt; will not be executed by
- run-parts(8) because the filename contains a "." (full stop).
-Ref: run-parts(8)
+ run-parts(8) because the filename contains a "." (full stop) or "+" (plus).
+ .
+ It is recommended to use "_" (underscores) instead of these symbols.
+Ref: run-parts(8), policy 9.5.1
 
 Tag: bad-permissions-for-etc-cron.d-script
 Severity: important
diff --git a/debian/changelog b/debian/changelog
index 67dfeb6..51bae8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,21 @@
 lintian (2.5.9) UNRELEASED; urgency=low
 
+  * Summary of tag changes:
+    + Added:
+      - run-parts-cron-filename-contains-illegal-chars
+    + Removed:
+      - run-parts-cron-filename-contains-full-stop
+
   * checks/*:
     + [NT] Migrate to new Lintian::Path API.
   * checks/fields:
     + [NT] Also classify lib*-cli-dev as belonging to the section
       cli-mono (rather than libdevel).  Thanks to Chow Loong Jin
       for the report and the patch.  (Closes: #675358)
+  * checks/files{,.desc}:
+    + [NT] Rename run-parts-cron-filename-contains-full-stop and
+      have it catch "+" in the filename as well.  Add reference
+      to policy 9.5.1 in the  tag description.
   * checks/shared-libs:
     + [NT] Reverse order of two subst expressions to prevent
       dev-pkg-without-shlib-symlink false positives.  Thanks to
diff --git a/t/tests/files-run-parts-cron/desc b/t/tests/files-run-parts-cron/desc
index aefec43..bafbbf4 100644
--- a/t/tests/files-run-parts-cron/desc
+++ b/t/tests/files-run-parts-cron/desc
@@ -3,4 +3,4 @@ Sequence: 6000
 Version: 1.0
 Description: Test for cron scripts with dots in them
 Test-For:
-  run-parts-cron-filename-contains-full-stop
+  run-parts-cron-filename-contains-illegal-chars
diff --git a/t/tests/files-run-parts-cron/tags b/t/tests/files-run-parts-cron/tags
index 5e5212b..eeee7cb 100644
--- a/t/tests/files-run-parts-cron/tags
+++ b/t/tests/files-run-parts-cron/tags
@@ -1 +1 @@
-W: files-run-parts-cron: run-parts-cron-filename-contains-full-stop etc/cron.hourly/cron-script.hourly
+W: files-run-parts-cron: run-parts-cron-filename-contains-illegal-chars etc/cron.hourly/cron-script.hourly
diff --git a/testset/tags.etcfiles b/testset/tags.etcfiles
index 9be3a7d..9f11476 100644
--- a/testset/tags.etcfiles
+++ b/testset/tags.etcfiles
@@ -16,4 +16,4 @@ W: etcfiles: file-missing-in-md5sums etc/improper-link
 W: etcfiles: file-missing-in-md5sums usr/share/doc/etcfiles/changelog
 W: etcfiles: package-contains-hardlink etc/improper -> etc/improper-link
 W: etcfiles: readme-debian-mentions-usr-doc line 2
-W: etcfiles: run-parts-cron-filename-contains-full-stop etc/cron.daily/cronfile-contains.fullstop
+W: etcfiles: run-parts-cron-filename-contains-illegal-chars etc/cron.daily/cronfile-contains.fullstop

-- 
Debian package checker


Reply to: