From 676c97361205d04db307bf9350fe372e69499904 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@teco.edu>
Date: Wed, 14 Jun 2006 01:04:14 +0000
Subject: hal must be able to send events about hotplugged devices to NM. Added
 user hal to /etc/dbus-1/system.d/NetworkManager.conf. Should

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

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index e84a729e..406dc2ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+network-manager (0.6.3-2) unstable; urgency=low
+
+  * Updated 02-dbus_access_network_manager.patch to allow the hal daemon
+    (running as user "hal") to send events about hotplugged devices to the
+    NetworkManager daemon. (Closes: 355785)
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 02:53:13 +0200
+
 network-manager (0.6.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index 06886be3..afa3bc3b 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -1,10 +1,14 @@
---- src/NetworkManager.conf.orig	2006-02-07 04:24:38.000000000 +0100
-+++ src/NetworkManager.conf	2006-02-07 04:25:00.000000000 +0100
-@@ -8,7 +8,7 @@
+--- 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 @@
                  <allow send_destination="org.freedesktop.NetworkManager"/>
                  <allow send_interface="org.freedesktop.NetworkManager"/>
          </policy>
 -        <policy at_console="true">
++        <policy user="hal">
++                <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"/>
-- 
cgit 1.3.0-6-gf8a5