From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 28 Apr 2008 19:37:17 +0000 (-0400)
Subject: Deal with different paths to perl when removing -T flag.
X-Git-Tag: 2.45~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dbb5d111968be2f0c4f7fb012787c67b9bac57f7;p=ikiwiki.git

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

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}="(.*)";/) {