about summary refs log tree commit diff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/02-dbus_access_network_manager.patch16
-rw-r--r--debian/patches/03-systemd.patch6
2 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index 115607d4..33312a4e 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -1,13 +1,13 @@
 Description: Add D-Bus policy for group netdev
  It is more or less a copy of the at_console section.
 Author: Michael Biebl <biebl@debian.org>
-Index: network-manager/src/NetworkManager.conf
+Index: network-manager/src/org.freedesktop.NetworkManager.conf
 ===================================================================
---- network-manager.orig/src/NetworkManager.conf	2011-08-23 19:17:04.091746773 +0200
-+++ network-manager/src/NetworkManager.conf	2011-08-24 00:01:25.010444356 +0200
-@@ -24,6 +24,70 @@
-                 <allow send_destination="org.freedesktop.NetworkManager.pptp"/>
-                 <allow send_destination="org.freedesktop.NetworkManager.vpnc"/>
+--- network-manager.orig/src/org.freedesktop.NetworkManager.conf	2012-03-24 01:37:02.186720578 +0100
++++ network-manager/src/org.freedesktop.NetworkManager.conf	2012-03-24 01:38:09.726722510 +0100
+@@ -88,6 +88,70 @@
+                        send_interface="org.freedesktop.NetworkManager"
+                        send_member="wake"/>
          </policy>
 +        <policy group="netdev">
 +                <allow send_destination="org.freedesktop.NetworkManager"/>
@@ -73,6 +73,6 @@ Index: network-manager/src/NetworkManager.conf
 +                       send_interface="org.freedesktop.NetworkManager"
 +                       send_member="wake"/>
 +        </policy>
-         <policy at_console="true">
-                 <allow send_destination="org.freedesktop.NetworkManager"/>
+         <policy context="default">
+                 <deny own="org.freedesktop.NetworkManager"/>
  
diff --git a/debian/patches/03-systemd.patch b/debian/patches/03-systemd.patch
index 8d1af50d..927ec60e 100644
--- a/debian/patches/03-systemd.patch
+++ b/debian/patches/03-systemd.patch
@@ -6,8 +6,8 @@ Description: Debian specific tweaks for NetworkManager systemd service file
 Author: Michael Biebl <biebl@debian.org>
 Index: network-manager/data/NetworkManager.service.in
 ===================================================================
---- network-manager.orig/data/NetworkManager.service.in	2011-05-04 21:35:57.000000000 +0200
-+++ network-manager/data/NetworkManager.service.in	2011-05-04 22:27:37.411911227 +0200
+--- network-manager.orig/data/NetworkManager.service.in	2012-03-02 21:43:15.458064485 +0100
++++ network-manager/data/NetworkManager.service.in	2012-03-02 21:43:20.242064316 +0100
 @@ -1,8 +1,6 @@
  [Unit]
  Description=Network Manager
@@ -17,7 +17,7 @@ Index: network-manager/data/NetworkManager.service.in
  
  [Service]
  Type=dbus
-@@ -12,3 +10,4 @@
+@@ -16,3 +14,4 @@
  [Install]
  WantedBy=multi-user.target
  Alias=dbus-org.freedesktop.NetworkManager.service