summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-01-22 23:00:32 +0000
committerColin Guthrie <colin@mageia.org>2014-01-22 23:20:06 +0000
commit6acf16149d317f830e3f2576a68205a450ef5b6f (patch)
treec4e81549a23c0e4e546cf23d52a8c1a1b9fe3927
parent5c7ae554b2e58ec7603a00b940ec2a7c6439abc8 (diff)
downloaddrakx-6acf16149d317f830e3f2576a68205a450ef5b6f.tar
drakx-6acf16149d317f830e3f2576a68205a450ef5b6f.tar.gz
drakx-6acf16149d317f830e3f2576a68205a450ef5b6f.tar.bz2
drakx-6acf16149d317f830e3f2576a68205a450ef5b6f.tar.xz
drakx-6acf16149d317f830e3f2576a68205a450ef5b6f.zip
Do not exec pkexec but run it so it has a parent process to fix double fork issues mga#11184 mga#12364
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/standalone/polkit/Makefile2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 41c705dae..5165f997e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- do not exec pkexec but run it so it has a parent process to fix double fork
+ issues mga#11184 mga#12364
+
Version 16.26.1 - 20 January 2014
- diskdrake:
diff --git a/perl-install/standalone/polkit/Makefile b/perl-install/standalone/polkit/Makefile
index 6cd42c013..b57dbe96d 100644
--- a/perl-install/standalone/polkit/Makefile
+++ b/perl-install/standalone/polkit/Makefile
@@ -15,7 +15,7 @@ clean:
rm -f $(WRAPPERS) $(POLICY)
%: org.mageia.%.policy.in
- @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\nelse\n exec $(LIBEXECDIR)/$@ "$$''@"\nfi\n' > $@
+ @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\n exit $$''?\nfi\nexec $(LIBEXECDIR)/$@ "$$''@"\n' > $@
%.policy: %.policy.in
intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache