Author: rra
Date: 2008-03-07 09:59:34 +0100 (Fri, 07 Mar 2008)
New Revision: 1255

Modified:
   trunk/checks/files
   trunk/checks/scripts
   trunk/debian/changelog
   trunk/testset/scripts/debian/rules
Log:
* checks/files:
  + [RA] /etc/init.d/{skeleton,README} don't need to be executable.
  + [RA] *.py files in /usr/{lib,share}, /etc/init.d/skeleton, and *.ex
    files do not need to be executable even if they look like scripts.

Modified: trunk/checks/files
===================================================================
--- trunk/checks/files  2008-03-07 08:37:05 UTC (rev 1254)
+++ trunk/checks/files  2008-03-07 08:59:34 UTC (rev 1255)
@@ -173,7 +173,9 @@
            tag "package-installs-into-etc-gconf-schemas", "$file";
        }
        # ---------------- /etc/init.d
-       elsif ($file =~ m,^etc/init\.d/\S, and $operm != 0755
+       elsif ($file =~ m,^etc/init\.d/\S,
+              and $file !~ m,^etc/init\.d/(README|skeleton)$,
+              and $operm != 0755
               and $perm =~ m/^-/) {
            tag "non-standard-file-permissions-for-etc-init.d-script",
                sprintf("$file %04o != 0755",$operm);

Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts        2008-03-07 08:37:05 UTC (rev 1254)
+++ trunk/checks/scripts        2008-03-07 08:59:34 UTC (rev 1255)
@@ -269,11 +269,14 @@
        unless $is_absolute;
     tag("script-not-executable", $filename)
        unless ($executable{$filename}
-               or $filename =~ m,usr/(lib|share)/.*\.pm,
-               or $filename =~ m,usr/(lib|share)/ruby/.*\.rb,
+               or $filename =~ m,^\./usr/(lib|share)/.*\.pm,
+               or $filename =~ m,^\./usr/(lib|share)/.*\.py,
+               or $filename =~ m,^\./usr/(lib|share)/ruby/.*\.rb,
                or $filename =~ m,\.in$,
-               or $filename =~ m,etc/menu-methods,
-               or $filename =~ m,etc/X11/Xsession.d,);
+               or $filename =~ m,\.ex$,
+               or $filename eq './etc/init.d/skeleton'
+               or $filename =~ m,^\./etc/menu-methods,
+               or $filename =~ m,^\./etc/X11/Xsession.d,);
 
     # Warn about csh scripts.
     tag("csh-considered-harmful", $filename)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-03-07 08:37:05 UTC (rev 1254)
+++ trunk/debian/changelog      2008-03-07 08:59:34 UTC (rev 1255)
@@ -15,8 +15,12 @@
   * checks/etcfiles:
     + [RA] /etc/init.d/{skeleton,rc,rcS} are not conffiles, and README
       files in /etc need not be.
+  * checks/files:
+    + [RA] /etc/init.d/{skeleton,README} don't need to be executable.
   * checks/scripts:
     + [RA] Attempt to quash some Perl warnings.
+    + [RA] *.py files in /usr/{lib,share}, /etc/init.d/skeleton, and *.ex
+      files do not need to be executable even if they look like scripts.
   * checks/shared-libs:
     + [RA] Move the default ld.so search path into data.  Drop obsolete
       /usr/lib/libg++-dbg, /usr/X11R6/lib/Xaw3d, and libc5 compatibility

Modified: trunk/testset/scripts/debian/rules
===================================================================
--- trunk/testset/scripts/debian/rules  2008-03-07 08:37:05 UTC (rev 1254)
+++ trunk/testset/scripts/debian/rules  2008-03-07 08:59:34 UTC (rev 1255)
@@ -48,7 +48,7 @@
        install -m 755 gccbug.dpatch $(tmp)/usr/share/scripts/
        install -m 755 gccbug.dpatch $(tmp)/usr/src/scripts/
 
-       install -m 755 init-skeleton $(tmp)/etc/init.d/skeleton
+       install -m 644 init-skeleton $(tmp)/etc/init.d/skeleton
        install -m 755 init-no-lsb $(tmp)/etc/init.d/no-lsb
        install -m 755 init-lsb-broken $(tmp)/etc/init.d/lsb-broken
        install -m 755 init-lsb-other $(tmp)/etc/init.d/lsb-other


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to