about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-12-05 05:38:32 +0100
committerMichael Biebl <biebl@debian.org>2010-12-05 05:38:32 +0100
commitcee3738fe31967472eb5dd13fe1b8495db059110 (patch)
tree491adca374cdb72446402ec7ed0e71638c8a2cab
parent3a6f7213f139e6fa77eb42e0a771ff3e5619f10a (diff)
Update policy for group netdev based on upstream changes for at_console.
* debian/patches/02-dbus_access_network_manager.patch
  - Update policy for group netdev based on upstream changes for at_console.
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/02-dbus_access_network_manager.patch24
2 files changed, 22 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index b42c4aad..cae1560f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ network-manager (0.8.2-1) UNRELEASED; urgency=low
     - Remove pre-lenny conffile upgrade code.
   * debian/network-manager.install
     - Install nm-online binary.
+  * debian/patches/02-dbus_access_network_manager.patch
+    - Update policy for group netdev based on upstream changes for at_console.
 
  -- Michael Biebl <biebl@debian.org>  Mon, 29 Nov 2010 19:03:34 +0100
 
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index c2d741e5..1d51e81a 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -1,8 +1,8 @@
-Index: network-manager-0.7.999/src/NetworkManager.conf
+Index: network-manager/src/NetworkManager.conf
 ===================================================================
---- network-manager-0.7.999.orig/src/NetworkManager.conf	2010-01-22 01:27:48.273977786 +0100
-+++ network-manager-0.7.999/src/NetworkManager.conf	2010-01-22 01:28:01.153983423 +0100
-@@ -12,6 +12,51 @@
+--- network-manager.orig/src/NetworkManager.conf	2010-12-05 04:27:16.369752121 +0100
++++ network-manager/src/NetworkManager.conf	2010-12-05 05:36:13.629758385 +0100
+@@ -12,6 +12,67 @@
                  <allow send_destination="org.freedesktop.NetworkManager"
                         send_interface="org.freedesktop.NetworkManager.PPP"/>
          </policy>
@@ -50,6 +50,22 @@ Index: network-manager-0.7.999/src/NetworkManager.conf
 +
 +                <allow send_destination="org.freedesktop.NetworkManager"
 +                       send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
++
++                <deny send_destination="org.freedesktop.NetworkManager"
++                       send_interface="org.freedesktop.NetworkManager"
++                       send_member="SetLogging"/>
++
++                <deny send_destination="org.freedesktop.NetworkManager"
++                       send_interface="org.freedesktop.NetworkManager"
++                       send_member="Sleep"/>
++
++                <deny send_destination="org.freedesktop.NetworkManager"
++                       send_interface="org.freedesktop.NetworkManager"
++                       send_member="sleep"/>
++
++                <deny send_destination="org.freedesktop.NetworkManager"
++                       send_interface="org.freedesktop.NetworkManager"
++                       send_member="wake"/>
 +        </policy>
          <policy at_console="true">
                  <allow send_destination="org.freedesktop.NetworkManager"/>