From: Joey Hess <joey@kitenet.net>
Date: Mon, 28 Apr 2008 15:07:05 +0000 (-0400)
Subject: web commit by JeremyReed: hard-coded perl path
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4e0f75a75f3019a7a8f01c94b4e82072e9890c32

web commit by JeremyReed: hard-coded perl path
---

diff --git a/doc/bugs/taint_and_-T.mdwn b/doc/bugs/taint_and_-T.mdwn
index 678d93177..b3d2486e4 100644
--- a/doc/bugs/taint_and_-T.mdwn
+++ b/doc/bugs/taint_and_-T.mdwn
@@ -6,3 +6,18 @@ line 1.
 
 > pm_filter removes the -T from ikiwiki.in when generating ikiwiki.out
 > unless NOTAINT=0 is set. I cannot reproduce your problem. --[[Joey]]
+
+>> Thanks. Now I see. NetBSD and DragonFly and several other systems don't have /usr/bin/perl so that path is replaced in the sh-bang lines of various scripts. So it doesn't match in the pm_filter expression. Can you please consider providing a variable or not matching on that assumed path to perl.
+
+    --- pm_filter.orig      2008-04-28 07:59:58 -0700
+    +++ pm_filter   2008-04-28 08:01:21 -0700
+    @@ -20,6 +20,6 @@
+                    $_="use lib '$libdir';\n";
+            }
+     }
+    -elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!/usr/bin/perl) -T$}) {
+    +elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!.*) -T$}) {
+            $_=qq{$1\n};
+     }
+
+>> --[[JeremyReed]]