[Pkg-utopia-commits] r2542 - /packages/unstable/dbus/debian/patches/CVE-2008-4311.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Dec  7 13:09:17 2008
New Revision: 2542

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2542
Log:
redo the patch so it applies cleanly

Modified:
    packages/unstable/dbus/debian/patches/CVE-2008-4311.patch

Modified: packages/unstable/dbus/debian/patches/CVE-2008-4311.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/CVE-2008-4311.patch?rev=2542&op=diff
==============================================================================
--- packages/unstable/dbus/debian/patches/CVE-2008-4311.patch (original)
+++ packages/unstable/dbus/debian/patches/CVE-2008-4311.patch Sun Dec  7 13:09:17 2008
@@ -1,22 +1,6 @@
-commit 70a0ac620ab4be279ef8e0945307b541e10a1393
-Author: Tomas Hoger <thoger at redhat.com>
-Date:   Thu Dec 4 15:19:13 2008 -0500
-
-    Bug 18229 - Change system.conf to correctly deny non-reply sends by default
-    
-    The previous rule <allow send_requested_reply="true"/> was actually
-    applied to all messages, even if they weren't a reply.  This meant
-    that in fact the default DBus policy was effectively allow, rather
-    than deny as claimed.
-    
-    This fix ensures that the above rule only applies to actual reply
-    messages.
-    Signed-off-by: Colin Walters <walters at verbum.org>
-
-diff --git a/bus/system.conf.in b/bus/system.conf.in
-index 6a71926..ac2822f 100644
---- a/bus/system.conf.in
-+++ b/bus/system.conf.in
+diff -Naur dbus-1.2.1.orig/bus/system.conf.in dbus-1.2.1/bus/system.conf.in
+--- dbus-1.2.1.orig/bus/system.conf.in	2008-12-07 12:42:13.000000000 +0000
++++ dbus-1.2.1/bus/system.conf.in	2008-12-07 13:06:55.000000000 +0000
 @@ -50,9 +50,19 @@
           even if they aren't in here -->
      <allow send_destination="org.freedesktop.DBus"/>
@@ -36,6 +20,6 @@
 +    <allow receive_requested_reply="true" receive_type="method_return"/>
 +    <allow receive_requested_reply="true" receive_type="error"/>
 +    -->
-     <!-- disallow changing the activation environment of system services -->
-     <deny send_destination="org.freedesktop.DBus"
-           send_interface="org.freedesktop.DBus"
+   </policy>
+ 
+   <!-- Config files are placed here that among other things, punch