From 2197e852526abc628a32322fad940897499664dd Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Mon, 23 Nov 2009 23:47:29 +0000
Subject: * debian/patches/02-dbus_access_network_manager.patch   - Update
 group="netdev" policy based on the upstream changes for     at_console. The
 updated D-Bus policy also fixes communication failures     between pppd and
 NetworkManager. (Closes: #555624)

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

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 64576848..146f71b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 network-manager (0.7.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/02-dbus_access_network_manager.patch
+    - Update group="netdev" policy based on the upstream changes for
+      at_console. The updated D-Bus policy also fixes communication failures
+      between pppd and NetworkManager. (Closes: #555624)
 
  -- Michael Biebl <biebl@debian.org>  Tue, 24 Nov 2009 00:34:08 +0100
 
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index c96a0de1..8c90bfd7 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -1,16 +1,55 @@
-Index: network-manager-0.7.0.97/src/NetworkManager.conf
+Index: NetworkManager-0.7.2/src/NetworkManager.conf
 ===================================================================
---- network-manager-0.7.0.97.orig/src/NetworkManager.conf	2009-02-17 16:45:44.000000000 +0100
-+++ network-manager-0.7.0.97/src/NetworkManager.conf	2009-02-22 03:20:14.000000000 +0100
-@@ -9,6 +9,12 @@
+--- NetworkManager-0.7.2.orig/src/NetworkManager.conf	2009-11-23 20:17:47.000000000 +0100
++++ NetworkManager-0.7.2/src/NetworkManager.conf	2009-11-24 00:38:15.416687481 +0100
+@@ -9,6 +9,51 @@
                  <allow send_destination="org.freedesktop.NetworkManager"
                         send_interface="org.freedesktop.NetworkManager.PPP"/>
          </policy>
 +        <policy group="netdev">
 +                <allow send_destination="org.freedesktop.NetworkManager"/>
 +
-+                <deny send_destination="org.freedesktop.NetworkManager"
-+                      send_interface="org.freedesktop.NetworkManager.PPP"/>
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.DBus.Introspectable"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.DBus.Properties"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Cdma"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Wired"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Gsm"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Serial"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Wireless"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.DHCP4Config"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.IP4Config"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
 +        </policy>
          <policy at_console="true">
                  <allow send_destination="org.freedesktop.NetworkManager"/>
-- 
cgit 1.3.0-6-gf8a5