--- dbus-1.2.16.orig/debian/compat
+++ dbus-1.2.16/debian/compat
@@ -0,0 +1 @@
+7
--- dbus-1.2.16.orig/debian/libdbus-1-3.symbols
+++ dbus-1.2.16/debian/libdbus-1-3.symbols
@@ -0,0 +1,220 @@
+libdbus-1.so.3 libdbus-1-3 #MINVER#
+ dbus_address_entries_free@Base 1.0.2
+ dbus_address_entry_get_method@Base 1.0.2
+ dbus_address_entry_get_value@Base 1.0.2
+ dbus_address_escape_value@Base 1.0.2
+ dbus_address_unescape_value@Base 1.0.2
+ dbus_bus_add_match@Base 1.0.2
+ dbus_bus_get@Base 1.0.2
+ dbus_bus_get_id@Base 1.1.1
+ dbus_bus_get_private@Base 1.0.2
+ dbus_bus_get_unique_name@Base 1.0.2
+ dbus_bus_get_unix_user@Base 1.0.2
+ dbus_bus_name_has_owner@Base 1.0.2
+ dbus_bus_register@Base 1.0.2
+ dbus_bus_release_name@Base 1.0.2
+ dbus_bus_remove_match@Base 1.0.2
+ dbus_bus_request_name@Base 1.0.2
+ dbus_bus_set_unique_name@Base 1.0.2
+ dbus_bus_start_service_by_name@Base 1.0.2
+ dbus_connection_add_filter@Base 1.0.2
+ dbus_connection_allocate_data_slot@Base 1.0.2
+ dbus_connection_borrow_message@Base 1.0.2
+ dbus_connection_close@Base 1.0.2
+ dbus_connection_dispatch@Base 1.0.2
+ dbus_connection_flush@Base 1.0.2
+ dbus_connection_free_data_slot@Base 1.0.2
+ dbus_connection_free_preallocated_send@Base 1.0.2
+ dbus_connection_get_adt_audit_session_data@Base 1.2.4
+ dbus_connection_get_data@Base 1.0.2
+ dbus_connection_get_dispatch_status@Base 1.0.2
+ dbus_connection_get_is_anonymous@Base 1.1.1
+ dbus_connection_get_is_authenticated@Base 1.0.2
+ dbus_connection_get_is_connected@Base 1.0.2
+ dbus_connection_get_max_message_size@Base 1.0.2
+ dbus_connection_get_max_received_size@Base 1.0.2
+ dbus_connection_get_object_path_data@Base 1.0.2
+ dbus_connection_get_outgoing_size@Base 1.0.2
+ dbus_connection_get_server_id@Base 1.1.1
+ dbus_connection_get_socket@Base 1.0.2
+ dbus_connection_get_unix_fd@Base 1.0.2
+ dbus_connection_get_unix_process_id@Base 1.0.2
+ dbus_connection_get_unix_user@Base 1.0.2
+ dbus_connection_get_windows_user@Base 1.1.1
+ dbus_connection_has_messages_to_send@Base 1.0.2
+ dbus_connection_list_registered@Base 1.0.2
+ dbus_connection_open@Base 1.0.2
+ dbus_connection_open_private@Base 1.0.2
+ dbus_connection_pop_message@Base 1.0.2
+ dbus_connection_preallocate_send@Base 1.0.2
+ dbus_connection_read_write@Base 1.0.2
+ dbus_connection_read_write_dispatch@Base 1.0.2
+ dbus_connection_ref@Base 1.0.2
+ dbus_connection_register_fallback@Base 1.0.2
+ dbus_connection_register_object_path@Base 1.0.2
+ dbus_connection_remove_filter@Base 1.0.2
+ dbus_connection_return_message@Base 1.0.2
+ dbus_connection_send@Base 1.0.2
+ dbus_connection_send_preallocated@Base 1.0.2
+ dbus_connection_send_with_reply@Base 1.0.2
+ dbus_connection_send_with_reply_and_block@Base 1.0.2
+ dbus_connection_set_allow_anonymous@Base 1.1.1
+ dbus_connection_set_change_sigpipe@Base 1.0.2
+ dbus_connection_set_data@Base 1.0.2
+ dbus_connection_set_dispatch_status_function@Base 1.0.2
+ dbus_connection_set_exit_on_disconnect@Base 1.0.2
+ dbus_connection_set_max_message_size@Base 1.0.2
+ dbus_connection_set_max_received_size@Base 1.0.2
+ dbus_connection_set_route_peer_messages@Base 1.0.2
+ dbus_connection_set_timeout_functions@Base 1.0.2
+ dbus_connection_set_unix_user_function@Base 1.0.2
+ dbus_connection_set_wakeup_main_function@Base 1.0.2
+ dbus_connection_set_watch_functions@Base 1.0.2
+ dbus_connection_set_windows_user_function@Base 1.1.1
+ dbus_connection_steal_borrowed_message@Base 1.0.2
+ dbus_connection_try_register_fallback@Base 1.1.4
+ dbus_connection_try_register_object_path@Base 1.1.4
+ dbus_connection_unref@Base 1.0.2
+ dbus_connection_unregister_object_path@Base 1.0.2
+ dbus_error_free@Base 1.0.2
+ dbus_error_has_name@Base 1.0.2
+ dbus_error_init@Base 1.0.2
+ dbus_error_is_set@Base 1.0.2
+ dbus_free@Base 1.0.2
+ dbus_free_string_array@Base 1.0.2
+ dbus_get_local_machine_id@Base 1.0.2
+ dbus_get_version@Base 1.1.4
+ dbus_internal_do_not_use_create_uuid@Base 1.0.2
+ dbus_internal_do_not_use_get_uuid@Base 1.0.2
+ dbus_malloc0@Base 1.0.2
+ dbus_malloc@Base 1.0.2
+ dbus_message_allocate_data_slot@Base 1.0.2
+ dbus_message_append_args@Base 1.0.2
+ dbus_message_append_args_valist@Base 1.0.2
+ dbus_message_copy@Base 1.0.2
+ dbus_message_demarshal@Base 1.1.1
+ dbus_message_demarshal_bytes_needed@Base 1.2.14
+ dbus_message_free_data_slot@Base 1.0.2
+ dbus_message_get_args@Base 1.0.2
+ dbus_message_get_args_valist@Base 1.0.2
+ dbus_message_get_auto_start@Base 1.0.2
+ dbus_message_get_data@Base 1.0.2
+ dbus_message_get_destination@Base 1.0.2
+ dbus_message_get_error_name@Base 1.0.2
+ dbus_message_get_interface@Base 1.0.2
+ dbus_message_get_member@Base 1.0.2
+ dbus_message_get_no_reply@Base 1.0.2
+ dbus_message_get_path@Base 1.0.2
+ dbus_message_get_path_decomposed@Base 1.0.2
+ dbus_message_get_reply_serial@Base 1.0.2
+ dbus_message_get_sender@Base 1.0.2
+ dbus_message_get_serial@Base 1.0.2
+ dbus_message_get_signature@Base 1.0.2
+ dbus_message_get_type@Base 1.0.2
+ dbus_message_has_destination@Base 1.0.2
+ dbus_message_has_interface@Base 1.0.2
+ dbus_message_has_member@Base 1.0.2
+ dbus_message_has_path@Base 1.0.2
+ dbus_message_has_sender@Base 1.0.2
+ dbus_message_has_signature@Base 1.0.2
+ dbus_message_is_error@Base 1.0.2
+ dbus_message_is_method_call@Base 1.0.2
+ dbus_message_is_signal@Base 1.0.2
+ dbus_message_iter_abandon_container@Base 1.2.16
+ dbus_message_iter_append_basic@Base 1.0.2
+ dbus_message_iter_append_fixed_array@Base 1.0.2
+ dbus_message_iter_close_container@Base 1.0.2
+ dbus_message_iter_get_arg_type@Base 1.0.2
+ dbus_message_iter_get_array_len@Base 1.0.2
+ dbus_message_iter_get_basic@Base 1.0.2
+ dbus_message_iter_get_element_type@Base 1.0.2
+ dbus_message_iter_get_fixed_array@Base 1.0.2
+ dbus_message_iter_get_signature@Base 1.0.2
+ dbus_message_iter_has_next@Base 1.0.2
+ dbus_message_iter_init@Base 1.0.2
+ dbus_message_iter_init_append@Base 1.0.2
+ dbus_message_iter_next@Base 1.0.2
+ dbus_message_iter_open_container@Base 1.0.2
+ dbus_message_iter_recurse@Base 1.0.2
+ dbus_message_lock@Base 1.2.14
+ dbus_message_marshal@Base 1.1.1
+ dbus_message_new@Base 1.0.2
+ dbus_message_new_error@Base 1.0.2
+ dbus_message_new_error_printf@Base 1.0.2
+ dbus_message_new_method_call@Base 1.0.2
+ dbus_message_new_method_return@Base 1.0.2
+ dbus_message_new_signal@Base 1.0.2
+ dbus_message_ref@Base 1.0.2
+ dbus_message_set_auto_start@Base 1.0.2
+ dbus_message_set_data@Base 1.0.2
+ dbus_message_set_destination@Base 1.0.2
+ dbus_message_set_error_name@Base 1.0.2
+ dbus_message_set_interface@Base 1.0.2
+ dbus_message_set_member@Base 1.0.2
+ dbus_message_set_no_reply@Base 1.0.2
+ dbus_message_set_path@Base 1.0.2
+ dbus_message_set_reply_serial@Base 1.0.2
+ dbus_message_set_sender@Base 1.0.2
+ dbus_message_set_serial@Base 1.2.14
+ dbus_message_type_from_string@Base 1.0.2
+ dbus_message_type_to_string@Base 1.0.2
+ dbus_message_unref@Base 1.0.2
+ dbus_move_error@Base 1.0.2
+ dbus_parse_address@Base 1.0.2
+ dbus_pending_call_allocate_data_slot@Base 1.0.2
+ dbus_pending_call_block@Base 1.0.2
+ dbus_pending_call_cancel@Base 1.0.2
+ dbus_pending_call_free_data_slot@Base 1.0.2
+ dbus_pending_call_get_completed@Base 1.0.2
+ dbus_pending_call_get_data@Base 1.0.2
+ dbus_pending_call_ref@Base 1.0.2
+ dbus_pending_call_set_data@Base 1.0.2
+ dbus_pending_call_set_notify@Base 1.0.2
+ dbus_pending_call_steal_reply@Base 1.0.2
+ dbus_pending_call_unref@Base 1.0.2
+ dbus_realloc@Base 1.0.2
+ dbus_server_allocate_data_slot@Base 1.0.2
+ dbus_server_disconnect@Base 1.0.2
+ dbus_server_free_data_slot@Base 1.0.2
+ dbus_server_get_address@Base 1.0.2
+ dbus_server_get_data@Base 1.0.2
+ dbus_server_get_id@Base 1.1.1
+ dbus_server_get_is_connected@Base 1.0.2
+ dbus_server_listen@Base 1.0.2
+ dbus_server_ref@Base 1.0.2
+ dbus_server_set_auth_mechanisms@Base 1.0.2
+ dbus_server_set_data@Base 1.0.2
+ dbus_server_set_new_connection_function@Base 1.0.2
+ dbus_server_set_timeout_functions@Base 1.0.2
+ dbus_server_set_watch_functions@Base 1.0.2
+ dbus_server_unref@Base 1.0.2
+ dbus_set_error@Base 1.0.2
+ dbus_set_error_const@Base 1.0.2
+ dbus_set_error_from_message@Base 1.0.2
+ dbus_shutdown@Base 1.0.2
+ dbus_signature_iter_get_current_type@Base 1.0.2
+ dbus_signature_iter_get_element_type@Base 1.0.2
+ dbus_signature_iter_get_signature@Base 1.0.2
+ dbus_signature_iter_init@Base 1.0.2
+ dbus_signature_iter_next@Base 1.0.2
+ dbus_signature_iter_recurse@Base 1.0.2
+ dbus_signature_validate@Base 1.0.2
+ dbus_signature_validate_single@Base 1.0.2
+ dbus_threads_init@Base 1.0.2
+ dbus_threads_init_default@Base 1.0.2
+ dbus_timeout_get_data@Base 1.0.2
+ dbus_timeout_get_enabled@Base 1.0.2
+ dbus_timeout_get_interval@Base 1.0.2
+ dbus_timeout_handle@Base 1.0.2
+ dbus_timeout_set_data@Base 1.0.2
+ dbus_type_is_basic@Base 1.0.2
+ dbus_type_is_container@Base 1.0.2
+ dbus_type_is_fixed@Base 1.0.2
+ dbus_watch_get_data@Base 1.0.2
+ dbus_watch_get_enabled@Base 1.0.2
+ dbus_watch_get_fd@Base 1.0.2
+ dbus_watch_get_flags@Base 1.0.2
+ dbus_watch_get_socket@Base 1.1.1
+ dbus_watch_get_unix_fd@Base 1.1.1
+ dbus_watch_handle@Base 1.0.2
+ dbus_watch_set_data@Base 1.0.2
--- dbus-1.2.16.orig/debian/dbus-1-doc.links
+++ dbus-1.2.16/debian/dbus-1-doc.links
@@ -0,0 +1 @@
+usr/share/doc/dbus-1-doc/html usr/share/gtk-doc/html/dbus
--- dbus-1.2.16.orig/debian/doxygen_to_devhelp.xsl
+++ dbus-1.2.16/debian/doxygen_to_devhelp.xsl
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .html#
+
+
+
+
+
+
+
+
--- dbus-1.2.16.orig/debian/dbus.postrm
+++ dbus-1.2.16/debian/dbus.postrm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ] ; then
+ rmdir /var/run/dbus || true
+
+ rm -f /var/lib/dbus/machine-id
+ rmdir /var/lib/dbus || true
+fi
+
+#DEBHELPER#
+
+exit 0
--- dbus-1.2.16.orig/debian/libdbus-1-3.install
+++ dbus-1.2.16/debian/libdbus-1-3.install
@@ -0,0 +1 @@
+debian/tmp/lib/libdbus-1*.so.*
--- dbus-1.2.16.orig/debian/watch
+++ dbus-1.2.16/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+http://dbus.freedesktop.org/releases/dbus/dbus-(.*)\.tar\.gz
+
--- dbus-1.2.16.orig/debian/dbus.upstart
+++ dbus-1.2.16/debian/dbus.upstart
@@ -0,0 +1,23 @@
+# dbus - D-Bus system message bus
+#
+# The D-Bus system message bus allows system daemons and user applications
+# to communicate.
+
+description "D-Bus system message bus"
+
+start on local-filesystems
+stop on runlevel [06]
+
+expect fork
+respawn
+
+pre-start script
+ mkdir -p /var/run/dbus
+ chown messagebus:messagebus /var/run/dbus
+
+ exec dbus-uuidgen --ensure
+end script
+
+exec dbus-daemon --system --fork
+
+post-start exec kill -USR1 1
--- dbus-1.2.16.orig/debian/dbus.postinst
+++ dbus-1.2.16/debian/dbus.postinst
@@ -0,0 +1,53 @@
+#!/bin/sh
+# Copyright © 2003 Colin Walters
+# Copyright © 2006 Sjoerd Simons
+
+set -e
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+LAUNCHER=/lib/dbus-1.0/dbus-daemon-launch-helper
+
+if [ "$1" = configure ]; then
+ if [ ! -d $MESSAGEHOME ]; then
+ mkdir -p $MESSAGEHOME
+ fi
+ adduser --system \
+ --home "$MESSAGEHOME" \
+ --no-create-home \
+ --disabled-password \
+ --group "$MESSAGEUSER"
+
+ if ! dpkg-statoverride --list "$LAUNCHER" >/dev/null 2>&1; then
+ chown root:"$MESSAGEUSER" "$LAUNCHER"
+ chmod 4754 "$LAUNCHER"
+ fi
+fi
+
+# update init script symlinks for new runlevels and priorities for upgrades
+# from older versions
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.1.20-1; then
+ echo "Reinstalling init script for new runlevels and priorities ..." >&2
+ # remove old init script symlinks; dh_installinit adds the proper
+ # update-rc.d snippet later on
+ update-rc.d -f dbus remove >/dev/null
+fi
+
+if [ "$1" = configure ] && [ -n "$2" ]; then
+ # Do not restart dbus on upgrades, only on fresh installations.
+ # (dh_installinit -r creates a start action)
+ # But do reload it so the machine-id can be generated
+ PID=$(status "dbus" 2>/dev/null | awk '/[0-9]$/ { print $NF }')
+ if [ -n "$PID" ]; then
+ # trigger an update notification which recommends to reboot
+ [ -x /usr/share/update-notifier/notify-reboot-required ] && \
+ /usr/share/update-notifier/notify-reboot-required || true
+ dbus-uuidgen --ensure
+ dbus-send --print-reply --system --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig > /dev/null || true
+ fi
+fi
+
+#DEBHELPER#
+
--- dbus-1.2.16.orig/debian/dbus-1-doc.install
+++ dbus-1.2.16/debian/dbus-1-doc.install
@@ -0,0 +1,6 @@
+doc/dbus-specification.html usr/share/doc/dbus-1-doc
+doc/dbus-test-plan.html usr/share/doc/dbus-1-doc
+doc/dcop-howto.txt usr/share/doc/dbus-1-doc
+doc/api/html/* usr/share/doc/dbus-1-doc/html/api
+dbus.devhelp usr/share/doc/dbus-1-doc/html
+doc/dbus-{faq,specification,tutorial}.html usr/share/doc/dbus-1-doc/html
--- dbus-1.2.16.orig/debian/control
+++ dbus-1.2.16/debian/control
@@ -0,0 +1,125 @@
+Source: dbus
+Section: devel
+Priority: optional
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Utopia Maintenance Team
+Uploaders: Sjoerd Simons ,
+ Sebastian Dröge ,
+ Michael Biebl ,
+ Loic Minier ,
+ Simon McVittie
+Build-Depends: cdbs (>= 0.4.43),
+ debhelper (>= 7.3.15ubuntu2),
+ autotools-dev,
+ libexpat-dev,
+ doxygen,
+ docbook-utils,
+ xmlto,
+ xsltproc,
+ libx11-dev,
+ libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ quilt
+Standards-Version: 3.8.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus
+Homepage: http://dbus.freedesktop.org/
+
+Package: dbus
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ adduser,
+ lsb-base (>= 3.2-14),
+ upstart (>= 0.6.3-6)
+Recommends: consolekit (>= 0.2.3-3ubuntu2)
+Conflicts: dbus-1-utils (<< 1.0.2-5)
+Replaces: dbus-1-utils (<< 1.0.2-5)
+Provides: dbus-1-utils
+Suggests: dbus-x11
+Description: simple interprocess messaging system
+ D-Bus is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ D-Bus supports broadcast messages, asynchronous messages (thus
+ decreasing latency), authentication, and more. It is designed to be
+ low-overhead; messages are sent using a binary protocol, not using
+ XML. D-Bus also supports a method call mapping for its messages, but
+ it is not required; this makes using the system quite simple.
+ .
+ It comes with several bindings, including GLib, Python, Qt and Java.
+ .
+ This package contains the D-Bus daemon and related utilities.
+ .
+ The client-side library can be found in the libdbus-1-3 package, as it is no
+ longer contained in this package.
+
+Package: dbus-x11
+Architecture: any
+Section: x11
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ dbus
+Conflicts: dbus (<< 1.1.2)
+Replaces: dbus (<< 1.1.2)
+Description: simple interprocess messaging system (X11 deps)
+ D-Bus is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ This package contains the dbus-launch utility which is necessary for
+ packages using a D-Bus session bus.
+ .
+ See the dbus description for more information about D-Bus in general.
+
+Package: libdbus-1-3
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: dbus
+Section: libs
+Conflicts: dbus (<< 0.60)
+Description: simple interprocess messaging system
+ D-Bus is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ D-Bus supports broadcast messages, asynchronous messages (thus
+ decreasing latency), authentication, and more. It is designed to be
+ low-overhead; messages are sent using a binary protocol, not using
+ XML. D-Bus also supports a method call mapping for its messages, but
+ it is not required; this makes using the system quite simple.
+ .
+ It comes with several bindings, including GLib, Python, Qt and Java.
+ .
+ The daemon can be found in the dbus package.
+
+Package: dbus-1-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libdbus-1-dev
+Description: simple interprocess messaging system (documentation)
+ D-Bus is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ This package contains the API documentation for D-Bus, as well as
+ the protocol specification.
+ .
+ See the dbus description for more information about D-Bus in general.
+
+Package: libdbus-1-dev
+Section: libdevel
+Architecture: any
+Depends: libdbus-1-3 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+ pkg-config
+Description: simple interprocess messaging system (development headers)
+ D-Bus is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ See the dbus description for more information about D-Bus in general.
+
--- dbus-1.2.16.orig/debian/dbus.init
+++ dbus-1.2.16/debian/dbus.init
@@ -0,0 +1,168 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: dbus
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 1
+# Short-Description: D-Bus systemwide message bus
+# Description: D-Bus is a simple interprocess messaging system, used
+# for sending messages between applications.
+### END INIT INFO
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters
+# Copyright © 2005 Sjoerd Simons
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+UUIDGEN=/usr/bin/dbus-uuidgen
+UUIDGEN_OPTS=--ensure
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+DESC="system message bus"
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+# Source defaults file; edit that file to configure this script.
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+ . /etc/default/dbus
+fi
+
+create_machineid() {
+ # Create machine-id file
+ if [ -x $UUIDGEN ]; then
+ $UUIDGEN $UUIDGEN_OPTS
+ fi
+}
+
+dependent_services()
+{
+ # Do nothing if we are called by init
+ [ ! -z $runlevel ] && return
+
+ # Determine current runlevel
+ r=$(/sbin/runlevel) || true
+ r=${r#*\ }
+
+ # Do nothing if we can't determine the runlevel (e.g. inside chroots)
+ [ "$r" = "unknown" ] && return
+
+ if [ "$1" = "stop" ] ; then
+ param="--reverse"
+ action="stop"
+ else
+ param=""
+ action="start"
+ fi
+
+ # Get the list of services active in this runlevel
+ if [ -d /etc/rc${r}.d/ ] ; then # sysv-rc
+ services=$(grep -s -l "^# Required-Start:.*dbus" /etc/rc${r}.d/S??* | sort $param)
+ elif [ -f /etc/runlevel.conf ] ; then # file-rc
+ list=$(grep -s -l "^# Required-Start:.*dbus" /etc/init.d/* || true)
+ services=$( for i in $list ; do
+ grep -E "^[[:digit:]]{2}[[:space:]]+([0-9,S]+|[-])[[:space:]]+.*$r.*[[:space:]]+$i$" /etc/runlevel.conf
+ done | sort $param | awk '{print $4}' )
+ else
+ services=""
+ log_warning_msg "Unable to determine dependent services: unknown init system"
+ fi
+
+ # Start the services in the correct order
+ for i in $services ; do
+ service=$(basename $i)
+ service=${service#S??}
+ invoke-rc.d $service $action || true
+ done
+
+}
+
+
+start_it_up()
+{
+ if [ ! -d $PIDDIR ]; then
+ mkdir -p $PIDDIR
+ chown $DAEMONUSER $PIDDIR
+ chgrp $DAEMONUSER $PIDDIR
+ fi
+
+ if ! mountpoint -q /proc/ ; then
+ log_failure_msg "Can't start $DESC - /proc is not mounted"
+ return
+ fi
+
+ if [ -e $PIDFILE ]; then
+ PIDDIR=/proc/$(cat $PIDFILE)
+ if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+ log_success_msg "$DESC already started; not starting."
+ return
+ else
+ log_success_msg "Removing stale PID file $PIDFILE."
+ rm -f $PIDFILE
+ fi
+ fi
+
+ create_machineid
+
+ log_daemon_msg "Starting $DESC" "$NAME"
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+ log_end_msg $?
+ dependent_services start
+}
+
+shut_it_down()
+{
+ dependent_services stop
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ start-stop-daemon --stop --retry 5 --quiet --oknodo --pidfile $PIDFILE \
+ --user $DAEMONUSER
+ # We no longer include these arguments so that start-stop-daemon
+ # can do its job even given that we may have been upgraded.
+ # We rely on the pidfile being sanely managed
+ # --exec $DAEMON -- --system $PARAMS
+ log_end_msg $?
+ rm -f $PIDFILE
+}
+
+reload_it()
+{
+ create_machineid
+ log_action_begin_msg "Reloading $DESC config"
+ dbus-send --print-reply --system --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig > /dev/null
+ # hopefully this is enough time for dbus to reload it's config file.
+ log_action_end_msg $?
+}
+
+case "$1" in
+ start)
+ start_it_up
+ ;;
+ stop)
+ shut_it_down
+ ;;
+ reload|force-reload)
+ reload_it
+ ;;
+ restart)
+ shut_it_down
+ start_it_up
+ ;;
+ status)
+ status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
+ ;;
+ *)
+ echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload|status}" >&2
+ exit 2
+ ;;
+esac
+
--- dbus-1.2.16.orig/debian/changelog
+++ dbus-1.2.16/debian/changelog
@@ -0,0 +1,1478 @@
+dbus (1.2.16-2ubuntu4.3) lucid-security; urgency=low
+
+ * SECURITY UPDATE: denial of service via messages with non-native byte order
+ - debian/patches/99-CVE-2011-2200.patch: update dbus-marshal-header.c
+ to verify header->data byte order and header->byte_order match in
+ _dbus_header_byteswap()
+ - CVE-2011-2200
+
+ -- Jamie Strandboge Fri, 22 Jul 2011 09:07:19 -0500
+
+dbus (1.2.16-2ubuntu4.2) lucid-proposed; urgency=low
+
+ * Prevent dbus.postinst from failing in chroots (LP: #552404)
+
+ -- Alkis Georgopoulos Fri, 21 Jan 2011 12:55:56 +0200
+
+dbus (1.2.16-2ubuntu4.1) lucid-security; urgency=low
+
+ * SECURITY UPDATE: fix DoS with too deeply nested messages
+ - debian/patches/99-CVE-2010-4352.patch: Limit nesting to 64 for dynamic
+ message variants. Backported from upstream.
+ - CVE-2010-4352
+ - LP: #688992
+
+ -- Jamie Strandboge Tue, 04 Jan 2011 14:33:58 -0600
+
+dbus (1.2.16-2ubuntu4) lucid; urgency=low
+
+ * Add debian/dbus.links: provide a symlink for dbus-daemon-launch-helper's
+ old location in /usr, to provide a more stable upgrade from Hardy. This
+ can be dropped in Lucid+1. (LP: #551672)
+
+ -- Martin Pitt Tue, 30 Mar 2010 16:28:07 +0200
+
+dbus (1.2.16-2ubuntu3) lucid; urgency=low
+
+ * debian/dbus-Xsession: Use new "has_option" function from x11-common
+ instead of grepping the option file, to avoid calling an external program.
+
+ -- Martin Pitt Fri, 19 Feb 2010 07:35:37 +0100
+
+dbus (1.2.16-2ubuntu2) lucid; urgency=low
+
+ * Fix installation of dbus-arch-deps.h.
+
+ -- Martin Pitt Tue, 08 Dec 2009 10:54:12 +0100
+
+dbus (1.2.16-2ubuntu1) lucid; urgency=low
+
+ * Merge with Debian testing; Remaining Ubuntu changes:
+ - Install into / rather than /usr.
+ - debian/control: Depend on ConsoleKit for "at_console" policy stanza.
+ - debian/dbus.postinst: Do not restart dbus on upgrades, since it breaks
+ too many applications. Instead, trigger a "reboot required" notification.
+ - debian/dbus.postinst: Create /var/run/dbus in postinst to handle system
+ being rebooted before package is configured. LP: #275229.
+ - Add debian/dbus.upstart and bump debhelper b-dep to ensure that it is
+ properly installed.
+ - 11_timeout_handling.patch: Fix timeout accounting. The
+ elapsed_milliseconds contains the time from the start, so subtracting it
+ on every iteration means that the timeout is much less than what is
+ requested. Instead compare the absolute values, but pass the difference
+ to calls which want a timeout so that the correct remaining time is
+ used. (LP #376145)
+ - 20_system_conf_limit.patch: Increase max_match_rules_per_connection for
+ the system bus to 5000 (LP #454093)
+ - 81-session.conf-timeout.patch: Raise the service startup timeout from 25
+ to 60 seconds. It may be too short on the live CD with slow machines.
+
+ -- Martin Pitt Mon, 07 Dec 2009 17:47:06 +0100
+
+dbus (1.2.16-2) unstable; urgency=low
+
+ * Rebuild against debhelper (>= 7.2.23) that fixes a regression in
+ dh_install which did not correctly strip debian/tmp. (Closes: #537125)
+ * debian/patches/20_kbsd_cmsgcred.patch
+ - Fix incorrect usage of cmsgcred on kFreeBSD. Thanks to Aurelien Jarno
+ for the patch.
+ * debian/patches/30_rt-as-needed.patch
+ - Fix spurious build failures on alpha and ia64 when using -Wl,--as-needed
+ by changing the link order of libdbus-convenience.la and -lrt.
+
+ -- Michael Biebl Thu, 16 Jul 2009 02:03:18 +0200
+
+dbus (1.2.16-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/libdbus-1-3.symbols
+ - Update for API additions.
+ * debian/rules
+ - Bump shlibs to 1.2.16.
+ * Install libdbus to /lib. Upstart requires libdbus before /usr is
+ mounted. Keep the development files libdbus-1*.{a,so} in /usr/lib.
+ * Bump Standards-Version to 3.8.2. No further changes.
+
+ -- Michael Biebl Wed, 15 Jul 2009 00:39:18 +0200
+
+dbus (1.2.14-3) unstable; urgency=low
+
+ * debian/dbus.postinst
+ - Suppress output from adduser.
+ * debian/dbus.postrm
+ - Cleanup /var/lib/dbus on purge.
+ * debian/rules
+ - Compile dbus-daemon without -pie on mipsen. This is a workaround for a
+ toolchain bug on mipsen (#532821) which causes dbus-daemon to segfault.
+ (Closes: #528145)
+
+ -- Michael Biebl Wed, 17 Jun 2009 21:03:57 +0200
+
+dbus (1.2.14-2) unstable; urgency=low
+
+ * debian/dbus.postrm
+ - Add missing whitespace before ']'.
+
+ -- Michael Biebl Fri, 08 May 2009 23:30:35 +0200
+
+dbus (1.2.14-1) unstable; urgency=low
+
+ * New upstream release.
+ * Switch patch management system to quilt.
+ * Refresh and update patches.
+ * Remove debian/patches/20-dbus-alpha-unaligned.patch, fixed upstream.
+ * debian/control
+ - Drop dependency on debianutils as we no longer require run-parts.
+ - Demote dbus-x11 from Recommends to Suggests. (Closes: #479341)
+ * debian/libdbus-1-3.symbols
+ - Update for API additions.
+ * debian/rules
+ - Bump shlibs to 1.2.14.
+ - Add "-Wl,--as-needed" to LDFLAGS. This way we don't pick up any spurious
+ X11 dependencies. (Closes: #499650)
+ * debian/dbus.postinst
+ - Remove chown call for /var/run/dbus as the init script will take care of
+ setting the right permissions anyway. This also ensures that we don't
+ fail if /var/run is on tmpfs. (Closes: #508931)
+ * Bump Standards-Version to 3.8.1. No longer ship /var/run/dbus in the
+ package but let the init script create it.
+ * debian/dbus.install
+ - Remove /var/run/dbus directory.
+ * debian/dbus.postrm
+ - Remove /var/run/dbus on purge.
+
+ -- Michael Biebl Fri, 08 May 2009 14:31:33 +0200
+
+dbus (1.2.12-1) unstable; urgency=low
+
+ [ Simon McVittie ]
+ * New upstream release
+ * Merge experimental into unstable
+ - Changes in packaging relative to experimental: add myself to
+ Uploaders, and suggest libdbus-1-dev instead of nonexistent dbus-1-dev
+
+ [ Michael Biebl ]
+ * Drop support for /etc/dbus-1/event.d. This interface has long been
+ deprecated and all affected Debian packages have been fixed for lenny.
+ If your (custom) service needs to be restarted on a dbus restart, add a
+ regular sysv init script and "Required-Start: dbus" to the LSB header.
+ * debian/control
+ - Drop ancient Conflicts/Replaces which are from pre-oldstable (sarge).
+ - Bump debhelper Build-Depends to (>= 7).
+ * debian/compat
+ - Bump to debhelper v7 compat mode.
+ * debian/copyright
+ - Update AFL license to version 2.1.
+ - Make it clear that dbus is released under version 2 of the GPL and refer
+ to the versioned GPL-2 file in /usr/share/common-licenses.
+
+ -- Michael Biebl Mon, 16 Feb 2009 15:07:46 +0100
+
+dbus (1.2.8-1) experimental; urgency=low
+
+ [ Sjoerd Simons ]
+ * New upstream release
+ * Fixes CVE-2008-4311 (Closes: #503532, #508032)
+
+ [ Michael Biebl ]
+ * debian/libdbus-1-3.symbols
+ - Updated, new symbol has been added.
+ * debian/rules
+ - Bump shlibs to 1.2.4.
+ * debian/control
+ - Bump Standards-Version to 3.8.0. No further changes.
+
+ -- Sjoerd Simons Sun, 07 Dec 2008 13:30:19 +0000
+
+dbus (1.2.4-1) experimental; urgency=low
+
+ * New upstream release
+ * Remove patches that were merged upstream
+ - debian/patches/15_dbus_group_parsing.patch
+ - debian/patches/CVE-2008-3834.patch
+
+ -- Sjoerd Simons Sat, 29 Nov 2008 19:16:05 +0100
+
+dbus (1.2.1-5) unstable; urgency=high
+
+ [ Sjoerd Simons ]
+ * debian/patches/CVE-2008-4311.patch:
+ + Added, Fixes CVE-2008-4311. A mistake in the default configuration for
+ the system bus (system.conf) which made the default policy for both sent
+ and received messages effectively *allow*, and not deny as intended. This
+ patch fixes the send side permissions (Closes: #503532, #508032)
+ * Urgency high for the security fix
+
+ [ Simon McVittie ]
+ * Rename CVE-*.patch to prefix them with a sequence number so it's clear
+ what order they should apply in
+ * Add 51-CVE-2008-4311-but-allow-signals.patch, cherry-picked from upstream
+ git commit d899734475: after fixing CVE-2008-4311, re-allow emitting
+ signals
+ * debian/patches/3[0-4]*.patch, cherry-picked from upstream git (see patches
+ for commit IDs): add logging when permission to send a message is denied
+ * debian/patches/35-syslog-h.patch: #include to fix compilation
+ with the logging patches applied
+ * Add myself to Uploaders
+
+ -- Simon McVittie Sat, 10 Jan 2009 21:43:16 +0000
+
+dbus (1.2.1-4) unstable; urgency=high
+
+ * debian/patches/CVE-2008-3834.patch
+ - The dbus_signature_validate function in the D-bus library allows
+ attackers to cause a denial of service (application abort) via a message
+ containing a malformed signature, which triggers a failed assertion
+ error. (Closes: #501443)
+ Fixes: CVE-2008-3834
+ - Urgency high for the security fix.
+ * debian/patches/20-dbus-alpha-unaligned.patch
+ - Fix misaligned memory access which causes "unaligned traps" on Alpha.
+ (Closes: #502408)
+ * debian/dbus.init
+ - Add "status" action to init script. (Closes: #470121)
+ * debian/control
+ - Bump Depends on lsb-base to >= 3.2-14, which provides status_of_proc().
+
+ -- Michael Biebl Sat, 25 Oct 2008 15:28:05 +0200
+
+dbus (1.2.1-3) unstable; urgency=low
+
+ * debian/patches/15_dbus_group_parsing.patch
+ - Added. Fixes failure to parse /etc/group when it contains lines with
+ more then 512 chars (Closes: #489738) (From upstream git)
+
+ -- Sjoerd Simons Thu, 31 Jul 2008 00:04:21 +0100
+
+dbus (1.2.1-2) unstable; urgency=low
+
+ [ Sjoerd Simons ]
+ * debian/rules: Disable the disabling of the userdb cache. No other
+ distribution disables it and it is somewhat buggy (Thanks to Scott James
+ Remnant for pointing out this issue)
+
+ -- Sjoerd Simons Sat, 26 Apr 2008 12:41:47 +0200
+
+dbus (1.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/rules, debian/dbus.postinst
+ - Minimize downtime of the system message bus (and dependent D-Bus
+ services) by restarting dbus in postinst instead of stop in prerm and
+ start in postinst. (Closes: #428669)
+ * debian/libdbus-1-3.symbols
+ - Add symbols file for improved shared library dependencies.
+ * debian/shlibs.local
+ - This file has been neglected for quite some time and has been
+ obsoleted by the symbols file so better remove it.
+
+ -- Michael Biebl Fri, 11 Apr 2008 16:33:42 +0200
+
+dbus (1.1.20-1) unstable; urgency=medium
+
+ [ Loic Minier ]
+ * Forcefully remove old init script symlinks on upgrades to this version to
+ properly reinstall the init script when using insserv or file-rc; thanks
+ Petter Reinholdtsen; closes: #466503.
+
+ [ Michael Biebl ]
+ * New upstream release:
+ + SECURITY - CVE-2008-0595:
+ security policy of the type work as an implicit allow for messages sent without an
+ interface bypassing the default deny rules and potentially allowing
+ restricted methods exported on the bus to be executed by unauthorized
+ users.
+
+ -- Michael Biebl Thu, 28 Feb 2008 09:01:00 +0100
+
+dbus (1.1.4-1) unstable; urgency=low
+
+ [ Loic Minier ]
+ * Merge patch from Ubuntu to build a devhelp file; thanks Martin Pitt;
+ closes: #454142.
+ - Build-dep on xsltproc.
+ - New patch, dbus-1.0.1-generate-xml-docs, enables generation of XML docs
+ which serve as source for the devhelp generation.
+ - Add a XSLT file from the Fedora package, debian/doxygen_to_devhelp.xsl.
+ - Generate the devhelp file from the XML files thanks to the XSL file via
+ xsltproc in build/dbus-1-doc::.
+ - Install the devhelp index in dbus-1-doc and move the HTML documentation
+ around; add a symlink from the gtk-doc dir.
+ * Misc smallish whitespace cleanups.
+ * Start dbus at runlevel priority 12 and stop at priority 88. This
+ eliminates the race condition of starting the X session before hal is
+ running. Migrate rc?.d symlinks from 20 to 12/88 on upgrades. This need
+ to be kept until after lenny is released.
+ * Set LSB Default-Stop section to 1 and only install a shutdown script for
+ runlevel 1 to only stop dbus when going down to single user mode; dbus can
+ simply be killed like everything else on shutdown or reboot by sendsigs;
+ drop rc0 and rc6.d symlinks on upgrades.
+ * Bump up dbus-x11 conflicts/replaces to << 1.1.2 to match the transition
+ version in Ubuntu and reduce the delta.
+ * Cleanup trailing whitespace.
+ * Drop superfluous exit 0 at the end of dbus' init script which is set -e.
+ * Add ${shlibs:Depends} to libdbus-1-dev.
+ * Simplify dbus.postinst.
+ * Rename patch dbus-1.0.1-generate-xml-docs to
+ 10_dbus-1.0.1-generate-xml-docs to reflect current patch stack order.
+ * Set shlibs via DEB_DH_MAKESHLIBS_ARGS_ALL instead of libdbus-1-3.shlibs
+ and extract libdbus-1-3 package name from control to avoid hardcoding the
+ SONAME and package name.
+
+ [ Michael Biebl ]
+ * New upstream release.
+ * Deprecate the ENABLED option and remove it from /etc/default/dbus. Print a
+ warning message in the init script if this option is still used.
+ * debian/patches/03_uuid_nul.patch
+ - Removed, merged upstream.
+ * debian/patches/04_dbus_launch.patch
+ - Removed, merged upstream.
+ * debian/control
+ - Bump Standards-Version to 3.7.3. No further changes required.
+ * debian/dbus.init
+ - Fix LSB init header. Use $remote_fs instead of $local_fs as the
+ daemon requires /usr to be mounted.
+ Remove S from Should-Stop. (Closes: #459473)
+ - Use mountpoint to check if /proc is mounted. (Closes: #458392)
+ - Decrease retry-time to 5 secs on stop. (Closes: #462182)
+
+ -- Michael Biebl Tue, 04 Dec 2007 21:31:12 +0100
+
+dbus (1.1.2-1) unstable; urgency=low
+
+ [ Michael Biebl ]
+ * New upstream release.
+ * debian/control
+ - Use the new "Homepage:" field to specify the upstream URL.
+ - The Vcs-* fields are now officially supported, so remove the XS- prefix.
+ - Demote dbus-x11 dependency to a Recommends. (Closes: #427932)
+ * debian/dbus.install
+ - Install the dbus-daemon-launch-helper binary.
+ - Install the directory /usr/share/dbus-1/system-services.
+ * debian/dbus.postinst
+ - Install the dbus-daemon-launch-helper binary SUID root and make it
+ executable for the messagebus group.
+ - General cleanup. Remove superfluous addgroup and chgrp call.
+
+ [ Sjoerd Simons ]
+ * debian/dbus.init
+ - Warn if /proc isn't mounted and refuse to start (Closes: #431101, #447363)
+ * debian/patches/03_uuid_nul.patch
+ - Added. Don't accidentally overwrite the last byte of the uuid with nul
+ while autostarting. (From upstream GIT)
+ * debian/patches/04_dbus_launch.patch
+ - Added. Also save the session bus info in X11 on a normally launched bus.
+ This ensures apps that don't have a session bus address in their
+ environment can still properly connect to a DISPLAY's normal session bus.
+ Making hacks to determine which dbus address belongs to a DISPLAY as
+ used by some obsolete.
+
+ -- Sjoerd Simons Fri, 23 Nov 2007 11:33:00 +0100
+
+dbus (1.1.1-3) unstable; urgency=low
+
+ * List arches where the build-dep on libselinux1-dev doesn't apply; thanks
+ Michael Banck; closes: #430821.
+ * Wrap build-deps and deps.
+ * Misc cleanups, including quoting in maintainer scripts.
+ * Add myself as uploader.
+ * Add ${misc:Depends}.
+
+ -- Loic Minier Wed, 27 Jun 2007 16:42:08 +0200
+
+dbus (1.1.1-2) UNRELEASED; urgency=low
+
+ * debian/control
+ - Fix small typo in the dbus-x11 package description. (Closes: #430736)
+
+ -- Michael Biebl Wed, 27 Jun 2007 01:42:38 +0200
+
+
+dbus (1.1.1-1) unstable; urgency=low
+
+ [ Michael Biebl ]
+ * debian/patches/02_dbus_monitor_no_sigint_handler.patch
+ + Remove the sigint_handler in dbus-monitor so the application properly
+ terminates on STRG+C. (Closes: #414139)
+
+ [ Sjoerd Simons ]
+ * New upstream release
+ * debian/libdbus-1-3.shlibs: Bumped shlibs
+
+ -- Sjoerd Simons Tue, 19 Jun 2007 13:18:12 +0100
+
+dbus (1.1.0-1) unstable; urgency=low
+
+ [ Sjoerd Simons ]
+ * New upstream release
+
+ [ Tim Dijkstra ]
+ * Disable userdb cache. If you need a cache, use nscd. (closes: #370569)
+
+ [ Michael Biebl ]
+ * debian/control
+ + Fix small typo in the dbus-x11 package description. (Closes: #425132)
+ + Replace Source-Version with binary:Version for libdbus-1-dev.
+ * debian/dbus.init
+ + Suppress error messages about nonexistent or unreadable files.
+ (Closes: #426296)
+ + Do not abort on grep errors. (Closes: #423380)
+ + Do not abort if starting a dependent service fails.
+ * debian/control
+ + Add build dependency on autotools-dev for up-to-date config.{guess,sub}
+ files.
+
+ -- Michael Biebl Wed, 06 Jun 2007 15:39:23 +0200
+
+dbus (1.0.2-5) unstable; urgency=low
+
+ [ Michael Biebl ]
+ * debian/dbus.init
+ + Add some safety checks and support for file-rc. (Closes: #419984)
+ * Drop dbus-1-utils package and move dbus-monitor into the dbus package.
+ (Closes: #404981)
+ * Create dbus-x11 package and move dbus-launch and the Xsession start script
+ from dbus into this package. This removes the X11 dependency from the dbus
+ package.
+ Add a dependency on dbus-x11 to the dbus package, to not break packages
+ which still depend on dbus but should be updated to depend on dbus-x11
+ instead if they require a D-Bus session bus.
+
+ [ Sjoerd Simons ]
+ * debian/control: Add libselinux1-dev to build depends
+ * debian/rules: Clean up some more generated files (From the ubuntu
+ packaging)
+
+ -- Sjoerd Simons Thu, 03 May 2007 13:28:19 +0200
+
+dbus (1.0.2-4) unstable; urgency=low
+
+ * debian/dbus.init
+ + Properly quote the runlevel variable $r. (Closes: #419818)
+ * debian/dbus.prerm
+ + Removed empty maintainer script.
+
+ -- Michael Biebl Wed, 18 Apr 2007 19:16:13 +0200
+
+dbus (1.0.2-3) unstable; urgency=low
+
+ * debian/dbus.post{inst,rm}
+ + Restart dbus on upgrades again. Might break some applications, but they
+ should be fixed.
+ * debian/dbus.init
+ + Don't return an error, if start is called when there is already a bus
+ running.
+ * debian/dbus.init
+ + Handle errors from /sbin/runlevel. Fixes dbus installation in chroots.
+ (Closes: #419655)
+
+ -- Sjoerd Simons Tue, 17 Apr 2007 17:55:14 +0200
+
+dbus (1.0.2-2) unstable; urgency=low
+
+ [ Sebastian Dröge ]
+ * debian/control:
+ + Updated to use my debian.org mail address
+
+ [ Michael Biebl ]
+ * debian/control
+ + Add XS-Vcs-* fields.
+ + Add myself to Uploaders.
+ + Update description.
+ * debian/watch
+ + Added. Allows to track upstream releases.
+ * debian/dbus.init
+ + Add functionality to start/stop dbus dependent services based on their
+ LSB header.
+ Instead of installing an init script into /etc/dbus-1/event.d, services
+ depending on dbus should from now on install a regular sysv init script
+ and add an LSB header with "Required-Start: dbus".
+
+ -- Michael Biebl Fri, 13 Apr 2007 00:56:54 +0200
+
+dbus (1.0.2-1) unstable; urgency=high
+
+ * New upstream release:
+ + Urgency set to high because it fixes a local denial of service
+ exploit involving removal of match rules from other apps.
+ This effects all versions of D-Bus. CVE-2006-6107
+ https://bugs.freedesktop.org/show_bug.cgi?id=9142
+ * debian/patches/02_fix_thread_initialisation.patch:
+ + Dropped, merged upstream
+
+ -- Sebastian Dröge Tue, 12 Dec 2006 23:36:37 +0100
+
+dbus (1.0.1-2) unstable; urgency=medium
+
+ * There is no need anymore to install a custom session.conf. Also The custom
+ one doesn't include the new directive to look at various standard service
+ dirs.
+
+ -- Sjoerd Simons Sun, 19 Nov 2006 22:59:17 +0100
+
+dbus (1.0.1-1) unstable; urgency=medium
+
+ * New bugfix release
+ * Fixes bug where calling dbus_threads_init_default would assert
+ * debian/patches/02_fix_thread_initialisation.patch
+ + Fixes an assertion failure when using pthreads (From upstream CVS)
+ * Urgency medium, fixes two assertion failures.
+
+ -- Sjoerd Simons Sun, 19 Nov 2006 22:02:16 +0100
+
+dbus (1.0.0-1) unstable; urgency=low
+
+ [ Sebastian Dröge ]
+ * New upstream release, 1.0.0 aka "Blue Bird"
+ * debian/patches/01_no-fatal-warnings.patch:
+ + Don't abort on fatal warnings now by default. This behaviour can be
+ controlled by the DBUS_FATAL_WARNINGS enviroment variable.
+ This will be set to upstream default again at some point so if you have
+ an application that prints a DBus warning get it fixed.
+
+ [ Sjoerd Simons ]
+ * Target unstable. Since 0.94 only bugfixes and cleanups went in.
+ * Also generate the machine-id on reload if it doesn't exist and reload the
+ bus on upgrades. (Closes: #357247)
+ * patches/40_dbus_launch_get_uuid.patch
+ + Dropped, fixed upstream
+
+ -- Sjoerd Simons Tue, 14 Nov 2006 15:35:00 +0100
+
+dbus (0.95-1) experimental; urgency=low
+
+ * New upstream release (aka 1.0 RC3)
+ * debian/patches/10_dbus_uuid_in_var.patch,
+ debian/patches/20_dbus_uuid_world_readable.patch,
+ debian/patches/30_dbus_send_close_shared_connection.patch:
+ + Dropped, merged upstream
+ * debian/patches/99_rerun_automake.patch:
+ + Not needed anymore because of the above
+
+ -- Sebastian Dröge Sun, 5 Nov 2006 23:22:01 +0100
+
+dbus (0.94-2) unstable; urgency=medium
+
+ [ Sebastian Dröge ]
+ * debian/patches/30_dbus_send_close_shared_connection.patch:
+ + Don't close shared connection in dbus-send. (Closes: 395358, 397303)
+ Patch from upstream CVS
+
+ [ Sjoerd Simons ]
+ * patches/40_dbus_launch_get_uuid.patch
+ + Added. Check if get_machine_uuid() returns NULL before proceeding any
+ further: we can't init the X atoms or create a session file name if there
+ is no machine ID. Solves a dbus-launch crash if there is no machine id.
+ (Closes: 3395938) Patch from upstream CVS
+ * 2 important bugfixes, setting urgency to medium.
+
+ -- Sjoerd Simons Mon, 6 Nov 2006 22:02:19 +0100
+
+dbus (0.94-1) unstable; urgency=low
+
+ [ Riccardo Setti ]
+ * Fixed dbus description. (closes: #388186)
+ * Improved dbus.init script. (closes: #384859)
+ - Patch from David Härdeman Wed, 25 Oct 2006 11:26:32 +0200
+
+dbus (0.93-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/patches/00_expand_bindir.patch
+ - Removed. Fixed upstream
+ * debian/control: Build-depend on libx11-dev, so dbus-launch can monitor X
+ sessions.
+
+ -- Sjoerd Simons Sat, 16 Sep 2006 23:13:30 +0200
+
+dbus (0.92-2) unstable; urgency=low
+
+ * Upload to unstable
+ * debian/patches/00_expand_bindir.patch
+ - Added. Ensure the expanded version of $bindir is used for the
+ DBUS_DAEMONDIR define. Fixes useless warning from dbus-launch (From
+ upstream CVS)
+
+ -- Sjoerd Simons Thu, 7 Sep 2006 20:30:05 +0200
+
+dbus (0.92-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sjoerd Simons Sat, 19 Aug 2006 22:13:25 +0200
+
+dbus (0.91-1) experimental; urgency=low
+
+ * New upstream release
+ + First packaged dbus modular release. Bindings are in seperate source
+ packages now.
+ * Bumped libdbus-1 soname
+ * debian/control: Remove all build-depends and definitions for the bindings.
+ * debian/control: Update to use the official D-Bus spelling
+ * debian/rules: Remove everything that was needed to build the bindings.
+ * Remove files not applicable to the D-Bus bus and core libraries:
+ + debian/python-dbus.install
+ + debian/monodoc-dbus-1-manual.postinst
+ + debian/libdbus-qt-1-dev.install
+ + debian/libdbus-qt4-1-1.install
+ + libdbus-1-cil.install
+ + libdbus-qt-1-1c2.install
+ + libdbus-1-cil.installcligac
+ + libdbus-glib-1-2.install
+ + monodoc-dbus-1-manual.install
+ + libdbus-qt4-1-dev.install
+ + libdbus-glib-1-dev.install
+ * Remove all patches not applicable to the D-Bus bus and core libraries:
+ + debian/patches/dbus-update-automake.patch
+ + debian/patches/dbus-monoversion.patch
+ + debian/patches/dbus-no-qt4-examples.patch
+ + debian/patches/dbus-mono-pkgconfig-location.patch
+ + debian/patches/dbus-new-monodoc.patch
+
+ -- Sjoerd Simons Mon, 31 Jul 2006 14:50:05 +0200
+
+dbus (0.62-5) unstable; urgency=low
+
+ * Update python-dbus to the new Python Policy
+ * Bump Standards-Version to 3.7.2
+
+ -- Sebastian Dröge Sat, 8 Jul 2006 01:25:40 +0200
+
+dbus (0.62-4) unstable; urgency=low
+
+ [ Sebastian Dröge ]
+ * add ${shlibs:Depends} to Depends of libdbus-glib-1-dev, as it ships
+ dbus-binding-tool to /usr/bin/. This fixes a missing libexpat.so.1.0.0.
+ Thanks to Daniel Holbach for noticing this.
+
+ [ Michael Biebl ]
+ * debian/libdbus-qt4-1-dev.install: qt/dbus/qdbus.h is only a dummy header
+ file. Install the real one instead. (Closes: #375298)
+
+ -- Sjoerd Simons Wed, 28 Jun 2006 19:03:23 +0200
+
+dbus (0.62-3) unstable; urgency=low
+
+ * Make the Qt4 bindings buid-depend on libqt4-dev (>= 4.1.3)
+ (Closes: #374802)
+ * Ensure /etc/dbus-1/system.d is included in the dbus package
+ (Closes: #374930)
+
+ -- Sjoerd Simons Thu, 22 Jun 2006 18:36:35 +0200
+
+dbus (0.62-2) unstable; urgency=low
+
+ * debian/libdbus-qt-1-dev.install: Make the wildcard more strict so that it
+ doesn't accidentally pickup qt4 files
+ * debian/libdbus-qt4-1-dev.install: Also install the dbuscpp2xml and
+ dbusidl2cpp utilities
+ * debian/session.conf
+ + Install a custom dbus session.conf. In the generated one some variables
+ aren't expanded, causing the session bus to fail (Closes: #374747)
+ * Move libdbus-1-2 to sections libs
+ * Let libdbus-1-2 recommend dbus. Almost all libdbus-1 using applications
+ really need the dbus to be present so the recommends is justified.
+ (Closes: #374726)
+ * debian/libdbus-qt-1-dev.install: Install all the needed header files.
+ Thanks to Michael Biebl for testing a KDE4 build against these bindings.
+
+ -- Sjoerd Simons Wed, 21 Jun 2006 10:47:00 +0200
+
+
+
+dbus (0.62-1) unstable; urgency=low
+
+ * New upstream release
+ * Remove Daniel Stone from uploaders on his request.
+ * debian/dbus.init: Remove the sleep 1 when restarting. It's not needed as
+ the start-stop-daemon --retry option is used to shut dbus down
+ * Removed patched that aren't needed anymore:
+ + debian/patches/dbus-reload-usercache.patch
+ + debian/patches/dbus-qt-buildfix.patch
+ + debian/patches/dbus-qt-endianness.patch
+ + debian/patches/dbus-0.60-mono-return-null-fix.diff
+ + debian/patches/dbus-tcp-econreff.patch
+ + debian/patches/dbus-transport-tcp.patch
+ + debian/patches/dbus-pendingcall-deadlock.patch
+ * debian/patches/dbus-update-automake.patch
+ + Updated
+ * debian/patches/dbus-no-qt4-examples.patch
+ + Added. Quick hack to disable the building of the qt4 example binaries.
+
+ -- Sjoerd Simons Tue, 20 Jun 2006 19:35:46 +0200
+
+dbus (0.61-6) unstable; urgency=low
+
+ [ Sebastian Dröge ]
+ * debian/patches/dbus-new-monodoc.patch:
+ + Call the new monodoc executables for doc generation to really get
+ docs (Closes: #361541)
+ * debian/patches/dbus-update-automake.patch:
+ + updated for the above change
+ * Add the correct libdbus-glib-1-2 path to the dh_shlibdeps search path to
+ generate correct dependencies on dbus-1-utils.
+ * Update libdbus-1-cil to the new CLI policy and use dh_installcligac for
+ late GAC installation
+ * debian/patches/dbus-mono-pkgconfig-location.patch:
+ + Adjust the location of the .dll in the pkg-config file for the new CLI
+ policy.
+
+ [ Sjoerd Simons ]
+ * debian/patches/dbus-transport-tcp.patch
+ + Added. Fixes crash when using the tcp transport without an host option
+ (from dbus CVS) (Closes: #368894)
+ * debian/patches/dbus-tcp-econreff.patch
+ + Added. Make the error which is given when the tcp transport gets a
+ connection refused more understandable (from dbus CVS)
+
+ -- Sjoerd Simons Wed, 31 May 2006 15:00:49 +0200
+
+dbus (0.61-5) unstable; urgency=low
+
+ * debian/patches/dbus-0.60-mono-return-null-fix.diff:
+ + Added again as this wasn't applied upstream. This makes dbus-sharp
+ useable again as you don't get null anymore when asking for the session
+ bus (see fd.o #5716)
+
+ -- Sebastian Dröge Sat, 18 Mar 2006 14:40:48 +0100
+
+dbus (0.61-4) unstable; urgency=low
+
+ * debian/patches/dbus-reload-usercache.patch
+ + Added. Reload the user info cache when reloading the config.
+ * debian/patches/dbus-pendingcall-deadlock.patch
+ + Added. Don't block in a poll if the data we're looking for was already
+ read by another connection. (From dbus CVS)
+
+ -- Sjoerd Simons Sun, 5 Mar 2006 21:27:16 +0100
+
+dbus (0.61-3) unstable; urgency=low
+
+ * debian/patches/dbus-monoversion.patch
+ + Added. Dbus mono assembly version is synced with release version, but
+ nothing actually changed. This patch changes the assembly version back to
+ 0.60 to minimize breakage. New version will encode the assembly version
+ in the package name (e.g libdbus-1-cil-0.61).
+
+ -- Sjoerd Simons Wed, 1 Mar 2006 19:59:47 +0100
+
+dbus (0.61-2) unstable; urgency=low
+
+ * debian/patches/dbus-qt-endianness.patch
+ + Added. Fix FTBS on big-endian architectures
+
+ -- Sjoerd Simons Tue, 28 Feb 2006 00:58:05 +0100
+
+dbus (0.61-1) unstable; urgency=medium
+
+ * New upstream release
+ * debian/patches/dbus-0.60-mono-arguments-fix.diff
+ - Removed. Fixed upstream
+ * debian/patches/dbus-0.60-mono-return-null-fix.diff
+ - Removed. Fixed upstream
+ * debian/patches/dbus-moc-selection.patch
+ - Removed. Fixed upstream
+ * debian/patches/dbus-qdbusmarshall-amd64.patch
+ - Removed. Fixed upstream
+ * Update cli-common depend to >= 0.2.0. Older versions have known bugs
+ * Let binary-predeb/libdbus-1-cil:: depend on
+ common-binary-post-install-arch, so dh_clideps can do it's work correctly.
+ * debian/patches/dbus-qt-buildfix.patch
+ + Added. Fix compilation of the Qt bindings (from CVS)
+ * debian/patches/dbus-update-automake.patch
+ + Added. Do a new autogen run, because the qt patch patches autotools
+ files
+
+ -- Sjoerd Simons Fri, 24 Feb 2006 22:09:17 +0100
+
+dbus (0.60-6) unstable; urgency=low
+
+ * Sync relavant changes from ubuntu
+ + dbus-0.60-mono-arguments-fix.diff
+ - Added. 64bit fixes ((fd.o bugzilla #4410)
+ + dbus-0.60-mono-return-null-fix.diff
+ - Added. Don't return null for the session bus (fd.o bugzilla #5716)
+ + Send the update-notifier reboot required notification if it's installed
+ + Build mono bindings as arch indep.
+
+ -- Sjoerd Simons Thu, 16 Feb 2006 12:32:31 +0100
+
+dbus (0.60-5) unstable; urgency=low
+
+ * Fix a bashim in the postinst script (Closes: #347453)
+
+ -- Sjoerd Simons Wed, 11 Jan 2006 20:15:02 +0100
+
+dbus (0.60-4) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- Sjoerd Simons Thu, 5 Jan 2006 21:55:49 +0100
+
+dbus (0.60-3) experimental; urgency=low
+
+ * debian/patches/dbus-qdbusmarshall-amd64.patch
+ + Fix build failure on amd64 (Closes: #343746)
+ * Ignore the exit code of run-parts in the init script.
+
+ -- Sjoerd Simons Thu, 5 Jan 2006 12:30:26 +0100
+
+dbus (0.60-2) experimental; urgency=low
+
+ * Let python2.4-dbus depend on python2.4-libxml2 (Closes: #343715)
+ * Changed maintainer address to
+ pkg-utopia-maintainers@lists.alioth.debian.org
+
+ -- Sjoerd Simons Thu, 15 Dec 2005 20:01:11 +0100
+
+dbus (0.60-1) experimental; urgency=low
+
+ * New upstream release
+ * Soname of libdbus-1 and libdbus-glib-1 were bumped to 2
+ * debian/patches/dbus-reloadconfig-reply.patch
+ + Removed. Merged upstream
+ * debian/patches/dbus-monitor.patch
+ + Removed. Merged upstream
+ * debian/patches/dbus-make-libtool-safe.patch
+ + Removed. Fixed upstream
+ * debian/patches/dbus-moc-selection.patch
+ + Added. Enable the Qt moc paths to be specified to configure
+ * Depend on lsb-base >= 3.0
+ * Let dbus conflicht with libdbus-1-1 and libdbus-1-2 with dbus << 0.60.
+ Some bus changes could result in strange bugs when mixing the old libs
+ with the new bus.
+
+ -- Sjoerd Simons Wed, 14 Dec 2005 19:53:07 +0100
+
+dbus (0.50-3) experimental; urgency=low
+
+ * Also move dbus-launch and dbus-send manpages to the dbus package
+ * debian/dbus.init
+ + Make force-reload an alias of reload instead of restart
+
+ -- Sjoerd Simons Mon, 21 Nov 2005 11:17:57 +0100
+
+dbus (0.50-2) experimental; urgency=low
+
+ * maintainance is actually spelled "maintenance" (Closes: #332238)
+ * Disable --enable-verbose because of the big performance hit
+ * Move dbus-binding-tool from dbus-1-utils to libdbus-glib-1-dev
+ * Move dbus-launch and dbus-send into the dbus package (Closes: #337212)
+ * Move the /etc/X11/Xsession.d/ script from dbus-1-utils to dbus
+ * Add reload function to the init script
+ * Use log_daemon_msg instead of log_begin_msg in the init script where
+ applicable
+ * debian/patches/dbus-reloadconfig-reply.patch
+ + Added. Send a reply message when org.freedesktop.DBus.ReloadConfig is
+ called
+ * Prefix the long description of monodoc-dubs-1-manual with one space
+ instead of two (Closes: #337032)
+ * Add LSB formatted dependency info in the init script (Closes: #337644)
+
+ -- Sjoerd Simons Wed, 9 Nov 2005 20:02:09 +0100
+
+dbus (0.50-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sjoerd Simons Thu, 8 Sep 2005 10:01:21 +0200
+
+dbus (0.36.2-1) experimental; urgency=low
+
+ * New upstream release
+ * Fix descriptions to refer to dbus rather than dbus-1.
+ * Make dbus-1-utils depend on dbus
+ * debian/patches/dbus-sessionbus-checkuid.patch
+ + Removed. Fixed upstream
+
+ -- Sjoerd Simons Tue, 6 Sep 2005 09:26:19 +0200
+
+dbus (0.36.1-1) experimental; urgency=low
+
+ * New upstream release (Closes: #319593, #324016)
+ * debian/patches/dbus_cmsgcred.patch
+ + Removed. Fixed upstream.
+ * debian/patches/dbus-gilstate.patch
+ + Removed. Fixed upstream.
+ * Sync with the ubuntu package
+ + Remove dbus_bindings.{a,la} from python2.4-dbus
+ + debian/patches/dbus-make-libtool-safe.patch
+ - Added. Replace explicit libtool calls with $(LIBTOOL) in
+ glib/Makefile.*
+ + Don't include the .la files in the dev packages.
+ + Don't restart dbus on upgrade. Too many applications don't handle it
+ correctly.
+ + Switched the init script to lsb-base
+ + Ship dbus-binding-tool and dbus-viewer with dbus-1-utils
+
+ -- Sjoerd Simons Fri, 26 Aug 2005 21:58:42 +0200
+
+dbus (0.34-4) experimental; urgency=low
+
+ * libdbus-1-cil improvements based on comments from Mirco Bauer
+ + Call dh_clideps before dh_makeclilibs
+ + libdbus-1-cil can be arch all
+ + Use CLI instead of .NET in the package description
+ * Add debian/patches/dbus-sessionbus-checkuid.patch:
+ - bus/session.conf.in: Do not allow any user to connect to any session bus
+ by default.
+ - bus/policy.c: "allowed" now defaults to true if the connecting user id
+ matches the session bus user id.
+ - This stops other users from listening and sending to other user's
+ session dbus instances.
+ - References:
+ CAN-2005-0201
+ https://bugs.freedesktop.org/show_bug.cgi?id=2436
+ * debian/patches/dbus-gilstate: Fix segfaults in python bindings.
+ Patch by Anthony Baxter.
+ * Add D-BUS monodoc documentation package
+ * C++ transition
+
+ -- Sjoerd Simons Mon, 11 Jul 2005 10:22:44 +0200
+
+dbus (0.34-3) experimental; urgency=low
+
+ * Build-depend on python-pyrex instead of python2.3-pyrex
+ * debian/dbus.postinst
+ + Forgot to rename dbus-1 to dbus in the previous package.
+ * Rename libdbus-cil to libdbus-1-cil
+
+ -- Sjoerd Simons Wed, 22 Jun 2005 18:53:22 +0200
+
+dbus (0.34-2) experimental; urgency=low
+
+ * debian/dbus.init
+ + The even.d dir is in /etc/dbus-1 not in /etc/dbus
+
+ -- Sjoerd Simons Tue, 21 Jun 2005 16:16:43 +0200
+
+dbus (0.34-1) experimental; urgency=low
+
+ * New upstream release
+ * Build libdbus-cil on amd64 too (Closes: #314247)
+ * Python bindings need python2.4, so build them against python2.4.
+
+ -- Sjoerd Simons Mon, 20 Jun 2005 13:07:04 +0200
+
+dbus (0.33-1) experimental; urgency=low
+
+ * New upstream release (Closes: #299049)
+ * Redone the package names to be much more sane.
+ - Based on ubuntu's dbus 0.33 package by Daniel Stone.
+ - dbus deamon goes into the dbus package instead of dbus-1
+ - glib bindings in libdbus-glib-1-1 instead of dbus-glib-1
+ - qt bindings in libdbus-qt-1-1 instead of dbus-qt-1
+ - Library component from dbus-1 goed into libdbus-1-1
+ * debian/patches/dbus-fixverbose.patch
+ - Removed. Fixed upstream
+ * debian/patches/dbus-getpwname.patch
+ - Removed. Fixed upstream
+ * debian/patches/fix-policy-group.patch
+ - Removed. Not relevant anymore
+
+ -- Sjoerd Simons Mon, 20 Jun 2005 11:12:12 +0200
+
+dbus (0.23.4-2) unstable; urgency=low
+
+ * Upload version with QT and Mono bindings to unstable. (Closes: #271895)
+ (Closes: #271896) (Closes: #260044) (Closes: #290622)
+ * debian/patches/dbus_cmsgcred.patch
+ - Added. Fix syntax error on systems where HAVE_CMSGCRED is defined
+ (Thanks to Michael Banck) (Closes: #311726)
+
+ -- Sjoerd Simons Mon, 6 Jun 2005 22:48:08 +0200
+
+dbus (0.23.4-1bindings0) experimental; urgency=low
+
+ * Enable Mono and QT bindings.
+
+ -- Sjoerd Simons Tue, 5 Apr 2005 22:15:29 +0200
+
+dbus (0.23.4-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/patches/dbus-abi-api.patch
+ - Removed, fixed upstream
+ * debian/patches/dbus-python-fix.patch
+ - Removed, fixed upstream
+ * debian/patches/fix-policy-group.patch
+ - Stop segfaulting at " tags (Closes: #297495)
+ * debian/patches/dbus-fixverbose.patch
+ - Fix inaccurate messages in the debug output of the uid/gid lookup code
+ (Thanks to Tom Parker) (Closes: #297497)
+ * debian/patches/dbus-getpwname.patch
+ * Add .la files in the -dev packages (Closes: #297936)
+
+ -- Sjoerd Simons Wed, 30 Mar 2005 23:02:00 +0200
+
+dbus (0.23.2-3) unstable; urgency=low
+
+ * debian/patches/dbus-abi-api.patch
+ - Fix dbus api and abi breakage between 0.23.1 and 0.23.2 (Closes: #297020)
+
+ -- Sjoerd Simons Mon, 28 Feb 2005 15:05:19 +0100
+
+dbus (0.23.2-2) unstable; urgency=low
+
+ * debian/patches/dbus-python-fix.patch
+ - Fix python bindings (Based on dbus CVS fix)
+
+ -- Sjoerd Simons Thu, 24 Feb 2005 11:19:03 +0100
+
+dbus (0.23.2-1bindings0) experimental; urgency=low
+ * debian/patches/dbus-monofixes.patch
+ + Removed. Fixed in this release
+
+ -- Sjoerd Simons Thu, 17 Feb 2005 13:24:22 +0100
+
+dbus (0.23.2-1) unstable; urgency=low
+ * New upstream release
+
+ -- Sjoerd Simons Wed, 23 Feb 2005 13:04:21 +0100
+
+dbus (0.23.1-1bindings0) experimental; urgency=low
+
+ * New upstream release
+ * debian/patches/dbus-monofixes.patch
+ + Added. Some mono fixes from dbus cvs
+
+ -- Sjoerd Simons Thu, 17 Feb 2005 13:24:22 +0100
+
+dbus (0.23-1mono1) experimental; urgency=low
+
+ * Enable the qt bindings. Thanks to Kevin Ottens
+ (Closes: #271895) (Closes: #271896) (Closes: #290622)
+
+ -- Sjoerd Simons Sat, 22 Jan 2005 13:53:27 +0100
+
+dbus (0.23-1mono0) experimental; urgency=low
+
+ * Enable the mono bindings
+
+ -- Sjoerd Simons Fri, 14 Jan 2005 17:54:26 +0100
+
+dbus (0.23-1) unstable; urgency=low
+
+ * New upstream release
+ * Disable the mono bindings for the unstable packages untill mono goes into
+ testing.
+
+ -- Sjoerd Simons Fri, 14 Jan 2005 15:22:20 +0100
+
+dbus (0.22+cvs.20050104-1) experimental; urgency=low
+
+ * CVS snapshot
+ * Package the dbus mono bindings for i386, powerpc and s390. Mostly based on
+ patches from Edd Dumbill. (Closes: #260044)
+
+ -- Sjoerd Simons Wed, 5 Jan 2005 18:20:47 +0100
+
+dbus (0.22-4) unstable; urgency=low
+
+ * Let the initscript check if the pid in the pidfile actually corresponds
+ to a dbus daemon process (Closes: #285758)
+
+ -- Sjoerd Simons Wed, 5 Jan 2005 16:55:45 +0100
+
+dbus (0.22-3) unstable; urgency=medium
+
+ * Actually ship the init script improvements mentioned in the previous
+ upload. (please pass the brown paper bag)
+ * Call run-parts --reverse on the event.d dir when stopping dbus
+ (Closes: #269283)
+
+ -- Sjoerd Simons Sat, 6 Nov 2004 16:17:40 +0100
+
+dbus (0.22-2) unstable; urgency=medium
+
+ * debian/patches/dbus-monitor.patch
+ + Updated. Unbreak dbus-monitor when arguments are given. (From the ubuntu
+ dbus package)
+ * Use run-parts --arg instead of -a, which works with woody's run-parts
+ (Closes: #269708) (Closes: #274702)
+ * Use start-stop-daemon --retry when stopping to ensure the system bus
+ stopped. Prevents race conditions with the dbus pidfile (Closes: #277148)
+ * Add myself to Uploaders
+ * Acknowledge my own NMU (Closes: #272862)
+
+ -- Sjoerd Simons Tue, 02 Nov 2004 12:19:47 +0100
+
+dbus (0.22-1.1) unstable; urgency=high
+
+ * Non-maintainer upload with maintainers permission
+ * debian/patches/dbus-python-64bit.patch
+ + Added. Taken from dbus cvs. Add support for int64 and uint64 to the
+ python bindings (Closes: #272862)
+ * Urgency high because the hal package depending on this fix fixes RC bugs.
+
+ -- Sjoerd Simons Sat, 25 Sep 2004 17:45:33 +0200
+
+dbus (0.22-1) unstable; urgency=high
+
+ * New upstream release.
+ + Urgency high so it slips into sarge before the freeze.
+
+ -- Daniel Stone Tue, 17 Aug 2004 00:42:56 +0100
+
+dbus (0.21-7) unstable; urgency=low
+
+ * Created /etc/dbus-1/event.d/ and added support to dbus' init script
+ to run the files in it on stop/start/restart
+
+ -- Daniel Silverstone Thu, 22 Jul 2004 14:13:44 +0100
+
+dbus (0.21-6) unstable; urgency=low
+
+ * Add a chown,chgrp to the init script to make sure the pid dir is owned
+ by the messagebus user.
+ * Modify the dbus-1 init script to remove some arguments from the invocation
+ of start-stop-daemon so that it will work when being asked to stop a
+ dbus instance which has a different executable to that installed.
+
+ -- Daniel Silverstone Mon, 12 Jul 2004 21:56:45 +0100
+
+dbus (0.21-5) unstable; urgency=low
+
+ * Change debian/control to indicate that dbus is group maintained.
+ * Build-depend on the version of python2.3-pyrex which theoretically has
+ the fixed patch for coping with unsigned long int vs. long unsigned int
+ * Removed the seddery introduced in 0.21-2 because the above build-depend
+ change should ensure we're safe.
+
+ -- Daniel Silverstone Mon, 5 Jul 2004 17:44:06 +0100
+
+dbus (0.21-4) unstable; urgency=low
+
+ * Updated debian/copyright to the AFL 2.0 closes: #239332
+ * Updated debian/dbus-1.init to create /var/run/dbus if it
+ doesn't already exist. closes: #242639
+
+ -- Daniel Silverstone Fri, 18 Jun 2004 00:20:27 +0100
+
+dbus (0.21-3) unstable; urgency=low
+
+ * Add the sed call to Makefile.in too. Damn my forgetfulness.
+
+ -- Daniel Silverstone Wed, 16 Jun 2004 18:06:28 +0100
+
+dbus (0.21-2) unstable; urgency=low
+
+ * Add a sed -e's/long unsigned/unsigned long/g' to the python bindings
+ preparation line. This *should* solve the FTBFS on alpha, s390 and ia64
+ * Also, fix an a-umlaut to 'ae' in the changelog to prevent nasty
+ debian-changelog-file-uses-obsolete-national-charset errors from lintian
+
+ -- Daniel Silverstone Tue, 15 Jun 2004 19:26:12 +0100
+
+dbus (0.21-1) unstable; urgency=low
+
+ * New upstream version.
+ + Fixes varargs crap - cleaner patch from David Zeuthen applied. (closes:
+ #229274)
+ * Added provides/replaces/conflicts on dbus-1-utils << 0.20-4, per -4's
+ moving of manpages.
+
+ -- Daniel Stone Sun, 21 Mar 2004 02:42:53 +1100
+
+dbus (0.20-6) unstable; urgency=low
+
+ * Add a touch of usage information to the top of the dbus Xsession.d file.
+ Also since we've had confirmation that this file does enough, this version
+ closes: #230835
+ * Add an extra rm -f $PIDFILE to /etc/init.d/dbus-1 to help on restart.
+ closes: #229609
+ * Temporarily quiesce error reports in system.d/*.conf files when loading.
+ This breaks the standard that the daemon shouldn't start with malformed
+ configuration files, but at least for now it seems sensible to do.
+ closes: #230231
+ NOTE: this is likely to be removed in a future version of dbus after the
+ configuration file syntax stabilises. Please report bugs against packages
+ which have configs which fail to parse with the latest dbus package.
+
+ -- Daniel Silverstone Tue, 10 Feb 2004 00:46:52 +0000
+
+dbus (0.20-5) unstable; urgency=low
+
+ * Add an /etc/X11/Xsession.d/ entry to launch a session bus.
+ You will need to add 'use-session-dbus' to your /etc/X11/Xsession.options
+ file to enable it.
+
+ -- Daniel Silverstone Tue, 3 Feb 2004 18:15:48 +0000
+
+dbus (0.20-4) unstable; urgency=low
+
+ * Ensure the manpages are installed into the right package.
+ * Add /usr/lib/dbus-1.0/services to the dbus-1 package. (closes: #230413)
+ * dbus-glib-1-dev now depends on libglib2.0-dev which is kinda needed in order
+ to get glib-object.h
+ * Removed the dbus-qt-1 and dbus-qt-1-dev packages until upstream actually
+ do something with the binding (like putting some code into it)
+
+ -- Daniel Silverstone Sun, 1 Feb 2004 22:22:59 +0000
+
+dbus (0.20-3) unstable; urgency=high
+
+ * Urgency high because the old package was virtually useless.
+ * debian/patches/fix-varargs-usage.diff:
+ + Merged patch from Michel Daenzer (thanks Michel!) to fix varargs usage,
+ so we don't segfault on --system anymore. (closes: #229274, #229005,
+ #229609)
+
+ -- Daniel Stone Wed, 28 Jan 2004 06:51:07 +1100
+
+dbus (0.20-2) unstable; urgency=low
+
+ * The "gotta keep the ftpmaster cab^Whappy release".
+ + Hey, I need the overrides ...
+ * debian/python2.3-dbus.install:
+ + Stop installing .a and .la files (thanks Daniel Silverstone).
+ * debian/dbus-qt-1-dev.install:
+ + Install the .la file ... yep, Daniel Silverstone
+ * debian/patches/dbus-monitor.patch:
+ + Patch from Daniel Silverstone to add suport for filters to dbus-monitor:
+ only watch for certain events.
+ * debian/rules:
+ + Add --enable-verbose-mode to make debugging far more easier.
+ - Daniel Silverstone strikes again!
+
+ -- Daniel Stone Wed, 21 Jan 2004 11:07:37 +1100
+
+dbus (0.20-1) unstable; urgency=low
+
+ * New upstream release (closes: #223400).
+ + This version includes Qt and Python support.
+ - New packages: dbus-1-qt, python2.3-dbus.
+ * debian/dbus-1.postinst:
+ + Call addgroup with --system so it doesn't get a userspace GID.
+ (closes: #222563)
+ * debian/control, debian/rules:
+ + Start building Qt and Python bindings.
+ * debian/patches/dbus-python-signals-dze.patch:
+ + Merged patch (already applied in HEAD) to enhance signal support in the
+ Python interface; available from
+ http://freedesktop.org/~david/dbus-python-signals-dze.patch.
+
+ -- Daniel Stone Sat, 6 Dec 2003 00:17:50 +1100
+
+dbus (0.13-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + Update Maintainer address to debian.org.
+ + Add Recommends: dbus-glib-1 to dbus-1-utils, for the dbus-monitor
+ program. (closes: #213914)
+
+ -- Daniel Stone Wed, 22 Oct 2003 13:54:53 +1000
+
+dbus (0.12-4) unstable; urgency=low
+
+ * debian/control:
+ + Taking over from Colin as maintainer.
+ + Bump debhelper Build-Dep to >=4.1.46, when dh_installlogcheck was first
+ introduced.
+ + Bump Standards-Version to 3.6.1.
+ + Add Replaces/Provides/Conflicts on earlier dbus-1 versions to
+ dbus-1-utils.
+ * debian/dbus-1.init:
+ + Clean up after the daemon's pidfile mess, ensuring smooth upgrades.
+ (closes: #209143)
+
+ -- Daniel Stone Mon, 22 Sep 2003 12:13:06 +1000
+
+dbus (0.12-3) unstable; urgency=low
+
+ * debian/control:
+ - Break out utilities into separate dbus-1-utils package.
+
+ -- Colin Walters Sat, 30 Aug 2003 20:07:28 -0400
+
+dbus (0.12-2) unstable; urgency=low
+
+ * debian/control:
+ - [dbus-1] Add Depends on adduser (Closes: #204871)
+
+ -- Colin Walters Sun, 10 Aug 2003 22:23:36 -0400
+
+dbus (0.12-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - Bump Standards-Version to 3.6.0, no changes required.
+
+ -- Colin Walters Wed, 6 Aug 2003 01:50:13 -0400
+
+dbus (0.11+cvs200307017-1) unstable; urgency=low
+
+ * New upstream CVS snapshot.
+ - Creates services directory (Closes: #198433)
+
+ -- Colin Walters Thu, 17 Jul 2003 19:05:37 -0400
+
+dbus (0.11+cvs20030528-2) unstable; urgency=low
+
+ * debian/rules:
+ - Include utils.mk.
+
+ -- Colin Walters Thu, 29 May 2003 02:14:29 -0400
+
+dbus (0.11+cvs20030528-1) unstable; urgency=low
+
+ * New upstream CVS snapshot.
+ * debian/control:
+ - Build-Depend on latest cdbs to get some minor fixes.
+
+ -- Colin Walters Wed, 28 May 2003 16:56:29 -0400
+
+dbus (0.11-2) unstable; urgency=low
+
+ * debian/control:
+ - Add Build-Depends on cdbs, just because it's so freaking sweet.
+ * debian/rules:
+ - Convert to CDBS.
+ * debian/rocks:
+ - Removed.
+
+ -- Colin Walters Mon, 19 May 2003 19:21:33 -0400
+
+dbus (0.11-1) unstable; urgency=low
+
+ * The "Bill Gates Grants Self 18 Dexterity, 20 Charisma" release.
+ * New upstream release.
+ * debian/control:
+ - Bump Standards-Version to 3.5.10, no changes required.
+ * debian/rocks:
+ - No need to create system.d anymore, upstream does it now.
+
+ -- Colin Walters Thu, 15 May 2003 22:01:23 -0400
+
+dbus (0.10+cvs20030503-2) unstable; urgency=low
+
+ * The "I've Got To Stop Taking Lives So Seriously" release.
+ * debian/control:
+ - Add Build-Depends on docbook-utils.
+
+ -- Colin Walters Sat, 3 May 2003 16:58:20 -0400
+
+dbus (0.10+cvs20030503-1) unstable; urgency=low
+
+ * The "Chimp Study On Human-Evasion Response To Feces-Hurling Nearly
+ Complete" release.
+ * New upstream snapshot.
+ - Includes some of my patches; this will among other things make
+ the system bus go again.
+ * debian/rocks:
+ - Add --enable-docs to DEB_CONFIGURE_EXTRA_FLAGS.
+ * debian/dbus-1-dev.install:
+ - Update to handle new upstream .pc name.
+ * debian/rules:
+ - Update to latest version of Colin's Build System.
+
+ -- Colin Walters Sat, 3 May 2003 03:58:53 -0400
+
+dbus (0.10-1) unstable; urgency=low
+
+ * The "West-Wing Tech-Support' Crew Be A Buncha Wack Bitches" release.
+ * New upstream release.
+ * debian/dbus-1.install:
+ - Install all binaries.
+ * debian/dbus-1-dev.install:
+ - Install headers from /usr/lib/dbus-1.0 too.
+ * debian/rocks:
+ - Create etc/dbus-1/system.d.
+
+ -- Colin Walters Mon, 28 Apr 2003 17:29:50 -0400
+
+dbus (0.9-2) unstable; urgency=low
+
+ * The "New Fox Reality Show To Determine Ruler Of Iraq" release.
+ * debian/rocks:
+ - Generate API docs via doxygen (Closes: #185470)
+ * debian/control:
+ - Build-Depend on doxygen.
+ * debian/dbus-1-doc.install:
+ - Install docs in correct place.
+ - Install newly generated doxygen docs.
+ * debian/rules:
+ - Update to latest version of Colin's Build System.
+ - Eagerly await ftpmaster installing build-common.
+
+ -- Colin Walters Wed, 23 Apr 2003 23:40:00 -0400
+
+dbus (0.9-1) unstable; urgency=low
+
+ * The "Starbucks To Begin Sinister 'Phase Two' Of Operation" release.
+ * New upstream release.
+ * debian/control:
+ - Drop "lib*" prefix from all packages, and change suffix from "0" to "-1".
+ D-BUS isn't technically just a shared library; it also includes a
+ daemon. This could really go either way; I could just put the daemon
+ in the libdbus0 package and be done with it, but I think that's more
+ confusing in the end, since people have been very conditioned to
+ expect libfoo -> just shared library.
+ - Add Conflicts: and Replaces: on older lib* packages.
+ - Remove Provides and Conflicts on libdbus-dev in new dbus-1-dev
+ package, since they are actually parallel installable.
+ - Ditto for libdbus-glib0-dev.
+ - Touch up descriptions.
+ - Update to Standards-Version: 3.5.9; no changes required.
+ - Add libexpat-dev to Build-Depends.
+ * debian/dbus0.init:
+ - New file; runs the D-BUS daemon.
+ * debian/dbus0.default:
+ - New file.
+ * debian/dbus0.postinst:
+ - New file; creates the messagebus user and stuff.
+ * debian/dbus0.install:
+ - Install configuration files.
+ * debian/rocks:
+ - Add --with-xml=expat.
+ - Update to correspond with changes to debian/control.
+ - Make dbus-glib-1 package be built after dbus-1 package.
+ - Add debian/dbus-1/usr/lib to DEB_SHLIBDEPS_INCLUDE_dbus-glib-1 so we
+ pick up the right shlibs.
+ * debian/rules:
+ - Update to latest version of Colin's Build System.
+
+ -- Colin Walters Sun, 13 Apr 2003 23:40:29 -0400
+
+dbus (0.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - [libdbus0] Flesh out description somewhat.
+
+ -- Colin Walters Tue, 18 Mar 2003 10:50:42 -0500
+
+dbus (0.5-2) unstable; urgency=low
+
+ * debian/libdbus0-dev.install:
+ - Don't include dbus-glib-1.0.pc.
+ - Don't include dbus-glib-1.a or .so.
+
+ -- Colin Walters Thu, 6 Mar 2003 23:17:53 -0500
+
+dbus (0.5-1) unstable; urgency=low
+
+ * Initial version (Closes: #183739)
+
+ -- Colin Walters Thu, 6 Mar 2003 17:58:06 -0500
--- dbus-1.2.16.orig/debian/dbus.dirs
+++ dbus-1.2.16/debian/dbus.dirs
@@ -0,0 +1 @@
+/var/lib/dbus
--- dbus-1.2.16.orig/debian/dbus-Xsession
+++ dbus-1.2.16/debian/dbus-Xsession
@@ -0,0 +1,17 @@
+# $Id:$
+# In order to activate the session bus at X session launch
+# simply place use-session-dbus into your /etc/X11/Xsession.options file
+#
+
+STARTDBUS=
+DBUSLAUNCH=/usr/bin/dbus-launch
+
+if has_option use-session-dbus; then
+ if [ -x "$DBUSLAUNCH" ]; then
+ STARTDBUS=yes
+ fi
+fi
+
+if [ -n "$STARTDBUS" ]; then
+ STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP"
+fi
--- dbus-1.2.16.orig/debian/dbus.preinst
+++ dbus-1.2.16/debian/dbus.preinst
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+rm_conffile() {
+ CONFFILE="$1"
+ OLD_MD5SUM="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="$(md5sum "$CONFFILE" | sed -e 's/ .*//')"
+ if [ "$md5sum" != "$OLD_MD5SUM" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" lt "0.50-2"; then
+ rm_conffile "/etc/X11/Xsession.d/75dbus-1-utils_dbus-launch" f16c15c4b018d37ca3ea2b6aba224439
+ fi
+esac
+
+#DEBHELPER#
+
--- dbus-1.2.16.orig/debian/libdbus-1-dev.install
+++ dbus-1.2.16/debian/libdbus-1-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/dbus*/dbus/dbus*.h
+debian/tmp/lib/dbus*/include/dbus/dbus*.h usr/lib/dbus-1.0/include/dbus
+debian/tmp/lib/libdbus-1*.so
--- dbus-1.2.16.orig/debian/rules
+++ dbus-1.2.16/debian/rules
@@ -0,0 +1,55 @@
+#!/usr/bin/make -f
+# Copyright © 2002,2003 Colin Walters
+# Copyright © 2003 Daniel Stone
+# Copyright © 2006 Sjoerd Simons
+
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+libdbusN := $(shell sed -rn 's/Package:[[:space:]]*(libdbus-[0-9-]+)[[:space:]]*$$/\1/p' debian/control | head -n 1)
+
+DEB_DH_MAKESHLIBS_ARGS_ALL = -V '$(libdbusN) (>= 1.2.16)'
+
+LDFLAGS += -Wl,--as-needed
+
+# List any files which are not installed
+common-binary-post-install-arch:: list-missing
+
+DEB_CONFIGURE_LIBEXECDIR := "\$${exec_prefix}/lib/dbus-1.0"
+
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --enable-xml-docs \
+ --enable-doxygen-docs \
+ --exec-prefix=
+
+DEB_DH_INSTALLINIT_ARGS := -r -- start 12 2 3 4 5 . stop 88 1 .
+
+ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
+common-configure-impl::
+ # Workaround for a bug in binutils on mipsen (see #528145).
+ # Remove again when #532821 has been fixed.
+ sed -i -e 's/\-fPIE//' -e 's/\-pie\ \-Wl\,\-z\,relro//' bus/Makefile
+endif
+
+binary-post-install/dbus-x11::
+ mkdir -p debian/dbus-x11/etc/X11/Xsession.d
+ cp debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch
+
+build/dbus-1-doc::
+ doxygen Doxyfile
+ xsltproc -o dbus.devhelp debian/doxygen_to_devhelp.xsl doc/api/xml/index.xml
+
+install/libdbus-1-dev::
+ mkdir -p debian/libdbus-1-dev/usr/lib/pkgconfig
+ sed -e 's@-I\$${libdir}@-I$${prefix}/lib@' debian/tmp/lib/pkgconfig/dbus-1.pc > debian/libdbus-1-dev/usr/lib/pkgconfig/dbus-1.pc
+
+
+clean::
+ rm -rf doc/api
+ rm -f test/data/valid-config-files/session.conf
+ rm -f test/data/valid-config-files/system.conf
+ rm -f doc/*.html
+ rm -f dbus.devhelp
+
--- dbus-1.2.16.orig/debian/dbus-x11.install
+++ dbus-1.2.16/debian/dbus-x11.install
@@ -0,0 +1,2 @@
+debian/tmp/bin/dbus-launch usr/bin
+debian/tmp/usr/share/man/man1/dbus-launch.1
--- dbus-1.2.16.orig/debian/dbus.links
+++ dbus-1.2.16/debian/dbus.links
@@ -0,0 +1 @@
+lib/dbus-1.0/dbus-daemon-launch-helper usr/lib/dbus-1.0/dbus-daemon-launch-helper
--- dbus-1.2.16.orig/debian/dbus.default
+++ dbus-1.2.16/debian/dbus.default
@@ -0,0 +1,7 @@
+# This is a configuration file for /etc/init.d/dbus; it allows you to
+# perform common modifications to the behavior of the dbus daemon
+# startup without editing the init script (and thus getting prompted
+# by dpkg on upgrades). We all love dpkg prompts.
+
+# Parameters to pass to dbus.
+PARAMS=""
--- dbus-1.2.16.orig/debian/copyright
+++ dbus-1.2.16/debian/copyright
@@ -0,0 +1,214 @@
+This package was debianized by Colin Walters on
+Thu, 6 Mar 2003 18:01:37 -0500
+
+It was downloaded from http://www.freedesktop.org/software/dbus
+
+This package is dual-licensed under the Academic Free License version 2.1,
+and the GPL version 2. For a description of the GPL, see
+/usr/share/common-licenses/GPL-2 on your Debian system.
+
+Portions of the package are only licensed under the GPL (notably
+tools/dbus-cleanup-sockets.c and test/decode-gcov.c ).
+
+The Academic Free License follows:
+
+The Academic Free License
+v. 2.1
+
+This Academic Free License (the "License") applies to any original
+work of authorship (the "Original Work") whose owner (the "Licensor")
+has placed the following notice immediately following the copyright
+notice for the Original Work:
+
+Licensed under the Academic Free License version 2.1
+
+1) Grant of Copyright License. Licensor hereby grants You a
+world-wide, royalty-free, non-exclusive, perpetual, sublicenseable
+license to do the following:
+
+a) to reproduce the Original Work in copies;
+
+b) to prepare derivative works ("Derivative Works") based upon the Original Work;
+
+c) to distribute copies of the Original Work and Derivative Works to the public;
+
+d) to perform the Original Work publicly; and
+
+e) to display the Original Work publicly.
+
+2) Grant of Patent License. Licensor hereby grants You a world-wide,
+royalty-free, non-exclusive, perpetual, sublicenseable license, under
+patent claims owned or controlled by the Licensor that are embodied in
+the Original Work as furnished by the Licensor, to make, use, sell and
+offer for sale the Original Work and Derivative Works.
+
+3) Grant of Source Code License. The term "Source Code" means the
+preferred form of the Original Work for making modifications to it and
+all available documentation describing how to modify the Original
+Work. Licensor hereby agrees to provide a machine-readable copy of the
+Source Code of the Original Work along with each copy of the Original
+Work that Licensor distributes. Licensor reserves the right to satisfy
+this obligation by placing a machine-readable copy of the Source Code
+in an information repository reasonably calculated to permit
+inexpensive and convenient access by You for as long as Licensor
+continues to distribute the Original Work, and by publishing the
+address of that information repository in a notice immediately
+following the copyright notice that applies to the Original Work.
+
+4) Exclusions From License Grant. Neither the names of Licensor, nor
+the names of any contributors to the Original Work, nor any of their
+trademarks or service marks, may be used to endorse or promote
+products derived from this Original Work without express prior written
+permission of the Licensor. Nothing in this License shall be deemed to
+grant any rights to trademarks, copyrights, patents, trade secrets or
+any other intellectual property of Licensor except as expressly stated
+herein. No patent license is granted to make, use, sell or offer to
+sell embodiments of any patent claims other than the licensed claims
+defined in Section 2. No right is granted to the trademarks of
+Licensor even if such marks are included in the Original Work. Nothing
+in this License shall be interpreted to prohibit Licensor from
+licensing under different terms from this License any Original Work
+that Licensor otherwise would have a right to license.
+
+5) This section intentionally omitted.
+
+6) Attribution Rights. You must retain, in the Source Code of any
+Derivative Works that You create, all copyright, patent or trademark
+notices from the Source Code of the Original Work, as well as any
+notices of licensing and any descriptive text identified therein as an
+"Attribution Notice." You must cause the Source Code for any
+Derivative Works that You create to carry a prominent Attribution
+Notice reasonably calculated to inform recipients that You have
+modified the Original Work.
+
+7) Warranty of Provenance and Disclaimer of Warranty. Licensor
+warrants that the copyright in and to the Original Work and the patent
+rights granted herein by Licensor are owned by the Licensor or are
+sublicensed to You under the terms of this License with the permission
+of the contributor(s) of those copyrights and patent rights. Except as
+expressly stated in the immediately proceeding sentence, the Original
+Work is provided under this License on an "AS IS" BASIS and WITHOUT
+WARRANTY, either express or implied, including, without limitation,
+the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL
+WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential
+part of this License. No license to Original Work is granted hereunder
+except under this disclaimer.
+
+8) Limitation of Liability. Under no circumstances and under no legal
+theory, whether in tort (including negligence), contract, or
+otherwise, shall the Licensor be liable to any person for any direct,
+indirect, special, incidental, or consequential damages of any
+character arising as a result of this License or the use of the
+Original Work including, without limitation, damages for loss of
+goodwill, work stoppage, computer failure or malfunction, or any and
+all other commercial damages or losses. This limitation of liability
+shall not apply to liability for death or personal injury resulting
+from Licensor's negligence to the extent applicable law prohibits such
+limitation. Some jurisdictions do not allow the exclusion or
+limitation of incidental or consequential damages, so this exclusion
+and limitation may not apply to You.
+
+9) Acceptance and Termination. If You distribute copies of the
+Original Work or a Derivative Work, You must make a reasonable effort
+under the circumstances to obtain the express assent of recipients to
+the terms of this License. Nothing else but this License (or another
+written agreement between Licensor and You) grants You permission to
+create Derivative Works based upon the Original Work or to exercise
+any of the rights granted in Section 1 herein, and any attempt to do
+so except under the terms of this License (or another written
+agreement between Licensor and You) is expressly prohibited by
+U.S. copyright law, the equivalent laws of other countries, and by
+international treaty. Therefore, by exercising any of the rights
+granted to You in Section 1 herein, You indicate Your acceptance of
+this License and all of its terms and conditions.
+
+10) Termination for Patent Action. This License shall terminate
+automatically and You may no longer exercise any of the rights granted
+to You by this License as of the date You commence an action,
+including a cross-claim or counterclaim, against Licensor or any
+licensee alleging that the Original Work infringes a patent. This
+termination provision shall not apply for an action alleging patent
+infringement by combinations of the Original Work with other software
+or hardware.
+
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating
+to this License may be brought only in the courts of a jurisdiction
+wherein the Licensor resides or in which Licensor conducts its primary
+business, and under the laws of that jurisdiction excluding its
+conflict-of-law provisions. The application of the United Nations
+Convention on Contracts for the International Sale of Goods is
+expressly excluded. Any use of the Original Work outside the scope of
+this License or after its termination shall be subject to the
+requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101
+et seq., the equivalent laws of other countries, and international
+treaty. This section shall survive the termination of this License.
+
+12) Attorneys Fees. In any action to enforce the terms of this License
+or seeking damages relating thereto, the prevailing party shall be
+entitled to recover its costs and expenses, including, without
+limitation, reasonable attorneys' fees and costs incurred in
+connection with such action, including any appeal of such action. This
+section shall survive the termination of this License.
+
+13) Miscellaneous. This License represents the complete agreement
+concerning the subject matter hereof. If any provision of this License
+is held to be unenforceable, such provision shall be reformed only to
+the extent necessary to make it enforceable.
+
+14) Definition of "You" in This License. "You" throughout this
+License, whether in upper or lower case, means an individual or a
+legal entity exercising rights under, and complying with all of the
+terms of, this License. For legal entities, "You" includes any entity
+that controls, is controlled by, or is under common control with
+you. For purposes of this definition, "control" means (i) the power,
+direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty
+percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity.
+
+15) Right to Use. You may use the Original Work in all ways not
+otherwise restricted or conditioned by this License or by law, and
+Licensor promises not to interfere with or be responsible for such
+uses by You.
+
+This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights
+reserved. Permission is hereby granted to copy and distribute this
+license without modification. This license may not be modified without
+the express written permission of its copyright owner.
+
+
+--
+END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential
+differences between the Academic Free License (AFL) version 1.0 and other
+open source licenses:
+
+The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache
+licenses in many respects but it is intended to solve a few problems with
+those licenses.
+
+* The AFL is written so as to make it clear what software is being
+licensed (by the inclusion of a statement following the copyright notice
+in the software). This way, the license functions better than a template
+license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software.
+
+* The AFL contains a complete copyright grant to the software. The BSD
+and Apache licenses are vague and incomplete in that respect.
+
+* The AFL contains a complete patent grant to the software. The BSD, MIT,
+UoI/NCSA and Apache licenses rely on an implied patent license and contain
+no explicit patent grant.
+
+* The AFL makes it clear that no trademark rights are granted to the
+licensor's trademarks. The Apache license contains such a provision, but the
+BSD, MIT and UoI/NCSA licenses do not.
+
+* The AFL includes the warranty by the licensor that it either owns the
+copyright or that it is distributing the software under a license. None of
+the other licenses contain that warranty. All other warranties are disclaimed,
+as is the case for the other licenses.
+
+* The AFL is itself copyrighted (with the right granted to copy and distribute
+without modification). This ensures that the owner of the copyright to the
+license will control changes. The Apache license contains a copyright notice,
+but the BSD, MIT and UoI/NCSA licenses do not.
--- dbus-1.2.16.orig/debian/dbus.install
+++ dbus-1.2.16/debian/dbus.install
@@ -0,0 +1,14 @@
+debian/tmp/etc/dbus-1/
+debian/tmp/bin/dbus-daemon
+debian/tmp/bin/dbus-cleanup-sockets
+debian/tmp/bin/dbus-send usr/bin
+debian/tmp/bin/dbus-uuidgen
+debian/tmp/bin/dbus-monitor usr/bin
+debian/tmp/lib/dbus-1.0/dbus-daemon-launch-helper
+debian/tmp/usr/share/man/man1/dbus-daemon.1
+debian/tmp/usr/share/man/man1/dbus-cleanup-sockets.1
+debian/tmp/usr/share/dbus-1/services
+debian/tmp/usr/share/dbus-1/system-services
+debian/tmp/usr/share/man/man1/dbus-send.1
+debian/tmp/usr/share/man/man1/dbus-uuidgen.1
+debian/tmp/usr/share/man/man1/dbus-monitor.1
--- dbus-1.2.16.orig/debian/patches/99-CVE-2011-2200.patch
+++ dbus-1.2.16/debian/patches/99-CVE-2011-2200.patch
@@ -0,0 +1,35 @@
+Origin: 6519a1f77c61d753d4c97efd6e15630eb275336e
+Description: _dbus_header_byteswap: change the first byte of the message, not just the struct member
+
+This has been wrong approximately forever, for instance see:
+http://lists.freedesktop.org/archives/dbus/2007-March/007357.html
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38120
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629938
+Reviewed-by: Will Thompson
+
+Index: dbus-1.2.16/dbus/dbus-marshal-header.c
+===================================================================
+--- dbus-1.2.16.orig/dbus/dbus-marshal-header.c 2011-07-22 09:04:37.000000000 -0500
++++ dbus-1.2.16/dbus/dbus-marshal-header.c 2011-07-22 09:04:44.000000000 -0500
+@@ -1462,14 +1462,20 @@
+ _dbus_header_byteswap (DBusHeader *header,
+ int new_order)
+ {
++ unsigned char byte_order;
++
+ if (header->byte_order == new_order)
+ return;
+
++ byte_order = _dbus_string_get_byte (&header->data, BYTE_ORDER_OFFSET);
++ _dbus_assert (header->byte_order == byte_order);
++
+ _dbus_marshal_byteswap (&_dbus_header_signature_str,
+ 0, header->byte_order,
+ new_order,
+ &header->data, 0);
+
++ _dbus_string_set_byte (&header->data, BYTE_ORDER_OFFSET, new_order);
+ header->byte_order = new_order;
+ }
+
--- dbus-1.2.16.orig/debian/patches/00_dbus-quiesce-startup-errors.patch
+++ dbus-1.2.16/debian/patches/00_dbus-quiesce-startup-errors.patch
@@ -0,0 +1,25 @@
+Index: dbus-1.2.14/bus/config-parser.c
+===================================================================
+--- dbus-1.2.14.orig/bus/config-parser.c 2009-05-05 22:51:37.000000000 +0200
++++ dbus-1.2.14/bus/config-parser.c 2009-05-07 00:16:25.000000000 +0200
+@@ -2193,8 +2193,18 @@
+ {
+ 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);
++ }
+ }
+ }
+
--- dbus-1.2.16.orig/debian/patches/10_dbus-1.0.1-generate-xml-docs.patch
+++ dbus-1.2.16/debian/patches/10_dbus-1.0.1-generate-xml-docs.patch
@@ -0,0 +1,13 @@
+Index: dbus-1.2.14/Doxyfile.in
+===================================================================
+--- dbus-1.2.14.orig/Doxyfile.in 2009-04-17 21:45:29.000000000 +0200
++++ dbus-1.2.14/Doxyfile.in 2009-05-07 00:19:57.000000000 +0200
+@@ -133,7 +133,7 @@
+ #---------------------------------------------------------------------------
+ # configuration options related to the XML output
+ #---------------------------------------------------------------------------
+-GENERATE_XML = NO
++GENERATE_XML = YES
+ #---------------------------------------------------------------------------
+ # Configuration options related to the preprocessor
+ #---------------------------------------------------------------------------
--- dbus-1.2.16.orig/debian/patches/20_kbsd_cmsgcred.patch
+++ dbus-1.2.16/debian/patches/20_kbsd_cmsgcred.patch
@@ -0,0 +1,13 @@
+Index: dbus-1.2.16/dbus/dbus-sysdeps-unix.c
+===================================================================
+--- dbus-1.2.16.orig/dbus/dbus-sysdeps-unix.c 2009-07-14 21:42:38.000000000 +0200
++++ dbus-1.2.16/dbus/dbus-sysdeps-unix.c 2009-07-16 02:09:20.000000000 +0200
+@@ -1241,7 +1241,7 @@
+ #elif defined(HAVE_CMSGCRED)
+ struct cmsgcred *cred;
+
+- cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
++ cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
+ pid_read = cred->cmcred_pid;
+ uid_read = cred->cmcred_euid;
+ #elif defined(LOCAL_CREDS)
--- dbus-1.2.16.orig/debian/patches/11_timeout_handling.patch
+++ dbus-1.2.16/debian/patches/11_timeout_handling.patch
@@ -0,0 +1,59 @@
+Index: dbus-1.2.16/dbus/dbus-connection.c
+===================================================================
+--- dbus-1.2.16.orig/dbus/dbus-connection.c 2009-10-01 14:10:21.000000000 +0100
++++ dbus-1.2.16/dbus/dbus-connection.c 2009-10-01 14:13:16.000000000 +0100
+@@ -2386,7 +2386,7 @@
+ */
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+
+- _dbus_memory_pause_based_on_timeout (timeout_milliseconds);
++ _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
+ }
+ else
+ {
+@@ -2394,7 +2394,7 @@
+ _dbus_connection_do_iteration_unlocked (connection,
+ DBUS_ITERATION_DO_READING |
+ DBUS_ITERATION_BLOCK,
+- timeout_milliseconds);
++ timeout_milliseconds - elapsed_milliseconds);
+ }
+
+ goto recheck_status;
+@@ -2403,9 +2403,7 @@
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
+ else if (elapsed_milliseconds < timeout_milliseconds)
+ {
+- timeout_milliseconds -= elapsed_milliseconds;
+- _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds);
+- _dbus_assert (timeout_milliseconds >= 0);
++ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds - elapsed_milliseconds);
+
+ if (status == DBUS_DISPATCH_NEED_MEMORY)
+ {
+@@ -2415,7 +2413,7 @@
+ */
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+
+- _dbus_memory_pause_based_on_timeout (timeout_milliseconds);
++ _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
+ }
+ else
+ {
+@@ -2423,14 +2421,14 @@
+ _dbus_connection_do_iteration_unlocked (connection,
+ DBUS_ITERATION_DO_READING |
+ DBUS_ITERATION_BLOCK,
+- timeout_milliseconds);
++ timeout_milliseconds - elapsed_milliseconds);
+ }
+
+ goto recheck_status;
+ }
+
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): Waited %ld milliseconds and got no reply\n",
+- (tv_sec - start_tv_sec) * 1000 + (tv_usec - start_tv_usec) / 1000);
++ elapsed_milliseconds);
+
+ _dbus_assert (!_dbus_pending_call_get_completed_unlocked (pending));
+
--- dbus-1.2.16.orig/debian/patches/02_dbus_monitor_no_sigint_handler.patch
+++ dbus-1.2.16/debian/patches/02_dbus_monitor_no_sigint_handler.patch
@@ -0,0 +1,41 @@
+Index: dbus-1.2.16/tools/dbus-monitor.c
+===================================================================
+--- dbus-1.2.16.orig/tools/dbus-monitor.c 2009-07-14 21:42:25.000000000 +0200
++++ dbus-1.2.16/tools/dbus-monitor.c 2009-07-16 02:08:59.000000000 +0200
+@@ -33,8 +33,6 @@
+
+ #include
+
+-#include
+-
+ #include "dbus-print-message.h"
+
+ #ifdef DBUS_WIN
+@@ -195,14 +193,6 @@
+ exit (ecode);
+ }
+
+-static dbus_bool_t sigint_received = FALSE;
+-
+-static void
+-sigint_handler (int signum)
+-{
+- sigint_received = TRUE;
+-}
+-
+ int
+ main (int argc, char *argv[])
+ {
+@@ -338,11 +328,7 @@
+ 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:
--- dbus-1.2.16.orig/debian/patches/81-session.conf-timeout.patch
+++ dbus-1.2.16/debian/patches/81-session.conf-timeout.patch
@@ -0,0 +1,16 @@
+# Description: Raise the service startup timeout from 25 to 60 seconds. It may be too short on the live CD with slow machines.
+# UbuntuSpecific: Debian and upstream are not concerned about live CDs
+
+--- dbus-1.2.14.orig/bus/session.conf.in 2006-11-19 23:58:47.378368108 +0100
++++ dbus-1.2.14/bus/session.conf.in 2006-11-19 23:59:13.123835260 +0100
+@@ -25,6 +25,10 @@
+
+
+
++
++ 60000
++
+
+ session.d
--- dbus-1.2.16.orig/debian/patches/30_rt-as-needed.patch
+++ dbus-1.2.16/debian/patches/30_rt-as-needed.patch
@@ -0,0 +1,144 @@
+diff --git a/bus/Makefile.am b/bus/Makefile.am
+index 3b4f69d..ad49e6d 100644
+--- a/bus/Makefile.am
++++ b/bus/Makefile.am
+@@ -78,8 +78,8 @@ dbus_daemon_SOURCES= \
+
+ dbus_daemon_LDADD= \
+ $(EFENCE) \
+- $(DBUS_BUS_LIBS) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(DBUS_BUS_LIBS)
+
+ dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
+
+@@ -103,8 +103,8 @@ dbus_daemon_launch_helper_SOURCES= \
+ $(LAUNCH_HELPER_SOURCES)
+
+ dbus_daemon_launch_helper_LDADD= \
+- $(DBUS_LAUNCHER_LIBS) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(DBUS_LAUNCHER_LIBS)
+
+ dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+
+@@ -115,8 +115,8 @@ dbus_daemon_launch_helper_test_SOURCES= \
+ $(LAUNCH_HELPER_SOURCES)
+
+ dbus_daemon_launch_helper_test_LDADD= \
+- $(DBUS_LAUNCHER_LIBS) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(DBUS_LAUNCHER_LIBS)
+
+ dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ dbus_daemon_launch_helper_test_CPPFLAGS= \
+@@ -129,8 +129,8 @@ bus_test_launch_helper_SOURCES= \
+ $(LAUNCH_HELPER_SOURCES)
+
+ bus_test_launch_helper_LDADD= \
+- $(DBUS_LAUNCHER_LIBS) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(DBUS_LAUNCHER_LIBS)
+
+ bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ bus_test_launch_helper_CPPFLAGS= \
+diff --git a/bus/Makefile.in b/bus/Makefile.in
+index fde3829..02520b6 100644
+--- a/bus/Makefile.in
++++ b/bus/Makefile.in
+@@ -111,8 +111,9 @@ am_bus_test_launch_helper_OBJECTS = \
+ bus_test_launch_helper-test-launch-helper.$(OBJEXT) \
+ $(am__objects_5)
+ bus_test_launch_helper_OBJECTS = $(am_bus_test_launch_helper_OBJECTS)
+-bus_test_launch_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++bus_test_launch_helper_DEPENDENCIES = \
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(am__DEPENDENCIES_1)
+ bus_test_launch_helper_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(bus_test_launch_helper_LDFLAGS) $(LDFLAGS) -o $@
+@@ -142,8 +143,9 @@ am__dbus_daemon_SOURCES_DIST = activation.c activation.h \
+ config-loader-libxml.c main.c
+ am_dbus_daemon_OBJECTS = $(am__objects_3) main.$(OBJEXT)
+ dbus_daemon_OBJECTS = $(am_dbus_daemon_OBJECTS)
+-dbus_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++dbus_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(am__DEPENDENCIES_1)
+ dbus_daemon_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(dbus_daemon_LDFLAGS) $(LDFLAGS) -o $@
+@@ -160,8 +162,9 @@ am_dbus_daemon_launch_helper_OBJECTS = \
+ activation-helper-bin.$(OBJEXT) $(am__objects_6)
+ dbus_daemon_launch_helper_OBJECTS = \
+ $(am_dbus_daemon_launch_helper_OBJECTS)
+-dbus_daemon_launch_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++dbus_daemon_launch_helper_DEPENDENCIES = \
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(am__DEPENDENCIES_1)
+ dbus_daemon_launch_helper_LINK = $(LIBTOOL) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(dbus_daemon_launch_helper_LDFLAGS) \
+@@ -185,8 +188,9 @@ am_dbus_daemon_launch_helper_test_OBJECTS = dbus_daemon_launch_helper_test-activ
+ $(am__objects_8)
+ dbus_daemon_launch_helper_test_OBJECTS = \
+ $(am_dbus_daemon_launch_helper_test_OBJECTS)
+-dbus_daemon_launch_helper_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++dbus_daemon_launch_helper_test_DEPENDENCIES = \
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(am__DEPENDENCIES_1)
+ dbus_daemon_launch_helper_test_LINK = $(LIBTOOL) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) \
+@@ -497,8 +501,8 @@ dbus_daemon_SOURCES = \
+
+ dbus_daemon_LDADD = \
+ $(EFENCE) \
+- $(DBUS_BUS_LIBS) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(DBUS_BUS_LIBS)
+
+ dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
+ LAUNCH_HELPER_SOURCES = \
+@@ -520,8 +524,8 @@ dbus_daemon_launch_helper_SOURCES = \
+ $(LAUNCH_HELPER_SOURCES)
+
+ dbus_daemon_launch_helper_LDADD = \
+- $(DBUS_LAUNCHER_LIBS) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(DBUS_LAUNCHER_LIBS)
+
+ dbus_daemon_launch_helper_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ dbus_daemon_launch_helper_test_SOURCES = \
+@@ -529,8 +533,8 @@ dbus_daemon_launch_helper_test_SOURCES = \
+ $(LAUNCH_HELPER_SOURCES)
+
+ dbus_daemon_launch_helper_test_LDADD = \
+- $(DBUS_LAUNCHER_LIBS) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(DBUS_LAUNCHER_LIBS)
+
+ dbus_daemon_launch_helper_test_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ dbus_daemon_launch_helper_test_CPPFLAGS = \
+@@ -541,8 +545,8 @@ bus_test_launch_helper_SOURCES = \
+ $(LAUNCH_HELPER_SOURCES)
+
+ bus_test_launch_helper_LDADD = \
+- $(DBUS_LAUNCHER_LIBS) \
+- $(top_builddir)/dbus/libdbus-convenience.la
++ $(top_builddir)/dbus/libdbus-convenience.la \
++ $(DBUS_LAUNCHER_LIBS)
+
+ bus_test_launch_helper_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ bus_test_launch_helper_CPPFLAGS = \
--- dbus-1.2.16.orig/debian/patches/20_system_conf_limit.patch
+++ dbus-1.2.16/debian/patches/20_system_conf_limit.patch
@@ -0,0 +1,12 @@
+Index: dbus-1.2.16/bus/system.conf.in
+===================================================================
+--- dbus-1.2.16.orig/bus/system.conf.in 2009-10-23 20:06:56.000000000 +0200
++++ dbus-1.2.16/bus/system.conf.in 2009-10-23 20:09:53.000000000 +0200
+@@ -80,4 +80,7 @@
+
+ contexts/dbus_contexts
+
++
++ 5000
+
--- dbus-1.2.16.orig/debian/patches/01_no-fatal-warnings.patch
+++ dbus-1.2.16/debian/patches/01_no-fatal-warnings.patch
@@ -0,0 +1,13 @@
+Index: dbus-1.2.14/dbus/dbus-internals.c
+===================================================================
+--- dbus-1.2.14.orig/dbus/dbus-internals.c 2009-04-17 21:45:29.000000000 +0200
++++ dbus-1.2.14/dbus/dbus-internals.c 2009-05-07 00:16:33.000000000 +0200
+@@ -193,7 +193,7 @@
+
+ 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)
--- dbus-1.2.16.orig/debian/patches/99-CVE-2010-4352.patch
+++ dbus-1.2.16/debian/patches/99-CVE-2010-4352.patch
@@ -0,0 +1,211 @@
+Origin: http://cgit.freedesktop.org/dbus/dbus/commit/?id=7d65a3a6ed8815e34a99c680ac3869fde49dbbd4
+Description: Fix for CVE-2010-4352. Limit nesting to 64 for dynamic message
+ variants, backported from upstream.
+Bug-Ubuntu: https://launchpad.net/bugs/688992
+
+Index: dbus-1.2.16/dbus/dbus-marshal-validate.c
+===================================================================
+--- dbus-1.2.16.orig/dbus/dbus-marshal-validate.c 2011-01-04 14:30:13.000000000 -0600
++++ dbus-1.2.16/dbus/dbus-marshal-validate.c 2011-01-04 14:30:18.000000000 -0600
+@@ -289,16 +289,30 @@
+ return result;
+ }
+
++/* note: this function is also used to validate the header's values,
++ * since the header is a valid body with a particular signature.
++ */
+ static DBusValidity
+ validate_body_helper (DBusTypeReader *reader,
+ int byte_order,
+ dbus_bool_t walk_reader_to_end,
++ int total_depth,
+ const unsigned char *p,
+ const unsigned char *end,
+ const unsigned char **new_p)
+ {
+ int current_type;
+
++ /* The spec allows arrays and structs to each nest 32, for total
++ * nesting of 2*32. We want to impose the same limit on "dynamic"
++ * value nesting (not visible in the signature) which is introduced
++ * by DBUS_TYPE_VARIANT.
++ */
++ if (total_depth > (DBUS_MAXIMUM_TYPE_RECURSION_DEPTH * 2))
++ {
++ return DBUS_INVALID_NESTED_TOO_DEEPLY;
++ }
++
+ while ((current_type = _dbus_type_reader_get_current_type (reader)) != DBUS_TYPE_INVALID)
+ {
+ const unsigned char *a;
+@@ -474,7 +488,9 @@
+ {
+ while (p < array_end)
+ {
+- validity = validate_body_helper (&sub, byte_order, FALSE, p, end, &p);
++ validity = validate_body_helper (&sub, byte_order, FALSE,
++ total_depth + 1,
++ p, end, &p);
+ if (validity != DBUS_VALID)
+ return validity;
+ }
+@@ -591,7 +607,9 @@
+
+ _dbus_assert (_dbus_type_reader_get_current_type (&sub) != DBUS_TYPE_INVALID);
+
+- validity = validate_body_helper (&sub, byte_order, FALSE, p, end, &p);
++ validity = validate_body_helper (&sub, byte_order, FALSE,
++ total_depth + 1,
++ p, end, &p);
+ if (validity != DBUS_VALID)
+ return validity;
+
+@@ -620,7 +638,9 @@
+
+ _dbus_type_reader_recurse (reader, &sub);
+
+- validity = validate_body_helper (&sub, byte_order, TRUE, p, end, &p);
++ validity = validate_body_helper (&sub, byte_order, TRUE,
++ total_depth + 1,
++ p, end, &p);
+ if (validity != DBUS_VALID)
+ return validity;
+ }
+@@ -705,7 +725,7 @@
+ p = _dbus_string_get_const_data_len (value_str, value_pos, len);
+ end = p + len;
+
+- validity = validate_body_helper (&reader, byte_order, TRUE, p, end, &p);
++ validity = validate_body_helper (&reader, byte_order, TRUE, 0, p, end, &p);
+ if (validity != DBUS_VALID)
+ return validity;
+
+@@ -875,7 +895,7 @@
+ case DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS: return "Dict entry has too many fields";
+ case DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY: return "Dict entry not inside array";
+ case DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE: return "Dict key must be basic type";
+-
++ case DBUS_INVALID_NESTED_TOO_DEEPLY: return "Variants cannot be used to create a hugely recursive tree of values";
+ default:
+ return "Invalid";
+ }
+Index: dbus-1.2.16/dbus/dbus-marshal-validate.h
+===================================================================
+--- dbus-1.2.16.orig/dbus/dbus-marshal-validate.h 2011-01-04 14:30:13.000000000 -0600
++++ dbus-1.2.16/dbus/dbus-marshal-validate.h 2011-01-04 14:32:13.000000000 -0600
+@@ -117,6 +117,7 @@
+ DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS = 53,
+ DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY = 54,
+ DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE = 55,
++ DBUS_INVALID_NESTED_TOO_DEEPLY = 56,
+ DBUS_VALIDITY_LAST
+ } DBusValidity;
+
+Index: dbus-1.2.16/dbus/dbus-message-factory.c
+===================================================================
+--- dbus-1.2.16.orig/dbus/dbus-message-factory.c 2011-01-04 14:30:13.000000000 -0600
++++ dbus-1.2.16/dbus/dbus-message-factory.c 2011-01-04 14:30:18.000000000 -0600
+@@ -333,6 +333,53 @@
+ return message;
+ }
+
++static DBusMessage*
++message_with_nesting_levels (int levels)
++{
++ DBusMessage *message;
++ dbus_int32_t v_INT32;
++ DBusMessageIter *parents;
++ DBusMessageIter *children;
++ int i;
++
++ /* If levels is higher it breaks sig_refcount in DBusMessageRealIter
++ * in dbus-message.c, this assert is just to help you know you need
++ * to fix that if you hit it
++ */
++ _dbus_assert (levels < 256);
++
++ parents = dbus_new(DBusMessageIter, levels + 1);
++ children = dbus_new(DBusMessageIter, levels + 1);
++
++ v_INT32 = 42;
++ message = simple_method_call ();
++
++ i = 0;
++ dbus_message_iter_init_append (message, &parents[i]);
++ while (i < levels)
++ {
++ dbus_message_iter_open_container (&parents[i], DBUS_TYPE_VARIANT,
++ i == (levels - 1) ?
++ DBUS_TYPE_INT32_AS_STRING :
++ DBUS_TYPE_VARIANT_AS_STRING,
++ &children[i]);
++ ++i;
++ parents[i] = children[i-1];
++ }
++ --i;
++ dbus_message_iter_append_basic (&children[i], DBUS_TYPE_INT32, &v_INT32);
++ while (i >= 0)
++ {
++ dbus_message_iter_close_container (&parents[i], &children[i]);
++ --i;
++ }
++
++ dbus_free(parents);
++ dbus_free(children);
++
++ return message;
++}
++
+ static dbus_bool_t
+ generate_special (DBusMessageDataIter *iter,
+ DBusString *data,
+@@ -735,6 +782,24 @@
+
+ *expected_validity = DBUS_INVALID_DICT_ENTRY_HAS_NO_FIELDS;
+ }
++ else if (item_seq == 20)
++ {
++ /* 64 levels of nesting is OK */
++ message = message_with_nesting_levels(64);
++
++ generate_from_message (data, expected_validity, message);
++
++ *expected_validity = DBUS_VALID;
++ }
++ else if (item_seq == 21)
++ {
++ /* 65 levels of nesting is not OK */
++ message = message_with_nesting_levels(65);
++
++ generate_from_message (data, expected_validity, message);
++
++ *expected_validity = DBUS_INVALID_NESTED_TOO_DEEPLY;
++ }
+ else
+ {
+ return FALSE;
+Index: dbus-1.2.16/doc/dbus-specification.xml
+===================================================================
+--- dbus-1.2.16.orig/doc/dbus-specification.xml 2011-01-04 14:30:13.000000000 -0600
++++ dbus-1.2.16/doc/dbus-specification.xml 2011-01-04 14:30:18.000000000 -0600
+@@ -561,12 +561,14 @@
+
+ VARIANT
+
+- A variant type has a marshaled SIGNATURE
+- followed by a marshaled value with the type
+- given in the signature.
+- Unlike a message signature, the variant signature
+- can contain only a single complete type.
+- So "i", "ai" or "(ii)" is OK, but "ii" is not.
++ A variant type has a marshaled
++ SIGNATURE followed by a marshaled
++ value with the type given in the signature. Unlike
++ a message signature, the variant signature can
++ contain only a single complete type. So "i", "ai"
++ or "(ii)" is OK, but "ii" is not. Use of variants may not
++ cause a total message depth to be larger than 64, including
++ other container types such as structures.
+
+
+ 1 (alignment of the signature)
--- dbus-1.2.16.orig/debian/patches/series
+++ dbus-1.2.16/debian/patches/series
@@ -0,0 +1,11 @@
+00_dbus-quiesce-startup-errors.patch
+01_no-fatal-warnings.patch
+02_dbus_monitor_no_sigint_handler.patch
+10_dbus-1.0.1-generate-xml-docs.patch
+20_kbsd_cmsgcred.patch
+30_rt-as-needed.patch
+11_timeout_handling.patch
+20_system_conf_limit.patch
+81-session.conf-timeout.patch
+99-CVE-2010-4352.patch
+99-CVE-2011-2200.patch