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

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-06-28 00:57:31 +0300 (Sat, 28 Jun 2008)
New Revision: 15695

Removed:
   projects/haf/trunk/dbus/debian/patches/03-config.patch
   projects/haf/trunk/dbus/debian/patches/06-disable-noreturn-attrs.patch
   projects/haf/trunk/dbus/debian/patches/15-increase-session-limits.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
Remove patches

Either merged upstream, or they were plain wrong.


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2008-06-27 21:11:45 UTC (rev 15694)
+++ projects/haf/trunk/dbus/debian/changelog	2008-06-27 21:57:31 UTC (rev 15695)
@@ -8,6 +8,7 @@
     - 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.
+    - debian/patches/15-increase-session-limits.patch: Likewise.
     - debian/patches/16-fix-socket-call-check.patch: Likewise.
     - debian/patches/19-fix-segfault-in-case-of-NULL.patch: Likewise.
     - debian/patches/23-add-NULL-check.patch: Likewise.
@@ -23,6 +24,8 @@
     - debian/patches/34-remove-unused-function.patch: Likewise.
     - debian/patches/35-unref-no-guid-connections.patch: Likewise.
     - debian/patches/36-remove-deadcode.patch: Likewise.
+    - debian/patches/03-config.patch: Remove, change not good.
+    - debian/patches/06-disable-noreturn-attrs.patch: Likewise.
     - debian/patches/01-add-initgroups-call.patch: Refresh.
     - debian/patches/02-allow-all-in-session.patch: Likewise.
     - debian/patches/03-config.patch: Likewise.

Deleted: projects/haf/trunk/dbus/debian/patches/03-config.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/03-config.patch	2008-06-27 21:11:45 UTC (rev 15694)
+++ projects/haf/trunk/dbus/debian/patches/03-config.patch	2008-06-27 21:57:31 UTC (rev 15695)
@@ -1,13 +0,0 @@
-Index: b/bus/system.conf.in
-===================================================================
---- a/bus/system.conf.in	2008-04-04 18:24:08.000000000 +0300
-+++ b/bus/system.conf.in	2008-06-09 20:12:11.000000000 +0300
-@@ -26,6 +26,8 @@
-   <!-- This is a setuid helper that is used to launch system services -->
-   <servicehelper>@DBUS_LIBEXECDIR@/dbus-daemon-launch-helper</servicehelper>
- 
-+  <servicedir>@EXPANDED_DATADIR@/dbus-1/services</servicedir>
-+
-   <!-- Write a pid file -->
-   <pidfile>@DBUS_SYSTEM_PID_FILE@</pidfile>
- 

Deleted: projects/haf/trunk/dbus/debian/patches/06-disable-noreturn-attrs.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/06-disable-noreturn-attrs.patch	2008-06-27 21:11:45 UTC (rev 15694)
+++ projects/haf/trunk/dbus/debian/patches/06-disable-noreturn-attrs.patch	2008-06-27 21:57:31 UTC (rev 15695)
@@ -1,17 +0,0 @@
-Index: b/dbus/dbus-sysdeps.h
-===================================================================
---- a/dbus/dbus-sysdeps.h	2008-04-04 18:24:08.000000000 +0300
-+++ b/dbus/dbus-sysdeps.h	2008-06-09 20:12:22.000000000 +0300
-@@ -81,8 +81,12 @@ typedef struct DBusCredentials DBusCrede
- #if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
- #define _DBUS_GNUC_PRINTF( format_idx, arg_idx )    \
-   __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-+#ifndef __arm__
- #define _DBUS_GNUC_NORETURN                         \
-   __attribute__((__noreturn__))
-+#else  /* !__arm__ */
-+#define _DBUS_GNUC_NORETURN
-+#endif
- #else   /* !__GNUC__ */
- #define _DBUS_GNUC_PRINTF( format_idx, arg_idx )
- #define _DBUS_GNUC_NORETURN

Deleted: projects/haf/trunk/dbus/debian/patches/15-increase-session-limits.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/15-increase-session-limits.patch	2008-06-27 21:11:45 UTC (rev 15694)
+++ projects/haf/trunk/dbus/debian/patches/15-increase-session-limits.patch	2008-06-27 21:57:31 UTC (rev 15695)
@@ -1,32 +0,0 @@
-Index: b/bus/session.conf.in
-===================================================================
---- a/bus/session.conf.in	2008-06-09 20:12:35.000000000 +0300
-+++ b/bus/session.conf.in	2008-06-09 20:12:41.000000000 +0300
-@@ -59,4 +59,27 @@
-   <limit name="max_replies_per_connection">50000</limit>
-   <limit name="reply_timeout">300000</limit>
- 
-+  <!-- For the session bus, override the default relatively-low limits 
-+       with essentially infinite limits, since the bus is just running 
-+       as the user anyway, using up bus resources is not something we need 
-+       to worry about. In some cases, we do set the limits lower than 
-+       "all available memory" if exceeding the limit is almost certainly a bug, 
-+       having the bus enforce a limit is nicer than a huge memory leak. But the 
-+       intent is that these limits should never be hit. -->
-+
-+  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
-+  <limit name="max_incoming_bytes">1000000000</limit>
-+  <limit name="max_outgoing_bytes">1000000000</limit>
-+  <limit name="max_message_size">1000000000</limit>
-+  <limit name="service_start_timeout">120000</limit>  
-+  <limit name="auth_timeout">240000</limit>
-+  <limit name="max_completed_connections">100000</limit>  
-+  <limit name="max_incomplete_connections">10000</limit>
-+  <limit name="max_connections_per_user">100000</limit>
-+  <limit name="max_pending_service_starts">10000</limit>
-+  <limit name="max_names_per_connection">50000</limit>
-+  <limit name="max_match_rules_per_connection">50000</limit>
-+  <limit name="max_replies_per_connection">50000</limit>
-+  <limit name="reply_timeout">300000</limit>
-+
- </busconfig>