From b5c5b3e9c21edeb407ae4060d1ec54b9f542faa3 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Wed, 22 Jan 2014 23:00:32 +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 5c8f221d..9ff8c3a4 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
+
 Version 12.50 - 8 January 2014, Thierry Vignaud
 
 - better fix for segfault on startup (mga#10289)
diff --git a/polkit/Makefile b/polkit/Makefile
index b577f9e7..2b27470e 100644
--- a/polkit/Makefile
+++ b/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
-- 
cgit v1.2.1