* ikiwiki-mass-rebuild: Patch from HenrikBrixAndersen to fix order
* ikiwiki-mass-rebuild: Don't clear PATH from the environment.master
parent
11968615df
commit
1e1e1f5046
|
@ -18,8 +18,9 @@ ikiwiki (2.11) UNRELEASED; urgency=low
|
||||||
* Also fixed some places in inline that failed to use destpage correctly.
|
* Also fixed some places in inline that failed to use destpage correctly.
|
||||||
* ikiwiki-mass-rebuild: Patch from HenrikBrixAndersen to fix order
|
* ikiwiki-mass-rebuild: Patch from HenrikBrixAndersen to fix order
|
||||||
of permissions dropping code to work on FreeBSD.
|
of permissions dropping code to work on FreeBSD.
|
||||||
|
* ikiwiki-mass-rebuild: Don't clear PATH from the environment.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Thu, 25 Oct 2007 07:52:43 -0400
|
-- Joey Hess <joeyh@debian.org> Thu, 25 Oct 2007 23:11:13 -0400
|
||||||
|
|
||||||
ikiwiki (2.10) unstable; urgency=low
|
ikiwiki (2.10) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,8 @@ The solution is to set the effective UID after setting the real UID, and to set
|
||||||
|
|
||||||
> > It doesn't - it needs to be set. The line with `%ENV=();` clears the environment, thus no `$PATH` is set. --[[HenrikBrixAndersen]]
|
> > It doesn't - it needs to be set. The line with `%ENV=();` clears the environment, thus no `$PATH` is set. --[[HenrikBrixAndersen]]
|
||||||
|
|
||||||
|
> > > I guess it shouldn't clear it then. Both [[done]] --[[Joey]]
|
||||||
|
|
||||||
Proposed patch:
|
Proposed patch:
|
||||||
|
|
||||||
--- ikiwiki-mass-rebuild.orig 2007-08-15 22:21:59.000000000 +0200
|
--- ikiwiki-mass-rebuild.orig 2007-08-15 22:21:59.000000000 +0200
|
||||||
|
|
|
@ -27,8 +27,10 @@ sub processline {
|
||||||
if ($< != $uuid || $> != $uuid || $( != $ugid || $) ne "$ugid $ugid") {
|
if ($< != $uuid || $> != $uuid || $( != $ugid || $) ne "$ugid $ugid") {
|
||||||
die "failed to drop permissions to $user";
|
die "failed to drop permissions to $user";
|
||||||
}
|
}
|
||||||
%ENV=();
|
%ENV=(
|
||||||
$ENV{HOME}=(getpwnam($user))[7];
|
PATH => $ENV{PATH},
|
||||||
|
HOME => (getpwnam($user))[7],
|
||||||
|
);
|
||||||
exec("ikiwiki", "-setup", $setup, @ARGV);
|
exec("ikiwiki", "-setup", $setup, @ARGV);
|
||||||
die "failed to run ikiwiki: $!";
|
die "failed to run ikiwiki: $!";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue