From: Lafayette Chamber Singers Webmaster <webmaster@lafayettechambersingers.org>
Date: Sun, 14 Sep 2014 16:12:09 +0000 (-0400)
Subject: Installing ikiwiki on a shared-hosting server, there may be no access to
X-Git-Tag: debian/3.20120629.2+deb7u2~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/be4668c873029fdeed6ecb78f7c662e85e5e6872

Installing ikiwiki on a shared-hosting server, there may be no access to
install prerequisite Perl modules in the systemwide locations. They may
have to be installed under the home directory, such as by using local::lib
(which is how the cPanel Perl-module installer works, on systems that use it).

For that to work, the local::lib-defined value for PERL5LIB must be in
the environment when Perl starts up. The former way %config{ENV} was handled
was too late, depending on the Perl code to unpack it from the storable and
put it into the environment.

Easy solution is to build the wrapper to repopulate the environment based on
%config{ENV} before ever exec'ing Perl (and then remove it from the storable
as there is nothing more that the Perl code will need to do with it).
---

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 769540d29..9e5457718 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -51,6 +51,7 @@ sub gen_wrapper () {
 		       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
 		       HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
 		       REDIRECT_URL} if $config{cgi};
+	my $envsize=$#envsave;
 	my $envsave="";
 	foreach my $var (@envsave) {
 		$envsave.=<<"EOF";
@@ -58,6 +59,17 @@ sub gen_wrapper () {
 		addenv("$var", s);
 EOF
 	}
+	if (ref $config{ENV} eq 'HASH') {
+		foreach my $key (keys %{$config{ENV}}) {
+			my $val=$config{ENV}{$key};
+			$val =~ s/([\\"])/\\$1/g;
+			$envsize += 1;
+			$envsave.=<<"EOF";
+	addenv("$key", "$val");
+EOF
+		}
+		delete $config{ENV};
+	}
 	
 	my @wrapper_hooks;
 	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
@@ -129,7 +141,7 @@ EOF
 #include <sys/file.h>
 
 extern char **environ;
-char *newenviron[$#envsave+7];
+char *newenviron[$envsize+7];
 int i=0;
 
 void addenv(char *var, char *val) {