From 0c93879ce67e00968f31e61069a66b48eee9349e Mon Sep 17 00:00:00 2001
From: Dan Mashal <dan.mashal@gmail.com>
Date: Thu, 22 Nov 2012 21:02:14 -0800
Subject: stop generating version specific libdirs for plugins

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index dc4513c..f82e77b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,7 +394,7 @@ fi
 # Plugins
 # ---------------------------------------------------------------------------
 
-plugindir='$(libdir)/mate-settings-daemon-msd_api_version'
+plugindir='$(libdir)/mate-settings-daemon'
 AC_SUBST([plugindir])
 
 dnl ---------------------------------------------------------------------------
-- 
cgit v1.2.1


From 258f92953949ebd7ebca3bd34df973099b24f4dd Mon Sep 17 00:00:00 2001
From: Dan Mashal <dan.mashal@gmail.com>
Date: Fri, 23 Nov 2012 16:28:27 -0800
Subject: Fix CVE-2012-5560

---
 plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf b/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf
index c861ace..297f121 100644
--- a/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf
+++ b/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf
@@ -9,11 +9,13 @@
   <policy user="root">
     <allow own="org.mate.SettingsDaemon.DateTimeMechanism"/>
     <allow send_destination="org.mate.SettingsDaemon.DateTimeMechanism"/>
+    <allow receive_sender="org.mate.SettingsDaemon.DateTimeMechanism"/>
   </policy>
 
   <!-- Allow anyone to invoke methods on the interfaces -->
   <policy context="default">
     <allow send_destination="org.mate.SettingsDaemon.DateTimeMechanism"/>
+    <allow receive_sender="org.mate.SettingsDaemon.DateTimeMechanism"/>
   </policy>
 
 </busconfig>
-- 
cgit v1.2.1


From c7d634acd12814a1fe298118e65f1c688b3a9f74 Mon Sep 17 00:00:00 2001
From: Dan Mashal <dan.mashal@gmail.com>
Date: Sat, 24 Nov 2012 08:32:40 -0800
Subject: really fix CVE2012-5560

---
 plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in b/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in
index 3fb688e..4eecfd6 100644
--- a/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in
+++ b/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in
@@ -13,7 +13,7 @@
     <_message>Privileges are required to change the system time zone.</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
+      <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
 
-- 
cgit v1.2.1