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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Fri Dec 19 08:26:22 EET 2008 
Author: guillem
Date: 2008-12-19 08:26:21 +0200 (Fri, 19 Dec 2008)
New Revision: 17006

Removed:
   projects/haf/trunk/dbus/debian/patches/90-atomic-file-change-sync.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/patches/01-add-initgroups-call.patch
   projects/haf/trunk/dbus/debian/patches/08-create-new-process-group.patch
   projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch
   projects/haf/trunk/dbus/debian/patches/10-up-connection-limits.patch
   projects/haf/trunk/dbus/debian/patches/17-do-not-inherit-oom-adj.patch
   projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch
   projects/haf/trunk/dbus/debian/patches/22-use-signed-return-value.patch
   projects/haf/trunk/dbus/debian/patches/series
Log:
New dbus upstream release 1.2.8


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/changelog	2008-12-19 06:26:21 UTC (rev 17006)
@@ -1,3 +1,17 @@
+dbus (1.2.8-0maemo1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - debian/patches/90-atomic-file-change-sync.patch: Remove, merged upstream.
+    - debian/patches/01-add-initgroups-call.patch: Refresh.
+    - debian/patches/08-create-new-process-group.patch: Likewise.
+    - debian/patches/09-remove-max-match-limit.patch: Likewise.
+    - debian/patches/10-up-connection-limits.patch: Likewise.
+    - debian/patches/17-do-not-inherit-oom-adj.patch: Likewise.
+    - debian/patches/18-fix-remove-bogus-filter.patch: Likewise.
+    - debian/patches/22-use-signed-return-value.patch: Likewise.
+
+ -- Guillem Jover <guillem.jover at nokia.com>  Fri, 19 Dec 2008 07:59:02 +0200
+
 dbus (1.2.4-0maemo3) unstable; urgency=low
 
   * Optimize and correct init script not running on sbox arm by:

Modified: projects/haf/trunk/dbus/debian/patches/01-add-initgroups-call.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/01-add-initgroups-call.patch	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/patches/01-add-initgroups-call.patch	2008-12-19 06:26:21 UTC (rev 17006)
@@ -25,11 +25,11 @@
    
 +#endif
 +
-+  struct passwd *pw = getpwuid(uid);
++  struct passwd *pw = getpwuid (uid);
 +  if (pw == NULL)
 +    {
 +      dbus_set_error (error, _dbus_error_from_errno (errno),
-+                     "getpwuid() for UID '%d' failed: %s", uid,
++                     "getpwuid () for UID '%d' failed: %s", uid,
 +                     _dbus_strerror (errno));
 +      return FALSE;
 +    }
@@ -37,7 +37,7 @@
 +  if (initgroups (pw->pw_name, pw->pw_gid) < 0)
 +    {
 +      dbus_set_error (error, _dbus_error_from_errno (errno),
-+                      "initgroups() failed: %s",
++                      "initgroups () failed: %s",
 +                      _dbus_strerror (errno));
 +      return FALSE;
 +    }

Modified: projects/haf/trunk/dbus/debian/patches/08-create-new-process-group.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/08-create-new-process-group.patch	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/patches/08-create-new-process-group.patch	2008-12-19 06:26:21 UTC (rev 17006)
@@ -17,20 +17,20 @@
  }
  
 +void
