← Back to branch summary

~ubuntu-branches/ubuntu/saucy/dbus/saucy

« back to all changes in this revision

Viewing changes to debian/patches/CVE-2012-3524-regression-fix.patch

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-10-03 14:41:36 UTC
  • Revision ID: package-import@ubuntu.com-20121003144136-fxkhexob8d31rmlz
Tags: 1.6.4-1ubuntu4
debian/patches/CVE-2012-3524-regression-fix.patch: updated to fix test
suite.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/CVE-2012-3524-regression-fix.patch
3
3
 the default system bus address.
4
4
Origin: upstream, http://cgit.freedesktop.org/dbus/dbus/commit/?id=57ae3670508bbf4ec57049de47c9cae727a64802
5
5
Origin: upstream, http://cgit.freedesktop.org/dbus/dbus/commit/?id=f68dbdc3e6f895012ce33939fb524accf31bcca5
 
6
Origin: upstream, https://bugs.freedesktop.org/attachment.cgi?id=67977
6
7
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dbus/+bug/1058517
7
8
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=52202
8
9
 
9
10
Index: dbus-1.6.4/bus/activation-helper.c
10
11
===================================================================
11
 
--- dbus-1.6.4.orig/bus/activation-helper.c     2012-06-06 06:45:55.000000000 -0400
12
 
+++ dbus-1.6.4/bus/activation-helper.c  2012-10-03 07:13:10.582328093 -0400
 
12
--- dbus-1.6.4.orig/bus/activation-helper.c     2012-10-03 14:40:09.571872090 -0400
 
13
+++ dbus-1.6.4/bus/activation-helper.c  2012-10-03 14:40:58.819873351 -0400
13
14
@@ -140,21 +140,12 @@
14
15
   return desktop_file;
15
16
 }
35
36
 #ifndef ACTIVATION_LAUNCHER_TEST
36
37
   /* totally clear the environment */
37
38
   if (!_dbus_clearenv ())
38
 
@@ -165,17 +156,8 @@
 
39
@@ -163,20 +154,11 @@
 
40
                       "could not clear environment\n");
 
41
       return FALSE;
39
42
     }
40
 
 #endif
 
43
-#endif
41
44
 
42
45
-#ifdef DBUS_ENABLE_VERBOSE_MODE
43
46
-  /* restore the debugging environment setting if set */
53
56
+  /* Ensure the bus is set to system */
54
57
+  _dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS);
55
58
   _dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system");
 
59
+#endif
56
60
 
57
61
   return TRUE;
 
62
 }