[Pkg-utopia-commits] r2993 - in /packages/unstable/knetworkmanager/debian: changelog patches/04-dbus_access.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Mar 20 21:36:44 2009
New Revision: 2993

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2993
Log:
* debian/patches/04-dbus_access.patch
  - Most of the relevant changes have been merged upstream. The patch now
    only contains the Debian specific group "netdev" section.

Modified:
    packages/unstable/knetworkmanager/debian/changelog
    packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch

Modified: packages/unstable/knetworkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/changelog?rev=2993&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/changelog (original)
+++ packages/unstable/knetworkmanager/debian/changelog Fri Mar 20 21:36:44 2009
@@ -1,8 +1,11 @@
 knetworkmanager (1:0.7~~svn941706-1) UNRELEASED; urgency=low
 
   * Updated SVN snapshot (r941706).
-
- -- Michael Biebl <biebl at debian.org>  Fri, 20 Mar 2009 18:01:02 +0100
+  * debian/patches/04-dbus_access.patch
+    - Most of the relevant changes have been merged upstream. The patch now
+      only contains the Debian specific group "netdev" section.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 20 Mar 2009 22:35:11 +0100
 
 knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
 

Modified: packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch?rev=2993&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch (original)
+++ packages/unstable/knetworkmanager/debian/patches/04-dbus_access.patch Fri Mar 20 21:36:44 2009
@@ -1,64 +1,24 @@
-Index: knetworkmanager-0.7~~svn908338/knetworkmanager-0.7/knetworkmanager.conf
+Index: knetworkmanager-0.7~~svn941706/knetworkmanager-0.7/knetworkmanager.conf
 ===================================================================
---- knetworkmanager-0.7~~svn908338.orig/knetworkmanager-0.7/knetworkmanager.conf	2007-12-12 19:31:03.000000000 +0100
-+++ knetworkmanager-0.7~~svn908338/knetworkmanager-0.7/knetworkmanager.conf	2009-02-05 21:39:13.000000000 +0100
-@@ -3,42 +3,35 @@
-  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
- <busconfig>
- 	<policy user="root">
--		<allow own="org.freedesktop.NetworkManagerInfo"/>
--
--		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
--		<allow send_interface="org.freedesktop.NetworkManagerInfo"/>
--
- 		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
- 
--		<allow send_destination="org.freedesktop.NetworkManagerSettings"/>
--		<allow send_interface="org.freedesktop.NetworkManagerSettings"/>
--
-+		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
+--- knetworkmanager-0.7~~svn941706.orig/knetworkmanager-0.7/knetworkmanager.conf	2009-03-20 12:17:15.000000000 +0100
++++ knetworkmanager-0.7~~svn941706/knetworkmanager-0.7/knetworkmanager.conf	2009-03-20 22:34:18.000000000 +0100
+@@ -29,6 +29,19 @@
+ 		<deny send_destination="org.freedesktop.NetworkManagerUserSettings"
+ 		      send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/>
  	</policy>
- 	<policy at_console="true">
--		<allow own="org.freedesktop.NetworkManagerInfo"/>
++	<policy group="netdev">
 +		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
- 
--		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
--		<allow send_interface="org.freedesktop.NetworkManagerInfo"/>
-+		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
- 
++
++		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
++		       send_interface="org.freedesktop.NetworkManagerSettings"/>
++
++		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
++		       send_interface="org.freedesktop.NetworkManagerSettings.Connection"/>
++
 +		<!-- Only root can get secrets -->
 +		<deny send_destination="org.freedesktop.NetworkManagerUserSettings"
-+		      send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
++		      send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/>
 +	</policy>
-+	<policy group="netdev">
- 		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
+ 	<policy context="default">
+ 		<deny own="org.freedesktop.NetworkManagerUserSettings"/>
  
--		<allow send_destination="org.freedesktop.NetworkManagerSettings"/>
--		<allow send_interface="org.freedesktop.NetworkManagerSettings"/>
--
-+		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
- 
-+		<!-- Only root can get secrets -->
-+		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-+		       send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
- 	</policy>
- 	<policy context="default">
--		<deny own="org.freedesktop.NetworkManagerInfo"/>
--
--		<deny send_destination="org.freedesktop.NetworkManagerInfo"/>
--		<deny send_interface="org.freedesktop.NetworkManagerInfo"/>
--
--		<deny own="org.freedesktop.NetworkManagerUserSettings"/>
--
--		<deny send_destination="org.freedesktop.NetworkManagerSettings"/>
--		<deny send_interface="org.freedesktop.NetworkManagerSettings"/>
--
-+		<deny send_destination="org.freedesktop.NetworkManagerUserSettings"/>
- 
-+		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-+		       send_interface="org.freedesktop.DBus.Introspectable"/>
- 	</policy>
-+
-+	<limit name="max_replies_per_connection">512</limit>
- </busconfig>
-