[wicd/f20] Do not use at_console directive in D-Bus policy file (#1095145)

[David Cantrell]

commit b925ce93d55f559177adb515c5e2e1ebf0d24df2
Author: David Cantrell <dcantrell at redhat.com>
Date:   Wed Jul 2 11:00:15 2014 -0400

    Do not use at_console directive in D-Bus policy file (#1095145)

 wicd-1.7.2.4-dbus-policy.patch |   45 +++++++++++++++++++--------------------
 wicd.spec                      |    5 +++-
 2 files changed, 26 insertions(+), 24 deletions(-)
---
diff --git a/wicd-1.7.2.4-dbus-policy.patch b/wicd-1.7.2.4-dbus-policy.patch
index 866f4d3..e96155e 100644
--- a/wicd-1.7.2.4-dbus-policy.patch
+++ b/wicd-1.7.2.4-dbus-policy.patch
@@ -1,7 +1,12 @@
 diff -up wicd-1.7.2.4/in/other=wicd.conf.in.dbus wicd-1.7.2.4/in/other=wicd.conf.in
 --- wicd-1.7.2.4/in/other=wicd.conf.in.dbus	2011-09-18 04:48:13.000000000 -0400
-+++ wicd-1.7.2.4/in/other=wicd.conf.in	2014-06-30 10:29:35.968246038 -0400
-@@ -7,41 +7,34 @@
++++ wicd-1.7.2.4/in/other=wicd.conf.in	2014-07-02 10:58:22.253030709 -0400
+@@ -2,46 +2,28 @@
+ <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+ <busconfig>
+-
+         <policy user="root">
                  <allow own="org.wicd.daemon"/>
                  <allow send_destination="org.wicd.daemon"/>
                  <allow send_interface="org.wicd.daemon"/>
@@ -9,30 +14,30 @@ diff -up wicd-1.7.2.4/in/other=wicd.conf.in.dbus wicd-1.7.2.4/in/other=wicd.conf
 -		<allow send_interface="org.wicd.daemon.wireless"/>
 -		<allow send_destination="org.wicd.daemon.wired"/>
 -		<allow send_interface="org.wicd.daemon.wired"/>
+-        </policy>
+-
+-        <policy context="default">
+-                <deny own="org.wicd.daemon"/>
 +                <allow send_destination="org.wicd.daemon.wireless"/>
 +                <allow send_interface="org.wicd.daemon.wireless"/>
 +                <allow send_destination="org.wicd.daemon.wired"/>
 +                <allow send_interface="org.wicd.daemon.wired"/>
          </policy>
  
--        <policy context="default">
--                <deny own="org.wicd.daemon"/>
--        </policy>
--
 -	<!-- This Unix group will have permission to use Wicd's gui -->
 -        <policy group="%WICDGROUP%">
 +        <policy group="users">
 +                <allow own="org.wicd.daemon"/>
                  <allow send_destination="org.wicd.daemon"/>
                  <allow send_interface="org.wicd.daemon"/>
--                <allow send_interface="org.freedesktop.DBus.Introspectable"/>
--                <!-- The Introspectable allow shouldn't be needed here, but
--                     it seems that a few distributions aren't yet allowing
--                     it in their hal configs, and we need it here, so... -->
 +                <allow send_destination="org.wicd.daemon.wireless"/>
 +                <allow send_interface="org.wicd.daemon.wireless"/>
 +                <allow send_destination="org.wicd.daemon.wired"/>
 +                <allow send_interface="org.wicd.daemon.wired"/>
+                 <allow send_interface="org.freedesktop.DBus.Introspectable"/>
+-                <!-- The Introspectable allow shouldn't be needed here, but
+-                     it seems that a few distributions aren't yet allowing
+-                     it in their hal configs, and we need it here, so... -->
          </policy>
  
 -       <!-- Comment the block below if you do not want all users logged in 
@@ -41,23 +46,17 @@ diff -up wicd-1.7.2.4/in/other=wicd.conf.in.dbus wicd-1.7.2.4/in/other=wicd.conf
 -            group. Note that this only applies if you are using ConsoleKit -
 -            if you do not have ConsoleKit installed and in use, then this
 -            block makes no difference either way.  -->
-+        <policy context="default">
-+                <deny own="org.wicd.daemon"/>
-+        </policy>
- 
-         <policy at_console="true">
-                 <allow send_destination="org.wicd.daemon"/>
-                 <allow send_interface="org.wicd.daemon"/>
+-
+-        <policy at_console="true">
+-                <allow send_destination="org.wicd.daemon"/>
+-                <allow send_interface="org.wicd.daemon"/>
 -		<allow send_destination="org.wicd.daemon.wireless"/>
 -		<allow send_interface="org.wicd.daemon.wireless"/>
 -		<allow send_destination="org.wicd.daemon.wired"/>
 -		<allow send_interface="org.wicd.daemon.wired"/>
 -		<allow send_interface="org.freedesktop.DBus.Introspectable"/>
-+                <allow send_destination="org.wicd.daemon.wireless"/>
-+                <allow send_interface="org.wicd.daemon.wireless"/>
-+                <allow send_destination="org.wicd.daemon.wired"/>
-+                <allow send_interface="org.wicd.daemon.wired"/>
-+                <allow send_interface="org.freedesktop.DBus.Introspectable"/>
++        <policy context="default">
++                <deny own="org.wicd.daemon"/>
          </policy>
- 
+-
  </busconfig>
diff --git a/wicd.spec b/wicd.spec
index bdb9a92..84bff6c 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.2.4
-Release:             9%{?dist}
+Release:             10%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -293,6 +293,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Wed Jul 02 2014 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-10
+- Do not use at_console directive in D-Bus policy file (#1095145)
+
 * Mon Jun 30 2014 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-9
 - Do not assume wicd-daemon is running when wicd-client runs (#1074315)
 - Fix wicd-curses crash on startup (#894646)