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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-04-05 13:25:42 +0300 (Thu, 05 Apr 2007)
New Revision: 10977

Added:
   projects/haf/trunk/dbus/debian/patches/11-fix-dirent_buf_size.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
added workaround for startup problem


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-04-05 08:58:14 UTC (rev 10976)
+++ projects/haf/trunk/dbus/debian/changelog	2007-04-05 10:25:42 UTC (rev 10977)
@@ -1,3 +1,10 @@
+dbus (1.0.2-0osso4) experimental; urgency=low
+
+  * UNRELEASED
+  * Added workaround for an issue in dbus-sysdeps-util-unix.c.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 05 Apr 2007 13:25:08 +0300
+
 dbus (1.0.2-0osso3) experimental; urgency=low
 
   * Increased per-user connection limit.

Added: projects/haf/trunk/dbus/debian/patches/11-fix-dirent_buf_size.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/11-fix-dirent_buf_size.patch	2007-04-05 08:58:14 UTC (rev 10976)
+++ projects/haf/trunk/dbus/debian/patches/11-fix-dirent_buf_size.patch	2007-04-05 10:25:42 UTC (rev 10977)
@@ -0,0 +1,21 @@
+diff -pur dbus-1.0.2/dbus/dbus-sysdeps-util-unix.c dbus-1.0.2.new/dbus/dbus-sysdeps-util-unix.c
+--- dbus-1.0.2/dbus/dbus-sysdeps-util-unix.c	2006-12-11 21:21:10.000000000 +0200
++++ dbus-1.0.2.new/dbus/dbus-sysdeps-util-unix.c	2007-04-05 13:19:26.315752664 +0300
+@@ -506,7 +506,8 @@ _dbus_directory_open (const DBusString *
+ static dbus_bool_t
+ dirent_buf_size(DIR * dirp, size_t *size)
+ {
+- long name_max;
++ long name_max = NAME_MAX;
++#if 0
+ #   if defined(HAVE_FPATHCONF) && defined(_PC_NAME_MAX)
+ #      if defined(HAVE_DIRFD)
+           name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX);
+@@ -530,6 +531,7 @@ dirent_buf_size(DIR * dirp, size_t *size
+ #           error "buffer size for readdir_r cannot be determined"
+ #       endif
+ #   endif
++#endif
+   if (size)
+     *size = (size_t)offsetof(struct dirent, d_name) + name_max + 1;
+   else