From 8519ea27928d06161a68e8775dfddbc669157e8a Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 26 Aug 2007 23:24:37 +0000
Subject: * debian/patches/02-dbus_access_network_manager.patch   - Add support
 for at_console dbus access check. (Closes: #426462)

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1679 ceb527fc-18e6-0310-9fe2-813c157c29e7
---
 debian/changelog                                    |  2 ++
 debian/patches/02-dbus_access_network_manager.patch | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5249902..cb6a7c32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ network-manager (0.6.5-1) unstable; urgency=low
     - Pull updates from the stable branch up until revision 2652.
     - Fixes broken link detection and a couple of smaller issues.
     - Adds support for the rfkill switch.
+  * debian/patches/02-dbus_access_network_manager.patch
+    - Add support for at_console dbus access check. (Closes: #426462)
 
  -- Michael Biebl <biebl@debian.org>  Mon, 27 Aug 2007 00:39:16 +0200
 
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index 139a3d87..ced5effe 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -1,15 +1,19 @@
---- src/NetworkManager.conf.orig	2006-06-14 02:47:10.000000000 +0200
-+++ src/NetworkManager.conf	2006-06-14 02:48:31.000000000 +0200
-@@ -8,7 +8,11 @@
+Index: src/NetworkManager.conf
+===================================================================
+--- src/NetworkManager.conf	(Revision 2735)
++++ src/NetworkManager.conf	(Arbeitskopie)
+@@ -8,6 +8,14 @@
                  <allow send_destination="org.freedesktop.NetworkManager"/>
                  <allow send_interface="org.freedesktop.NetworkManager"/>
          </policy>
--        <policy at_console="true">
 +        <policy user="haldaemon">
 +                <allow send_destination="org.freedesktop.NetworkManager"/>
 +                <allow send_interface="org.freedesktop.NetworkManager"/>
 +        </policy>
 +        <policy group="netdev">
++                <allow send_destination="org.freedesktop.NetworkManager"/>
++                <allow send_interface="org.freedesktop.NetworkManager"/>
++        </policy>
+         <policy at_console="true">
                  <allow send_destination="org.freedesktop.NetworkManager"/>
                  <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>
-- 
cgit 1.3.0-6-gf8a5