From f40d4ecae66a6166ef858770d3863729c78dfb64 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Wed, 22 Jan 2014 23:00:31 +0000
Subject: Do not exec pkexec but run it so it has a parent process to fix
 double fork issues mga#11184 mga#12364

---
 NEWS            | 3 +++
 polkit/Makefile | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 8f2102d..41d969d 100644
--- a/NEWS
+++ b/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
+
 2.10
 - block CHLD signals on startup in order to prevent glib-threading segfaults
 
diff --git a/polkit/Makefile b/polkit/Makefile
index 631426e..6fef4f7 100644
--- a/polkit/Makefile
+++ b/polkit/Makefile
@@ -14,7 +14,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
-- 
cgit v1.2.1