summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-04-28 15:37:17 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-04-28 15:37:17 -0400
commitdbb5d111968be2f0c4f7fb012787c67b9bac57f7 (patch)
treebd8aeac759b23c819ffac7cb26f47e2c67a05c1f
parent4723d5f9f17890535b0fc1f14900bfa9927e0c59 (diff)
Deal with different paths to perl when removing -T flag.
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/taint_and_-T.mdwn2
-rwxr-xr-xpm_filter2
3 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 9b308e6b6..9ff8e2d1f 100644
--- 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.
+ * Deal with different paths to perl when removing -T flag.
-- 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 bf5551201..21ef17673 100644
--- 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.
+
+[[done]]
diff --git a/pm_filter b/pm_filter
index a66cf2154..6c745e1f8 100755
--- a/pm_filter
+++ b/pm_filter
@@ -20,7 +20,7 @@ elsif (/^use lib/) {
$_="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}="(.*)";/) {