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

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-06-28 00:09:51 +0300 (Sat, 28 Jun 2008)
New Revision: 15692

Added:
   projects/haf/trunk/dbus/debian/patches/debian/
   projects/haf/trunk/dbus/debian/patches/debian/00_dbus-quiesce-startup-errors.patch
   projects/haf/trunk/dbus/debian/patches/debian/01_no-fatal-warnings.patch
   projects/haf/trunk/dbus/debian/patches/debian/02_dbus_monitor_no_sigint_handler.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/patches/series
Log:
Import Debian patches


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2008-06-27 21:04:06 UTC (rev 15691)
+++ projects/haf/trunk/dbus/debian/changelog	2008-06-27 21:09:51 UTC (rev 15692)
@@ -2,6 +2,9 @@
 
   * New Maemo maintainer.
   * New upstream release (sync with Debian packaging 1.2.1-2).
+    - debian/patches/debian/00_dbus-quiesce-startup-errors.patch: New file.
+    - debian/patches/debian/01_no-fatal-warnings.patch: Likewise,
+    - debian/patches/debian/02_dbus_monitor_no_sigint_handler.patch: Likewis.
     - debian/patches/12-fix-unlocked-access.patch: Remove, merged ustream.
     - debian/patches/13-fix-connection-locks.patch: Likewise.
     - debian/patches/14-increase-default-limits.patch: Likewise.

Added: projects/haf/trunk/dbus/debian/patches/debian/00_dbus-quiesce-startup-errors.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/debian/00_dbus-quiesce-startup-errors.patch	2008-06-27 21:04:06 UTC (rev 15691)
+++ projects/haf/trunk/dbus/debian/patches/debian/00_dbus-quiesce-startup-errors.patch	2008-06-27 21:09:51 UTC (rev 15692)
@@ -0,0 +1,25 @@
+Index: b/bus/config-parser.c
+===================================================================
+--- a/bus/config-parser.c	2008-04-04 18:24:08.000000000 +0300
++++ b/bus/config-parser.c	2008-06-27 22:31:09.000000000 +0300
+@@ -2150,8 +2150,18 @@ include_dir (BusConfigParser   *parser,
+         {
+           if (!include_file (parser, &full_path, TRUE, error))
+             {
+-              _dbus_string_free (&full_path);
+-              goto failed;
++              /* Debian patch to skip malformed /etc/dbus-1/system.d entries */
++              /*
++               * _dbus_string_free (&full_path);
++               * goto failed;
++               */
++              if (dbus_error_is_set (error))
++                {
++                  _dbus_warn("\nEncountered error '%s' while parsing '%s'\n",
++                             error->message,
++                             _dbus_string_get_const_data(&full_path));
++                  dbus_error_free (error);
++                }
+             }
+         }
+ 

Added: projects/haf/trunk/dbus/debian/patches/debian/01_no-fatal-warnings.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/debian/01_no-fatal-warnings.patch	2008-06-27 21:04:06 UTC (rev 15691)
+++ projects/haf/trunk/dbus/debian/patches/debian/01_no-fatal-warnings.patch	2008-06-27 21:09:51 UTC (rev 15692)
@@ -0,0 +1,13 @@
+Index: b/dbus/dbus-internals.c
+===================================================================
+--- a/dbus/dbus-internals.c	2008-04-04 18:24:08.000000000 +0300
++++ b/dbus/dbus-internals.c	2008-06-27 22:31:15.000000000 +0300
+@@ -193,7 +193,7 @@ const char _dbus_no_memory_message[] = "
+ 
+ static dbus_bool_t warn_initted = FALSE;
+ static dbus_bool_t fatal_warnings = FALSE;
+-static dbus_bool_t fatal_warnings_on_check_failed = TRUE;
++static dbus_bool_t fatal_warnings_on_check_failed = FALSE;
+ 
+ static void
+ init_warnings(void)

Added: projects/haf/trunk/dbus/debian/patches/debian/02_dbus_monitor_no_sigint_handler.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/debian/02_dbus_monitor_no_sigint_handler.patch	2008-06-27 21:04:06 UTC (rev 15691)
+++ projects/haf/trunk/dbus/debian/patches/debian/02_dbus_monitor_no_sigint_handler.patch	2008-06-27 21:09:51 UTC (rev 15692)
@@ -0,0 +1,41 @@
+Index: b/tools/dbus-monitor.c
+===================================================================
+--- a/tools/dbus-monitor.c	2008-04-04 18:24:08.000000000 +0300
++++ b/tools/dbus-monitor.c	2008-06-27 22:31:18.000000000 +0300
+@@ -33,8 +33,6 @@
+ 
+ #include <time.h>
+ 
+-#include <signal.h>
+-
+ #include "dbus-print-message.h"
+ 
+ #ifdef DBUS_WIN
+@@ -195,14 +193,6 @@ usage (char *name, int ecode)
+   exit (ecode);
+ }
+ 
+-dbus_bool_t sigint_received = FALSE;
+-
+-static void
+-sigint_handler (int signum)
+-{
+-  sigint_received = TRUE;
+-}
+-
+ int
+ main (int argc, char *argv[])
+ {
+@@ -294,11 +284,7 @@ main (int argc, char *argv[])
+     fprintf (stderr, "Couldn't add filter!\n");
+     exit (1);
+   }
+-
+-  /* we handle SIGINT so exit() is reached and flushes stdout */
+-  signal (SIGINT, sigint_handler);
+-  while (dbus_connection_read_write_dispatch(connection, -1)
+-          && !sigint_received)
++  while (dbus_connection_read_write_dispatch(connection, -1))
+     ;
+   exit (0);
+  lose:

Modified: projects/haf/trunk/dbus/debian/patches/series
===================================================================
--- projects/haf/trunk/dbus/debian/patches/series	2008-06-27 21:04:06 UTC (rev 15691)
+++ projects/haf/trunk/dbus/debian/patches/series	2008-06-27 21:09:51 UTC (rev 15692)
@@ -1,3 +1,6 @@
+debian/00_dbus-quiesce-startup-errors.patch
+debian/01_no-fatal-warnings.patch
+debian/02_dbus_monitor_no_sigint_handler.patch
 00-install-doxygen-docs.patch
 01-add-initgroups-call.patch
 02-allow-all-in-session.patch