Deal with different paths to perl when removing -T flag.

diff --git a/debian/changelog b/debian/changelog
index 9b308e6b69e23931c19bfbf20469684b9960e2ef..9ff8e2d1fb2b92bcfd64d15366c74bacbc073a2f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (2.45) UNRELEASED; urgency=low
     time. This allows the toc to be displayed when previewing an edit. It also
     avoids headers in the page template from showing up in the toc.
   * Add PREFIX/bin to the hardcoded PATH within ikiwiki.
     time. This allows the toc to be displayed when previewing an edit. It also
     avoids headers in the page template from showing up in the toc.
   * Add PREFIX/bin to the hardcoded PATH within ikiwiki.

+  * Deal with different paths to perl when removing -T flag.

 
  -- Joey Hess <joeyh@debian.org>  Sat, 26 Apr 2008 15:09:36 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Sat, 26 Apr 2008 15:09:36 -0400
 

diff --git a/doc/bugs/taint_and_-T.mdwn b/doc/bugs/taint_and_-T.mdwn
index bf5551201ce1a3a1fae5c2a3fbb2add6bb0f913a..21ef17673a05132bb7f1fec015e60fe7c15bf367 100644 (file)
--- a/doc/bugs/taint_and_-T.mdwn
+++ b/doc/bugs/taint_and_-T.mdwn
@@ -26,3 +26,5 @@ line 1.
 >> over-broad. --[[Joey]]
 
 >>> Yes, being more precise should be fine. Note that some may have bin/perl5 or bin/perl5.8.8 for example, so please consider optional number, like ^(#!/.*/perl[0-9]*.*) -T$ or something like that.
 >> over-broad. --[[Joey]]
 
 >>> Yes, being more precise should be fine. Note that some may have bin/perl5 or bin/perl5.8.8 for example, so please consider optional number, like ^(#!/.*/perl[0-9]*.*) -T$ or something like that.

+
+[[done]]

diff --git a/pm_filter b/pm_filter
index a66cf215470f330f7bf9fb7c7b1a808472fea206..6c745e1f8c007e5a2a0d38c46c367b27cfa1aeed 100755 (executable)
--- a/pm_filter
+++ b/pm_filter
@@ -20,7 +20,7 @@ elsif (/^use lib/) {
                $_="use lib '$libdir';\n";
        }
 }
                $_="use lib '$libdir';\n";
        }
 }

-elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!/usr/bin/perl) -T$}) {
+elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!.*perl.*?) -T$}) {

        $_=qq{$1\n};
 }
 if (/^\$ENV{PATH}="(.*)";/) {
        $_=qq{$1\n};
 }
 if (/^\$ENV{PATH}="(.*)";/) {