From bdcfa77e6ba0f68c10fbdf13cfe4a4a78f5ed516 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Fri, 11 Mar 2016 16:28:51 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf |  9 ++++++++-
 dbus-1/system.d/org.freedesktop.GeoClue2.conf       |  5 +++++
 geoclue/geoclue.conf                                | 12 ++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf b/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf
index b9824dc8..ad5243c4 100644
--- a/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf
+++ b/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf
@@ -2,7 +2,14 @@
  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
-  <policy context="default">
+  <policy user="geoclue">
+    <allow send_interface="org.freedesktop.GeoClue2.Agent"
+           send_path="/org/freedesktop/GeoClue2/Agent"/>
+    <allow send_interface="org.freedesktop.DBus.Properties"
+           send_path="/org/freedesktop/GeoClue2/Agent"/>
+  </policy>
+
+  <policy user="root">
     <allow send_interface="org.freedesktop.GeoClue2.Agent"
            send_path="/org/freedesktop/GeoClue2/Agent"/>
     <allow send_interface="org.freedesktop.DBus.Properties"
diff --git a/dbus-1/system.d/org.freedesktop.GeoClue2.conf b/dbus-1/system.d/org.freedesktop.GeoClue2.conf
index 070fecf1..1de08168 100644
--- a/dbus-1/system.d/org.freedesktop.GeoClue2.conf
+++ b/dbus-1/system.d/org.freedesktop.GeoClue2.conf
@@ -27,4 +27,9 @@
     <allow send_destination="fi.w1.wpa_supplicant1"
            send_interface="org.freedesktop.DBus.Introspectable"/>
   </policy>
+
+  <policy user="root">
+    <!-- Allow root to own the name on the bus -->
+    <allow own="org.freedesktop.GeoClue2"/>
+  </policy>
 </busconfig>
diff --git a/geoclue/geoclue.conf b/geoclue/geoclue.conf
index 88a227ed..eb69f5d5 100644
--- a/geoclue/geoclue.conf
+++ b/geoclue/geoclue.conf
@@ -7,6 +7,12 @@
 # separated by a ';'.
 whitelist=gnome-shell
 
+# Network NMEA source configuration options
+[network-nmea]
+
+# Fetch location from NMEA sources on local network?
+enable=true
+
 # WiFi source configuration options
 [wifi]
 
@@ -36,6 +42,12 @@ submission-nick=geoclue
 
 # Application configuration options
 #
+# NOTE: Having an entry here for an application with allowed=true means that
+#       geoclue will not ask agent to authorize the application. This is to
+#       ensure that system components and applications with built-in
+#       authorization mechanism (e.g web browsers) do not have to be bound to
+#       agents.
+#
 # Format:
 #
 # # Desktop ID of application without .desktop part
-- 
2.39.5