-+setup_child_priority(void)
++setup_child_priority (void)
 +{
 +  int p;
 +#ifdef _POSIX_PRIORITY_SCHEDULING
 +  struct sched_param sched_param;
 +
 +  sched_param.sched_priority = 0;
-+  sched_setscheduler(0, SCHED_OTHER, &sched_param);
++  sched_setscheduler (0, SCHED_OTHER, &sched_param);
 +#endif
 +
 +  errno = 0;
-+  p = getpriority(PRIO_PROCESS, 0);
++  p = getpriority (PRIO_PROCESS, 0);
 +  if (!errno && p < 0)
-+    setpriority(PRIO_PROCESS, 0, 0);
++    setpriority (PRIO_PROCESS, 0, 0);
 +}
 +
  /**
@@ -45,7 +45,7 @@
 +	  if (setsid () == -1)
 +	    _dbus_warn ("setsid() failed: %s\n", _dbus_strerror (errno));
 +
-+	  setup_child_priority();
++	  setup_child_priority ();
 +
  	  do_exec (child_err_report_pipe[WRITE_END],
  		   argv,

Modified: projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/patches/09-remove-max-match-limit.patch	2008-12-19 06:26:21 UTC (rev 17006)
@@ -1,8 +1,8 @@
 Index: b/bus/driver.c
 ===================================================================
---- a/bus/driver.c	2008-04-04 18:24:08.000000000 +0300
-+++ b/bus/driver.c	2008-06-09 20:12:32.000000000 +0300
-@@ -826,17 +826,6 @@ bus_driver_handle_add_match (DBusConnect
+--- a/bus/driver.c
++++ b/bus/driver.c
+@@ -953,17 +953,6 @@ bus_driver_handle_add_match (DBusConnect
    text = NULL;
    rule = NULL;
  

Modified: projects/haf/trunk/dbus/debian/patches/10-up-connection-limits.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/10-up-connection-limits.patch	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/patches/10-up-connection-limits.patch	2008-12-19 06:26:21 UTC (rev 17006)
@@ -1,8 +1,8 @@
 Index: b/bus/system.conf.in
 ===================================================================
---- a/bus/system.conf.in	2008-06-09 20:12:15.000000000 +0300
-+++ b/bus/system.conf.in	2008-06-09 20:12:35.000000000 +0300
-@@ -40,6 +40,9 @@
+--- a/bus/system.conf.in
++++ b/bus/system.conf.in
+@@ -39,6 +39,9 @@
         systems.) -->
    <listen>@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@</listen>
  

Modified: 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	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/patches/17-do-not-inherit-oom-adj.patch	2008-12-19 06:26:21 UTC (rev 17006)
@@ -1,8 +1,8 @@
 Index: b/dbus/dbus-spawn.c
 ===================================================================
---- a/dbus/dbus-spawn.c	2008-06-09 20:12:29.000000000 +0300
-+++ b/dbus/dbus-spawn.c	2008-06-09 20:12:47.000000000 +0300
-@@ -886,6 +886,13 @@ do_exec (int                       child
+--- a/dbus/dbus-spawn.c
++++ b/dbus/dbus-spawn.c
+@@ -890,6 +890,13 @@ do_exec (int                       child
  #ifdef DBUS_BUILD_TESTS
    int i, max_open;
  #endif

Modified: projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch	2008-12-19 06:26:21 UTC (rev 17006)
@@ -1,8 +1,8 @@
 Index: b/dbus/dbus-connection.c
 ===================================================================
---- a/dbus/dbus-connection.c	2008-04-04 18:24:08.000000000 +0300
-+++ b/dbus/dbus-connection.c	2008-06-09 20:12:50.000000000 +0300
-@@ -5273,19 +5273,18 @@ dbus_connection_remove_filter (DBusConne
+--- a/dbus/dbus-connection.c
++++ b/dbus/dbus-connection.c
+@@ -5328,19 +5328,18 @@ dbus_connection_remove_filter (DBusConne
          }
          
        link = _dbus_list_get_prev_link (&connection->filter_list, link);

Modified: projects/haf/trunk/dbus/debian/patches/22-use-signed-return-value.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/22-use-signed-return-value.patch	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/patches/22-use-signed-return-value.patch	2008-12-19 06:26:21 UTC (rev 17006)
@@ -1,8 +1,8 @@
 Index: b/dbus/dbus-spawn.c
 ===================================================================
---- a/dbus/dbus-spawn.c	2008-06-09 18:06:53.000000000 +0300
-+++ b/dbus/dbus-spawn.c	2008-06-09 18:10:50.000000000 +0300
-@@ -72,8 +72,8 @@ read_ints (int        fd,
+--- a/dbus/dbus-spawn.c
++++ b/dbus/dbus-spawn.c
+@@ -75,8 +75,8 @@ read_ints (int        fd,
    
    while (TRUE)
      {
@@ -13,7 +13,7 @@
  
        to_read = sizeof (int) * n_ints_in_buf - bytes;
  
-@@ -127,8 +127,8 @@ read_pid (int        fd,
+@@ -130,8 +130,8 @@ read_pid (int        fd,
    
    while (TRUE)
      {

Deleted: projects/haf/trunk/dbus/debian/patches/90-atomic-file-change-sync.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/90-atomic-file-change-sync.patch	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/patches/90-atomic-file-change-sync.patch	2008-12-19 06:26:21 UTC (rev 17006)
@@ -1,42 +0,0 @@
-From c29d149a3aab3c6a6de3c76b2dca5319e79b558e Mon Sep 17 00:00:00 2001
-From: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
-Date: Fri, 29 Aug 2008 17:13:15 +0300
-Subject: [PATCH] Bug 17352: synchronize the file before renaming
-
-Dbus is doing atomic file updates by copying them, changing
-the copy, and re-naming them. However, it does not synchronize
-the file before re-naming, which results in corruption in
-case of unclean reboots. The reason for this is that file-systems
-have write-back cache and they postpone writing data to the media.
-
-This patch adds the missed fsync() for the Unix part. I do
-not have windows so cannot provide a windows port fix.
-
-Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
----
- dbus/dbus-sysdeps-unix.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index 33f56ff..3f963bc 100644
---- a/dbus/dbus-sysdeps-unix.c
-+++ b/dbus/dbus-sysdeps-unix.c
-@@ -2224,6 +2224,15 @@ _dbus_string_save_to_file (const DBusString *str,
-       total += bytes_written;
-     }
- 
-+  if (fsync(fd))
-+    {
-+      dbus_set_error (error, _dbus_error_from_errno (errno),
-+                      "Could not synchronize file %s: %s",
-+                      tmp_filename_c, _dbus_strerror (errno));
-+
-+      goto out;
-+  }
-+
-   if (!_dbus_close (fd, NULL))
-     {
-       dbus_set_error (error, _dbus_error_from_errno (errno),
--- 
-1.5.6
-

Modified: projects/haf/trunk/dbus/debian/patches/series
===================================================================
--- projects/haf/trunk/dbus/debian/patches/series	2008-12-18 16:45:07 UTC (rev 17005)
+++ projects/haf/trunk/dbus/debian/patches/series	2008-12-19 06:26:21 UTC (rev 17006)
@@ -16,4 +16,3 @@
 21-add-missing-va_end.patch
 22-use-signed-return-value.patch
 32-add-oom-check-to-main.patch
-90-atomic-file-change-sync.patch
More information about the maemo-commits mailing list