releasing version 2.31.1

[git.ikiwiki.info.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 558cdb1cca8c53415358b572664b9a0cca8dad1d..90a4c46c79141419c872e2f64102658f41dcefda 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 use Cwd q{abs_path};
 use warnings;
 use strict;
 use Cwd q{abs_path};

-use Data::Dumper;
+use Data::Dumper ;

 use IkiWiki;
 
 package IkiWiki;
 use IkiWiki;
 
 package IkiWiki;


@@ -36,22 +36,6 @@ sub gen_wrapper () { #{{{
                addenv("$var", s);
 EOF
        }
                addenv("$var", s);
 EOF
        }

-       if ($config{rcs} eq "svn" && $config{notify}) {
-               # Support running directly as hooks/post-commit by passing
-               # $2 in REV in the environment.
-               $envsave.=<<"EOF"
-       if (argc == 3)
-               addenv("REV", argv[2]);
-       else if ((s=getenv("REV")))
-               addenv("REV", s);
-EOF
-       }
-       if ($config{rcs} eq "tla" && $config{notify}) {
-               $envsave.=<<"EOF"
-       if ((s=getenv("ARCH_VERSION")))
-               addenv("ARCH_VERSION", s);
-EOF
-       }

        
        $Data::Dumper::Indent=0; # no newlines
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        
        $Data::Dumper::Indent=0; # no newlines
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);


@@ -91,8 +75,14 @@ $envsave
        newenviron[i]=NULL;
        environ=newenviron;
 
        newenviron[i]=NULL;
        environ=newenviron;
 

-       if (setregid(getegid(), -1) != 0 || setreuid(geteuid(), -1) != 0) {
-               perror("failed to drop real uid/gid");
+       if (setregid(getegid(), -1) != 0 &&
+           setregid(getegid(), -1) != 0) {
+               perror("failed to drop real gid");
+               exit(1);
+       }
+       if (setreuid(geteuid(), -1) != 0 &&
+           setreuid(geteuid(), -1) != 0) {
+               perror("failed to drop real uid");

                exit(1);
        }
 
                exit(1);
        }
 


@@ -102,14 +92,28 @@ $envsave
 }
 EOF
        close OUT;
 }
 EOF
        close OUT;

-       if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) {
+
+       my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
+       if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {

                #translators: The parameter is a C filename.
                error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
        }
        unlink("$wrapper.c");
                #translators: The parameter is a C filename.
                error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
        }
        unlink("$wrapper.c");

+       if (defined $config{wrappergroup}) {
+               my $gid=(getgrnam($config{wrappergroup}))[2];
+               if (! defined $gid) {
+                       error(sprintf("bad wrappergroup"));
+               }
+               if (! chown(-1, $gid, "$wrapper.new")) {
+                       error("chown $wrapper.new: $!");
+               }
+       }

        if (defined $config{wrappermode} &&
        if (defined $config{wrappermode} &&

-           ! chmod(oct($config{wrappermode}), $wrapper)) {
-               error("chmod $wrapper: $!");
+           ! chmod(oct($config{wrappermode}), "$wrapper.new")) {
+               error("chmod $wrapper.new: $!");
+       }
+       if (! rename("$wrapper.new", $wrapper)) {
+               error("rename $wrapper.new $wrapper: $!");

        }
        #translators: The parameter is a filename.
        printf(gettext("successfully generated %s"), $wrapper);
        }
        #translators: The parameter is a filename.
        printf(gettext("successfully generated %s"), $wrapper);