[maemo-commits] [maemo-commits] r13142 - in projects/haf/trunk/dbus/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-08-13 11:13:41 +0300 (Mon, 13 Aug 2007)
New Revision: 13142

Added:
   projects/haf/trunk/dbus/debian/patches/17-do-not-inherit-oom-adj.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
added missing patch for oom_adj inheritance


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-08-13 07:57:33 UTC (rev 13141)
+++ projects/haf/trunk/dbus/debian/changelog	2007-08-13 08:13:41 UTC (rev 13142)
@@ -1,3 +1,10 @@
+dbus (1.0.2-0osso10) experimental; urgency=low
+
+  * Added missing patch for activated process not inheriting oom_adj.
+    Fixes: NB#65462
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 13 Aug 2007 11:13:35 +0300
+
 dbus (1.0.2-0osso9) experimental; urgency=low
 
   * Fix from the CVS for upstream bug

Added: projects/haf/trunk/dbus/debian/patches/17-do-not-inherit-oom-adj.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/17-do-not-inherit-oom-adj.patch	2007-08-13 07:57:33 UTC (rev 13141)
+++ projects/haf/trunk/dbus/debian/patches/17-do-not-inherit-oom-adj.patch	2007-08-13 08:13:41 UTC (rev 13142)
@@ -0,0 +1,17 @@
+diff -pur dbus-1.0.2/dbus/dbus-spawn.c dbus-1.0.2.new/dbus/dbus-spawn.c
+--- dbus-1.0.2/dbus/dbus-spawn.c	2006-12-11 21:21:09.000000000 +0200
++++ dbus-1.0.2.new/dbus/dbus-spawn.c	2007-08-13 11:09:52.564851752 +0300
+@@ -847,6 +847,13 @@ do_exec (int                       child
+ #ifdef DBUS_BUILD_TESTS
+   int i, max_open;
+ #endif
++  /* Change oom protection to off to prevent inheritance from dbus server */
++  int oom = open ("/proc/self/oom_adj", O_WRONLY|O_SYNC);
++  if (oom >= 0)
++   {
++     write (oom, "0", sizeof (char));
++     _dbus_close (oom, NULL);
++   }
+ 
+   _dbus_verbose_reset ();
+   _dbus_verbose ("Child process has PID %lu\n",