diff --git a/.dbus.metadata b/.dbus.metadata new file mode 100644 index 0000000..b83c4c9 --- /dev/null +++ b/.dbus.metadata @@ -0,0 +1 @@ +96f7ae2edb8711fe4fb42718d03fdb00a90416d5 SOURCES/dbus-1.6.12.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b50cc85 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/dbus-1.6.12.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/00-start-message-bus.sh b/SOURCES/00-start-message-bus.sh new file mode 100755 index 0000000..582b424 --- /dev/null +++ b/SOURCES/00-start-message-bus.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# Copyright (C) 2008 Red Hat, Inc. +# +# All rights reserved. This copyrighted material is made available to anyone +# wishing to use, modify, copy, or redistribute it subject to the terms and +# conditions of the GNU General Public License version 2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + eval `dbus-launch --sh-syntax --exit-with-session` +fi diff --git a/SOURCES/0001-_dbus_babysitter_unref-avoid-infinite-loop-if-waitpi.patch b/SOURCES/0001-_dbus_babysitter_unref-avoid-infinite-loop-if-waitpi.patch new file mode 100644 index 0000000..358ebac --- /dev/null +++ b/SOURCES/0001-_dbus_babysitter_unref-avoid-infinite-loop-if-waitpi.patch @@ -0,0 +1,48 @@ +From a4f11f83a4b8ba8c7feecd37c7606d0d792d7fe6 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Wed, 4 Sep 2013 17:53:23 +0100 +Subject: [PATCH] _dbus_babysitter_unref: avoid infinite loop if waitpid() + returns EINTR + +If waitpid() failed with EINTR, we'd go back for another go, but +because ret is nonzero, we'd skip the waitpid() and just keep looping. + +Also avoid an unnecessary "goto" in favour of a proper loop, to make it +more clearly correct. + +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68945 +--- + dbus/dbus-spawn.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c +index ef00801..6e42f55 100644 +--- a/dbus/dbus-spawn.c ++++ b/dbus/dbus-spawn.c +@@ -308,15 +308,18 @@ _dbus_babysitter_unref (DBusBabysitter *sitter) + if (ret == 0) + kill (sitter->sitter_pid, SIGKILL); + +- again: + if (ret == 0) +- ret = waitpid (sitter->sitter_pid, &status, 0); ++ { ++ do ++ { ++ ret = waitpid (sitter->sitter_pid, &status, 0); ++ } ++ while (_DBUS_UNLIKELY (ret < 0 && errno == EINTR)); ++ } + + if (ret < 0) + { +- if (errno == EINTR) +- goto again; +- else if (errno == ECHILD) ++ if (errno == ECHILD) + _dbus_warn ("Babysitter process not available to be reaped; should not happen\n"); + else + _dbus_warn ("Unexpected error %d in waitpid() for babysitter: %s\n", +-- +1.8.4.rc3 + diff --git a/SOURCES/0001-name-test-Don-t-run-test-autolaunch-if-we-don-t-have.patch b/SOURCES/0001-name-test-Don-t-run-test-autolaunch-if-we-don-t-have.patch new file mode 100644 index 0000000..1f2db48 --- /dev/null +++ b/SOURCES/0001-name-test-Don-t-run-test-autolaunch-if-we-don-t-have.patch @@ -0,0 +1,29 @@ +From 116f212581c93dba56ce5bc7b3f28237b2940145 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 18 Jul 2013 15:14:58 -0400 +Subject: [PATCH] name-test: Don't run test-autolaunch if we don't have dbus-launch + +libdbus will look for its compiled-in path to find dbus-launch, and +not find it when running in a buildroot that doesn't have dbus +installed (the typical case for pbuilder/mock). +--- + test/name-test/run-test.sh | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh +index cad5937..0bb0aee 100755 +--- a/test/name-test/run-test.sh ++++ b/test/name-test/run-test.sh +@@ -57,4 +57,8 @@ elif ! $PYTHON $DBUS_TOP_SRCDIR/test/name-test/test-activation-forking.py; then + fi + + echo "running test-autolaunch" +-${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-autolaunch || die "test-autolaunch failed" ++if which dbus-launch 2>/dev/null; then ++ ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-autolaunch || die "test-autolaunch failed" ++else ++ echo "Skipping test-autolaunch, no dbus-launch in $PATH" ++fi +-- +1.7.1 + diff --git a/SOURCES/0001-test-marshal-Ensure-we-use-suitably-aligned-buffers.patch b/SOURCES/0001-test-marshal-Ensure-we-use-suitably-aligned-buffers.patch new file mode 100644 index 0000000..d7cea52 --- /dev/null +++ b/SOURCES/0001-test-marshal-Ensure-we-use-suitably-aligned-buffers.patch @@ -0,0 +1,64 @@ +From 1a09d46b3cad370e4bd2c59ec6215fbf65351834 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Wed, 24 Jul 2013 21:48:58 +0100 +Subject: [PATCH] test/marshal: Ensure we use suitably aligned buffers + +This test was failing on s390; though it could fail +on other platforms too. Basically we need to be sure +we're passing at least word-aligned buffers to the +demarshalling code. malloc() will do that for us. +--- + test/marshal.c | 27 ++++++++++++++++++++++----- + 1 file changed, 22 insertions(+), 5 deletions(-) + +diff --git a/test/marshal.c b/test/marshal.c +index e9ac7e3..e65ee7c 100644 +--- a/test/marshal.c ++++ b/test/marshal.c +@@ -27,6 +27,7 @@ + #include + + #include ++#include + + #include + #include +@@ -244,14 +245,30 @@ int + main (int argc, + char **argv) + { ++ int ret; ++ char *aligned_le_blob; ++ char *aligned_be_blob; ++ + g_test_init (&argc, &argv, NULL); + +- g_test_add ("/demarshal/le", Fixture, le_blob, setup, test_endian, teardown); +- g_test_add ("/demarshal/be", Fixture, be_blob, setup, test_endian, teardown); +- g_test_add ("/demarshal/needed/le", Fixture, le_blob, setup, test_needed, ++ /* We have to pass in a buffer that's at least "default aligned", ++ * i.e. on GNU systems to 8 or 16. The linker may have only given ++ * us byte-alignment for the char[] static variables. ++ */ ++ aligned_le_blob = g_malloc (sizeof (le_blob)); ++ memcpy (aligned_le_blob, le_blob, sizeof (le_blob)); ++ aligned_be_blob = g_malloc (sizeof (be_blob)); ++ memcpy (aligned_be_blob, be_blob, sizeof (be_blob)); ++ ++ g_test_add ("/demarshal/le", Fixture, aligned_le_blob, setup, test_endian, teardown); ++ g_test_add ("/demarshal/be", Fixture, aligned_be_blob, setup, test_endian, teardown); ++ g_test_add ("/demarshal/needed/le", Fixture, aligned_le_blob, setup, test_needed, + teardown); +- g_test_add ("/demarshal/needed/be", Fixture, be_blob, setup, test_needed, ++ g_test_add ("/demarshal/needed/be", Fixture, aligned_be_blob, setup, test_needed, + teardown); + +- return g_test_run (); ++ ret = g_test_run (); ++ g_free (aligned_le_blob); ++ g_free (aligned_be_blob); ++ return ret; + } +-- +1.8.1.4 + diff --git a/SOURCES/0001-tests-Disable-name-test.patch b/SOURCES/0001-tests-Disable-name-test.patch new file mode 100644 index 0000000..5693d9f --- /dev/null +++ b/SOURCES/0001-tests-Disable-name-test.patch @@ -0,0 +1,27 @@ +From e0034acc5253a443eeb9232b316eb987c44ce3e7 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 11 Nov 2013 15:55:26 -0500 +Subject: [PATCH] tests: Disable name-test + +This wants to access $DISPLAY, which isn't available in mock. +--- + test/name-test/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am +index 6aaf178..48a9cda 100644 +--- a/test/name-test/Makefile.am ++++ b/test/name-test/Makefile.am +@@ -13,7 +13,8 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ + ## TESTS + if DBUS_BUILD_TESTS + TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@ PYTHON=@PYTHON@ +-TESTS=run-test.sh run-test-systemserver.sh ++# Disabling due to attempting to access $DISPLAY ++#TESTS=run-test.sh run-test-systemserver.sh + else + TESTS= + endif +-- +1.8.3.1 + diff --git a/SOURCES/avoid-undefined-7c00ed22d9b5c33f5b33221e906946b11a9bde3b.patch b/SOURCES/avoid-undefined-7c00ed22d9b5c33f5b33221e906946b11a9bde3b.patch new file mode 100644 index 0000000..3f13319 --- /dev/null +++ b/SOURCES/avoid-undefined-7c00ed22d9b5c33f5b33221e906946b11a9bde3b.patch @@ -0,0 +1,40 @@ +From 7c00ed22d9b5c33f5b33221e906946b11a9bde3b Mon Sep 17 00:00:00 2001 +From: DreamNik +Date: Sun, 29 Sep 2013 10:45:58 +0000 +Subject: make_and_run_test_nodes: avoid undefined behaviour + +In code that looks like n[i] = v(&i), where v increments i, C leaves it +undefined whether the old or new value of i is used to locate n[i]. +As it happens, gcc used the pre-increment value of i, but MSVC +used the post-increment value. + +Fix this by inserting a sequence point to disambiguate the intended order. + +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69924 +Reviewed-by: Chengwei Yang +Reviewed-by: Simon McVittie +[wrote commit message, fixed whitespace -smcv] +Signed-off-by: Simon McVittie +--- +diff --git a/dbus/dbus-marshal-recursive-util.c b/dbus/dbus-marshal-recursive-util.c +index 9512414..a2aaaf9 100644 +--- a/dbus/dbus-marshal-recursive-util.c ++++ b/dbus/dbus-marshal-recursive-util.c +@@ -1785,10 +1785,13 @@ make_and_run_test_nodes (void) + start_next_test ("All values in one big toplevel %d iteration\n", 1); + { + TestTypeNode *nodes[N_VALUES]; ++ TestTypeNode *node; + + i = 0; +- while ((nodes[i] = value_generator (&i))) +- ; ++ while ((node = value_generator (&i))) ++ { ++ nodes[i - 1] = node; ++ } + + run_test_nodes (nodes, N_VALUES); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/bindir.patch b/SOURCES/bindir.patch new file mode 100644 index 0000000..c5324fc --- /dev/null +++ b/SOURCES/bindir.patch @@ -0,0 +1,12 @@ +diff -up dbus-1.2.1/bus/messagebus.in.start-early dbus-1.2.1/bus/messagebus.in +--- dbus-1.2.1/bus/messagebus.in.start-early 2008-04-04 11:24:08.000000000 -0400 ++++ dbus-1.2.1/bus/messagebus.in 2008-07-18 19:50:19.000000000 -0400 +@@ -21,7 +21,7 @@ + ### END INIT INFO + + # Sanity checks. +-[ -x @EXPANDED_BINDIR@/dbus-daemon ] || exit 0 ++[ -x /bin/dbus-daemon ] || exit 0 + + # Source function library. + . @EXPANDED_SYSCONFDIR@/rc.d/init.d/functions diff --git a/SOURCES/dbus-1.6.12-auth-process-ok-message-dispatch-test-fix.patch b/SOURCES/dbus-1.6.12-auth-process-ok-message-dispatch-test-fix.patch new file mode 100644 index 0000000..5f0ef18 --- /dev/null +++ b/SOURCES/dbus-1.6.12-auth-process-ok-message-dispatch-test-fix.patch @@ -0,0 +1,47 @@ +From b17615cda8a7ec80692d84e544b71e8183461aa5 Mon Sep 17 00:00:00 2001 +From: Roy Li +Date: Wed, 21 Jan 2015 09:28:53 +0000 +Subject: [PATCH] dbus: clear guid_from_server if send_negotiate_unix_fd failed + +Once send_negotiate_unix_fd failed, this failure will happen, since +auth->guid_from_server has been set to some value before +send_negotiate_unix_fd. send_negotiate_unix_fd failure will lead to this +auth be handled by process_ok again, but this auth->guid_from_server is +not zero. + +So we should clear auth->guid_from_server if send_negotiate_unix_fd +failed. + +http://lists.freedesktop.org/archives/dbus/2014-February/016122.html +https://bugs.freedesktop.org/show_bug.cgi?id=75589 +https://bugzilla.redhat.com/show_bug.cgi?id=1183755 + +Signed-off-by: Roy Li +--- + dbus/dbus-auth.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c +index d2c37a7..dd6e61d 100644 +--- a/dbus/dbus-auth.c ++++ b/dbus/dbus-auth.c +@@ -1572,7 +1572,15 @@ process_ok(DBusAuth *auth, + _dbus_string_get_const_data (& DBUS_AUTH_CLIENT (auth)->guid_from_server)); + + if (auth->unix_fd_possible) +- return send_negotiate_unix_fd(auth); ++ { ++ if (!send_negotiate_unix_fd (auth)) ++ { ++ _dbus_string_set_length (& DBUS_AUTH_CLIENT (auth)->guid_from_server, 0); ++ return FALSE; ++ } ++ ++ return TRUE; ++ } + + _dbus_verbose("Not negotiating unix fd passing, since not possible\n"); + return send_begin (auth); +-- +2.2.1 + diff --git a/SOURCES/dbus-1.6.12-mls-listnames.patch b/SOURCES/dbus-1.6.12-mls-listnames.patch new file mode 100644 index 0000000..f648f86 --- /dev/null +++ b/SOURCES/dbus-1.6.12-mls-listnames.patch @@ -0,0 +1,266 @@ +From 8b74179ee31652bbaaf979777b9e829b426053ef Mon Sep 17 00:00:00 2001 +From: David King +Date: Tue, 4 Nov 2014 10:10:36 +0000 +Subject: [PATCH] selinux: Check ListNames permissions with MLS + +https://bugzilla.redhat.com/show_bug.cgi?id=1118399 +--- + bus/driver.c | 52 +++++++++++++++++++++++++ + bus/selinux.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + bus/selinux.h | 5 +++ + 3 files changed, 180 insertions(+) + +diff --git a/bus/driver.c b/bus/driver.c +index 574e0f3..20cc940 100644 +--- a/bus/driver.c ++++ b/bus/driver.c +@@ -379,6 +379,9 @@ bus_driver_handle_list_services (DBusConnection *connection, + char **services; + BusRegistry *registry; + int i; ++#ifdef HAVE_SELINUX ++ dbus_bool_t mls_enabled; ++#endif + DBusMessageIter iter; + DBusMessageIter sub; + +@@ -425,9 +428,58 @@ bus_driver_handle_list_services (DBusConnection *connection, + } + } + ++#ifdef HAVE_SELINUX ++ mls_enabled = bus_selinux_mls_enabled (); ++#endif + i = 0; + while (i < len) + { ++#ifdef HAVE_SELINUX ++ if (mls_enabled) ++ { ++ const char *requester; ++ BusService *service; ++ DBusString str; ++ DBusConnection *service_conn; ++ DBusConnection *requester_conn; ++ ++ requester = dbus_message_get_destination (reply); ++ _dbus_string_init_const (&str, requester); ++ service = bus_registry_lookup (registry, &str); ++ ++ if (service == NULL) ++ { ++ _dbus_warn_check_failed ("service lookup failed: %s", requester); ++ ++i; ++ continue; ++ } ++ requester_conn = bus_service_get_primary_owners_connection (service); ++ _dbus_string_init_const (&str, services[i]); ++ service = bus_registry_lookup (registry, &str); ++ if (service == NULL) ++ { ++ _dbus_warn_check_failed ("service lookup failed: %s", services[i]); ++ ++i; ++ continue; ++ } ++ service_conn = bus_service_get_primary_owners_connection (service); ++ ++ if (!bus_selinux_allows_name (requester_conn, service_conn, error)) ++ { ++ if (dbus_error_is_set (error) && ++ dbus_error_has_name (error, DBUS_ERROR_NO_MEMORY)) ++ { ++ dbus_free_string_array (services); ++ dbus_message_unref (reply); ++ return FALSE; ++ } ++ ++ /* Skip any services which are disallowed by SELinux policy. */ ++ ++i; ++ continue; ++ } ++ } ++#endif + if (!dbus_message_iter_append_basic (&sub, DBUS_TYPE_STRING, + &services[i])) + { +diff --git a/bus/selinux.c b/bus/selinux.c +index 36287e9..6442b79 100644 +--- a/bus/selinux.c ++++ b/bus/selinux.c +@@ -63,6 +63,9 @@ + /* Store the value telling us if SELinux is enabled in the kernel. */ + static dbus_bool_t selinux_enabled = FALSE; + ++/* Store the value telling us if SELinux with MLS is enabled in the kernel. */ ++static dbus_bool_t selinux_mls_enabled = FALSE; ++ + /* Store an avc_entry_ref to speed AVC decisions. */ + static struct avc_entry_ref aeref; + +@@ -289,6 +292,20 @@ bus_selinux_enabled (void) + } + + /** ++ * Return whether or not SELinux with MLS support is enabled; must be ++ * called after bus_selinux_init. ++ */ ++dbus_bool_t ++bus_selinux_mls_enabled (void) ++{ ++#ifdef HAVE_SELINUX ++ return selinux_mls_enabled; ++#else ++ return FALSE; ++#endif /* HAVE_SELINUX */ ++} ++ ++/** + * Do early initialization; determine whether SELinux is enabled. + */ + dbus_bool_t +@@ -308,6 +325,16 @@ bus_selinux_pre_init (void) + } + + selinux_enabled = r != 0; ++ ++ r = is_selinux_mls_enabled (); ++ if (r < 0) ++ { ++ _dbus_warn ("Could not tell if SELinux MLS is enabled: %s\n", ++ _dbus_strerror (errno)); ++ return FALSE; ++ } ++ ++ selinux_mls_enabled = r != 0; + return TRUE; + #else + return TRUE; +@@ -724,6 +751,102 @@ bus_connection_read_selinux_context (DBusConnection *connection, + #endif /* HAVE_SELINUX */ + + /** ++ * Check if SELinux security controls allow one connection to determine the ++ * name of the other, taking into account MLS considerations. ++ * ++ * @param source the requester of the name. ++ * @param destination the name being requested. ++ * @returns whether the name should be visible by the source of the request ++ */ ++dbus_bool_t ++bus_selinux_allows_name (DBusConnection *source, ++ DBusConnection *destination, ++ DBusError *error) ++{ ++#ifdef HAVE_SELINUX ++ int err; ++ char *policy_type; ++ unsigned long spid, tpid; ++ BusSELinuxID *source_sid; ++ BusSELinuxID *dest_sid; ++ dbus_bool_t ret; ++ dbus_bool_t string_alloced; ++ DBusString auxdata; ++ ++ if (!selinux_mls_enabled) ++ return TRUE; ++ ++ err = selinux_getpolicytype (&policy_type); ++ if (err < 0) ++ { ++ dbus_set_error_const (error, DBUS_ERROR_IO_ERROR, ++ "Failed to get SELinux policy type"); ++ return FALSE; ++ } ++ ++ /* Only check against MLS policy if running under that policy. */ ++ if (strcmp (policy_type, "mls") != 0) ++ { ++ free (policy_type); ++ return TRUE; ++ } ++ ++ free (policy_type); ++ ++ _dbus_assert (source != NULL); ++ _dbus_assert (destination != NULL); ++ ++ if (!source || !dbus_connection_get_unix_process_id (source, &spid)) ++ spid = 0; ++ if (!destination || !dbus_connection_get_unix_process_id (destination, &tpid)) ++ tpid = 0; ++ ++ string_alloced = FALSE; ++ if (!_dbus_string_init (&auxdata)) ++ goto oom; ++ string_alloced = TRUE; ++ ++ if (spid) ++ { ++ if (!_dbus_string_append (&auxdata, " spid=")) ++ goto oom; ++ ++ if (!_dbus_string_append_uint (&auxdata, spid)) ++ goto oom; ++ } ++ ++ if (tpid) ++ { ++ if (!_dbus_string_append (&auxdata, " tpid=")) ++ goto oom; ++ ++ if (!_dbus_string_append_uint (&auxdata, tpid)) ++ goto oom; ++ } ++ ++ source_sid = bus_connection_get_selinux_id (source); ++ dest_sid = bus_connection_get_selinux_id (destination); ++ ++ ret = bus_selinux_check (source_sid, ++ dest_sid, ++ SECCLASS_CONTEXT, ++ CONTEXT__CONTAINS, ++ &auxdata); ++ ++ _dbus_string_free (&auxdata); ++ return ret; ++ ++ oom: ++ if (string_alloced) ++ _dbus_string_free (&auxdata); ++ BUS_SET_OOM (error); ++ return FALSE; ++#else ++ return TRUE; ++#endif /* HAVE_SELINUX */ ++} ++ ++/** + * Read the SELinux ID from the connection. + * + * @param connection the connection to read from +diff --git a/bus/selinux.h b/bus/selinux.h +index 3bab36d..fcaac5f 100644 +--- a/bus/selinux.h ++++ b/bus/selinux.h +@@ -32,6 +32,7 @@ dbus_bool_t bus_selinux_full_init(void); + void bus_selinux_shutdown (void); + + dbus_bool_t bus_selinux_enabled (void); ++dbus_bool_t bus_selinux_mls_enabled (void); + + void bus_selinux_id_ref (BusSELinuxID *sid); + void bus_selinux_id_unref (BusSELinuxID *sid); +@@ -54,6 +55,10 @@ dbus_bool_t bus_selinux_allows_acquire_service (DBusConnection *connection, + const char *service_name, + DBusError *error); + ++dbus_bool_t bus_selinux_allows_name (DBusConnection *source, ++ DBusConnection *destination, ++ DBusError *error); ++ + dbus_bool_t bus_selinux_allows_send (DBusConnection *sender, + DBusConnection *proposed_recipient, + const char *msgtype, /* Supplementary audit data */ +-- +2.1.0 + diff --git a/SPECS/dbus.spec b/SPECS/dbus.spec new file mode 100644 index 0000000..13ca5d0 --- /dev/null +++ b/SPECS/dbus.spec @@ -0,0 +1,1068 @@ +%global _hardened_build 1 + +%define gettext_package dbus + +%define expat_version 1.95.5 +%define libselinux_version 1.15.2 + +%define dbus_user_uid 81 + +%define dbus_common_config_opts --enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=dbus --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/ --libexecdir=/%{_lib}/dbus-1 --with-systemdsystemunitdir=/lib/systemd/system/ --enable-doxygen-docs --enable-xml-docs --disable-silent-rules + +Summary: D-BUS message bus +Name: dbus +Epoch: 1 +Version: 1.6.12 +Release: 12%{?dist} +URL: http://www.freedesktop.org/software/dbus/ +#VCS: git:git://git.freedesktop.org/git/dbus/dbus +Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz +Source2: 00-start-message-bus.sh +License: GPLv2+ or AFL +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libtool +BuildRequires: expat-devel >= %{expat_version} +BuildRequires: libselinux-devel >= %{libselinux_version} +BuildRequires: audit-libs-devel >= 0.9 +BuildRequires: libX11-devel +BuildRequires: libcap-ng-devel +BuildRequires: gettext +BuildRequires: doxygen +BuildRequires: xmlto +BuildRequires: libxslt +BuildRequires: systemd-units +Requires(post): systemd-units chkconfig +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires: libselinux%{?_isa} >= %{libselinux_version} +Requires: dbus-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires(pre): /usr/sbin/useradd + +# Note: These is only required for --enable-tests; when bootstrapping, +# you can remove this and drop the --enable-tests configure argument. +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: dbus-python +BuildRequires: pygobject2 +BuildRequires: /usr/bin/Xvfb + +# FIXME this should be upstreamed; need --daemon-bindir=/bin and --bindir=/usr/bin or something? +Patch0: bindir.patch +Patch1: 0001-name-test-Don-t-run-test-autolaunch-if-we-don-t-have.patch +Patch2: 0001-test-marshal-Ensure-we-use-suitably-aligned-buffers.patch +Patch3: 0001-_dbus_babysitter_unref-avoid-infinite-loop-if-waitpi.patch +Patch4: avoid-undefined-7c00ed22d9b5c33f5b33221e906946b11a9bde3b.patch +Patch5: 0001-tests-Disable-name-test.patch +Patch6: dbus-1.6.12-mls-listnames.patch +Patch7: dbus-1.6.12-auth-process-ok-message-dispatch-test-fix.patch + +%description +D-BUS is a system for sending messages between applications. It is +used both for the system-wide message bus service, and as a +per-user-login-session messaging facility. + +%package libs +Summary: Libraries for accessing D-BUS +Group: Development/Libraries + +%description libs +This package contains lowlevel libraries for accessing D-BUS. + +%package doc +Summary: Developer documentation for D-BUS +Group: Documentation +Requires: %{name} = %{epoch}:%{version}-%{release} +BuildArch: noarch + +%description doc +This package contains developer documentation for D-Bus along with +other supporting documentation such as the introspect dtd file. + +%package devel +Summary: Development files for D-BUS +Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description devel +This package contains libraries and header files needed for +developing software that uses D-BUS. + +%package x11 +Summary: X11-requiring add-ons for D-BUS +Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description x11 +D-BUS contains some tools that require Xlib to be installed, those are +in this separate package so server systems need not install X. + +%prep +%setup -q -n %{name}-%{version} + +# For some reason upstream ships these files as executable +# Make sure they are not +/bin/chmod 0644 COPYING ChangeLog NEWS + +%patch0 -p1 -b .bindir +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 + +%build +if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi +%configure %{dbus_common_config_opts} --disable-tests --disable-asserts +make + +%install +rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} + +mkdir -p %{buildroot}/%{_libdir}/pkgconfig + +#change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64] +sed -e 's@-I${libdir}@-I${prefix}/%{_lib}@' %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc +rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc + +mkdir -p %{buildroot}/%{_bindir} +mv -f %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir} +mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/ +mv -f %{buildroot}/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/ +rm -rf %{buildroot}/%{_lib}/dbus-1.0 + +rm -f %{buildroot}/%{_lib}/*.a +rm -f %{buildroot}/%{_lib}/*.la + +install -D -m755 %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh + +mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces + +# Make sure that when somebody asks for D-Bus under the name of the +# old SysV script, that he ends up with the standard dbus.service name +# now. +ln -s dbus.service %{buildroot}/lib/systemd/system/messagebus.service + +## %find_lang %{gettext_package} +# Delete the old legacy sysv init script +rm -rf %{buildroot}%{_initrddir} + +mkdir -p %{buildroot}/var/lib/dbus + +%check +if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi +%configure %{dbus_common_config_opts} --enable-asserts --enable-verbose-mode --enable-tests + +make clean +# TODO: better script for this... +export DISPLAY=42 +{ Xvfb :${DISPLAY} -nolisten tcp -auth /dev/null & + trap "kill -15 $! || true" 0 HUP INT QUIT TRAP TERM; }; +if ! env DBUS_TEST_SLOW=1 make check; then + echo "TESTS FAIL, finding all Automake logs..." 1>&2; + find . -type f -name '*.trs' | while read trs; do cat ${trs}; cat ${trs%%.trs}.log; done + echo "Exiting abnormally due to make check failure above" 1>&2; + exit 1; +else + echo "TESTS PASS" +fi + +%clean +rm -rf %{buildroot} + +%pre +# Add the "dbus" user and group +/usr/sbin/groupadd -r -g %{dbus_user_uid} dbus 2>/dev/null || : +/usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \ + -s /sbin/nologin -r -d '/' dbus 2> /dev/null || : + +%post libs -p /sbin/ldconfig + +%preun +if [ $1 = 0 ]; then + /bin/systemctl stop dbus.service dbus.socket > /dev/null 2>&1 || : +fi + +%postun libs -p /sbin/ldconfig + +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%triggerun -- dbus < 1.4.10-2 +/sbin/chkconfig --del messagebus >/dev/null 2>&1 || : + +%files +%defattr(-,root,root) + +%doc COPYING + +%dir %{_sysconfdir}/dbus-1 +%config %{_sysconfdir}/dbus-1/*.conf +%dir %{_sysconfdir}/dbus-1/system.d +%dir %{_sysconfdir}/dbus-1/session.d +%ghost %dir %{_localstatedir}/run/dbus +%dir %{_localstatedir}/lib/dbus/ +/bin/dbus-daemon +/bin/dbus-send +/bin/dbus-cleanup-sockets +/bin/dbus-monitor +/bin/dbus-uuidgen +%{_mandir}/man*/dbus-cleanup-sockets.1.gz +%{_mandir}/man*/dbus-daemon.1.gz +%{_mandir}/man*/dbus-monitor.1.gz +%{_mandir}/man*/dbus-send.1.gz +%{_mandir}/man*/dbus-uuidgen.1.gz +%dir %{_datadir}/dbus-1 +%{_datadir}/dbus-1/services +%{_datadir}/dbus-1/system-services +%{_datadir}/dbus-1/interfaces +%dir /%{_lib}/dbus-1 +# See doc/system-activation.txt in source tarball for the rationale +# behind these permissions +%attr(4750,root,dbus) /%{_lib}/dbus-1/dbus-daemon-launch-helper +/lib/systemd/system/dbus.service +/lib/systemd/system/dbus.socket +/lib/systemd/system/dbus.target.wants/dbus.socket +/lib/systemd/system/messagebus.service +/lib/systemd/system/multi-user.target.wants/dbus.service +/lib/systemd/system/sockets.target.wants/dbus.socket + +%files libs +%defattr(-,root,root,-) +/%{_lib}/*dbus-1*.so.* + +%files x11 +%defattr(-,root,root) + +%{_bindir}/dbus-launch +%{_datadir}/man/man*/dbus-launch.1.gz +%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh + +%files doc +%defattr(-,root,root) +%doc doc/introspect.dtd doc/introspect.xsl doc/system-activation.txt +%doc %{_datadir}/doc/dbus + +%files devel +%defattr(-,root,root) + +/%{_lib}/lib*.so +%dir %{_libdir}/dbus-1.0 +%{_libdir}/dbus-1.0/include/ +%{_libdir}/pkgconfig/dbus-1.pc +%{_includedir}/* + +%changelog +* Wed Jan 21 2015 David King - 1:1.6.12-12 +- Fix message dispatch test failure (#1183755) + +* Fri Nov 28 2014 David King - 1:1.6.12-11 +- Fix scope after if statement for MLS check (#1118399) + +* Thu Nov 27 2014 David King - 1:1.6.12-10 +- Check current policy type before performing MLS check (#1118399) + +* Tue Nov 25 2014 David King - 1:1.6.12-9 +- Add MLS checking for listing service names (#1118399) + +* Fri Jan 24 2014 Daniel Mach - 1:1.6.12-8 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1:1.6.12-7 +- Mass rebuild 2013-12-27 + +* Thu Sep 05 2013 Colin Walters - 1:1.6.12-6 +- Backport patch to avoid periodic busy looping + Resolves: #1029013 + +* Thu Sep 05 2013 Colin Walters - 1:1.6.12-5 +- Add patch from Matěj Cepl to log more clearly when tests + pass or fail + +* Wed Jul 24 2013 Colin Walters - 1:1.6.12-4 +- Add patch to fix test-marshal on s390. + +* Thu Jul 18 2013 Colin Walters - 1:1.6.12-3 +- Find all logs automake has hidden and cat them for visibility + into the mock logs. + +* Thu Jul 18 2013 Colin Walters - 1:1.6.12-2 +- Enable all upstream tests + Resolves: #955532 + This is fairly hacky; a much better replacement would be + something like the InstalledTests system. But we have to live + with rpm and stuff for now... + +* Mon Jun 17 2013 Colin Walters - 1:1.6.12-1 +- New upstream release +- CVE-2013-2168 + +* Thu Apr 18 2013 Matthias Clasen - 1:1.6.8-5 +- Hardened build + +* Tue Feb 05 2013 Colin Walters - 1:1.6.8-4 +- Add patch from Matej Cepl to enable check section, modified by me + to use common configure opts. + +* Sun Oct 14 2012 Rex Dieter - 1:1.6.8-3 +- minor .spec cleanups +- tighten lib deps via %%{?_isa} +- drop old Conflicts/Obsoletes/patches + +* Wed Oct 3 2012 Bill Nottingham - 1:1.6.8-2 +- Drop systemd-sysv-convert in trigger, and resulting dependency (#852822) + +* Fri Sep 28 2012 Colin Walters - 1:1.6.8-1 +- 1.6.8 + +* Fri Sep 28 2012 Colin Walters - 1:1.6.6-1 +- 1.6.6 + +* Thu Sep 13 2012 Colin Walters - 1:1.6.0-3 +- CVE-2012-3524 + +* Wed Jul 18 2012 Fedora Release Engineering - 1:1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 5 2012 Colin Walters - 1:1.6.0-1 +- Update to 1.6.0 + +* Sun Apr 22 2012 Lennart Poettering - 1:1.4.20-2 +- Make D-Bus work in containers + +* Tue Apr 13 2012 Colin Walters +- Update to 1.4.20; closes #806082 +- Ensure /var/lib/dbus exists; this seems to have been + dropped from upstream build rules. +- Adapt to documentation actually being installed + +* Fri Jan 13 2012 Fedora Release Engineering - 1:1.4.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Aug 22 2011 Lennart Poettering - 1:1.4.10-3 +- Don't restart D-Bus on upgrades, dont' enable D-Bus, since it is statically enabled. +- https://bugzilla.redhat.com/show_bug.cgi?id=732426 + +* Wed Aug 03 2011 David Zeuthen - 1:1.4.10-2 +- Drop SysV support, #697523 (from Jóhann B. Guðmundsson ) + +* Thu Jun 2 2011 Colin Walters - 1:1.4.10-1 +- New upstream version +- Drop XML docs patch which is now upstream +- Drop devhelp stuff; people should be using GDBus now. If you + don't, the raw doxygen is fine. + +* Tue Feb 08 2011 Fedora Release Engineering - 1:1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 28 2011 Matthias Clasen - 1:1.4.0-2 +- %%ghost /var/run content (#656571) + +* Mon Sep 6 2010 Lennart Poettering - 1:1.4.0-1 +- New upstream release + +* Thu Jul 29 2010 Lennart Poettering - 1:1.3.2-0.1.885483%{?dist} +- Conversion from systemd-install to systemctl + +* Wed Jul 9 2010 Lennart Poettering - 1:1.3.2-0.0.885483 +- git Snapshot with systemd activation + +* Wed Jun 23 2010 Lennart Poettering - 1:1.3.1-1 +- New upstream release + +* Wed Mar 24 2010 Colin Walters - 1:1.2.24-1 +- New upstream release +- Drop upstreamed patch + +* Mon Mar 22 2010 Colin Walters - 1:1.2.22-2 +- Add patch to fix syslog crasher + +* Wed Mar 17 2010 Colin Walters - 1:1.2.22-1 +- New upstream release + +* Wed Feb 03 2010 Colin Walters - 1:1.2.20-1 +- New upstream release +- Actually add start-early.patch + +* Tue Feb 02 2010 Colin Walters - 1:1.2.18-1 +- New upstream release + Drop all upstreamed patches. +- start-early.patch had both bindir changes and start-early; the + latter was upstreamed, so start-early is now bindir.patch. + Ideally later get this partial-bindir stuff upstream. + +* Thu Jan 21 2010 Colin Walters - 1:1.2.16-11 +- Drop dbus-libs requiring dbus; this was unnecessary for programs + which happened to speak the dbus protocol but don't require + the daemon. + Note that libdbus does support autolaunching dbus-daemon in + the session as an emergency fallback for legacy situations; however, + these cases were likely to have dbus installed already (via comps). + If they don't, well one turned to the wrong page in the choose your + own adventure book. + +* Tue Jan 12 2010 Matthias Clasen - 1:1.2.16-10 +- Don't link libdub against libcap-ng + +* Fri Dec 18 2009 Ray Strode - 1:1.2.16-9 +- Fix activation of daemons (#545267) +- Fix reload memleak (fdo #24697) +- Don't forget about pending activations on reload (fdo #24350) +- Fix reload race (fdo #21597) + +* Wed Oct 7 2009 Matthias Clasen - 1:1.2.16-8 +- Drop capabilities (#518541) + +* Wed Oct 7 2009 Matthias Clasen - 1:1.2.16-7 +- Add missing diagrams to the docs (#527650) + +* Thu Oct 1 2009 Matthias Clasen - 1:1.2.16-6 +- Fix timeout accounting + +* Fri Aug 21 2009 Tomas Mraz - 1:1.2.16-5 +- rebuilt with new audit + +* Fri Jul 24 2009 Fedora Release Engineering - 1:1.2.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 23 2009 Colin Walters - 1:1.2.16-3 +- Remove conflicting -U option to useradd + +* Wed Jul 22 2009 Colin Walters - 1:1.2.16-2 +- Explicitly add a dbus group id, fixes dbus files getting a + random group id in cases where the RPM install order varies. + Fixes https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=458183 + +* Tue Jul 14 2009 Colin Walters - 1:1.2.16-1 +- Upstream 1.2.16 +- Remove inotify patch, now upstreamed +- Remove timeout patch, obsolete with upstream change to infinite + timeout maximum by default + +* Sat Jun 27 2009 Matthias Clasen - 1:1.2.14-2 +- Don't leak inotify fd (#505338) + +* Wed Apr 22 2009 Colin Walters - 1:1.2.14-1 +- CVE-2009-1189 + * Update to 1.2.14 + +* Thu Mar 12 2009 Colin Walters - 1:1.2.12-1 +- Switch to non-permissive branch: + http://fedoraproject.org/wiki/Features/DBusPolicy + +* Fri Feb 27 2009 Matthias Clasen - 1:1.2.4.4permissive-4 +- Mark -doc content as %%doc + +* Tue Feb 24 2009 Matthias Clasen - 1:1.2.4.4permissive-2 +- Make -doc noarch + +* Tue Feb 24 2009 Fedora Release Engineering - 1:1.2.4.4permissive-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 06 2009 Colin Walters - 1:1.2.4.4.permissive-1 +- New upstream + +* Thu Dec 18 2008 Colin Walters - 1:1.2.4.2.permissive-1 +- New upstream + +* Fri Dec 12 2008 Colin Walters - 1:1.2.4-2 +- Revert to upstream 1.2.4, add epoch + +* Thu Dec 11 2008 Colin Walters - 1.2.8-4 +- And drop it again, needs more work + +* Wed Dec 10 2008 Colin Walters - 1.2.8-3 +- Add back working syslog patch + +* Tue Dec 09 2008 Colin Walters - 1.2.8-2 +- Remove accidentally added syslog patch + +* Tue Dec 09 2008 Colin Walters - 1.2.8-1 +- New upstream 1.2.8 + Allows signals by default. + +* Fri Dec 05 2008 Colin Walters - 1.2.6-1 +- New upstream 1.2.6 + +* Fri Nov 21 2008 Matthias Clasen - 1.2.4-2 +- Tweak descriptions + +* Mon Oct 06 2008 Colin Walters - 1.2.4-1 +- New upstream 1.2.4 + +* Thu Sep 25 2008 David Zeuthen - 1.2.3-2%{?dist} +- Avoid using noreplace for files that aren't really config files + +* Wed Aug 06 2008 Colin Walters - 1.2.3-1 +- New upstream 1.2.2 +- Drop patches that were upstreamed + +* Wed Jul 23 2008 Matthias Clasen - 1.2.1-7 +- Own /usr/share/dbus-1/interfaces + +* Fri Jul 18 2008 Matthias Clasen - 1.2.1-6 +- Add a patch from upstream git that adds a method + for changing the activation environment on the session bus + +* Thu Jul 17 2008 Casey Dahlin - 1.2.1-5 +- Patch to increase max method timeout + +* Thu May 29 2008 Casey Dahlin - 1.2.1-4 +- Patches for fd.o bugs 15635, 15571, 15588, 15570 + +* Mon May 12 2008 Ray Strode - 1.2.1-3 +- drop last patch after discussion on dbus list + +* Mon May 12 2008 Ray Strode - 1.2.1-2 +- ensure uuid is created at post time + +* Fri Apr 04 2008 John (J5) Palmieri - 1.2.1-1 +- update to latest upstream +- major version change is really a maint release for 1.1.20 + please read the NEWS file in the source for more information + +* Wed Feb 27 2008 David Zeuthen - 1.1.20-1%{?dist} +- Update to latest upstream release. Includes fix for CVE-2008-0595. +- Drop some patches that went upstream already + +* Wed Feb 20 2008 Mamoru Tasaka - 1.1.4-6 +- Really rebuild against new libcap + +* Sun Feb 17 2008 Adam Tkac - 1.1.4-5 +- rebuild against new libcap + +* Tue Feb 5 2008 Matthias Clasen - 1.1.4-4 +- Fix a dbus-launch problem (#430412) + +* Mon Feb 4 2008 Ray Strode - 1.1.4-3 +- Start message bus from xinitrc.d instead of hard coding it +at the end of Xsession + +* Mon Feb 4 2008 Matthias Clasen - 1.1.4-2 +- Make it build against the latest gcc/glibc + +* Thu Jan 17 2008 John (J5) Palmieri - 1.1.4-1 +- new upstream version +- fixes inotify patch which was consuming 100% cpu and memory + +* Wed Jan 16 2008 John (J5) Palmieri - 1.1.3-1 +- new upstream version which obsoletes a number of our patches +- doc section added for the devhelp docs + +* Thu Nov 15 2007 John (J5) Palmieri - 1.1.2-9 +- clean up spec file as per the merge review (#225676) + +* Thu Oct 25 2007 Bill Nottingham - 1.1.2-8 +- have -libs obsolete older versions of the main package so that yum upgrades work + +* Thu Oct 4 2007 Matthias Clasen - 1.1.2-7 +- Make the daemon a PIE executable (#210039) + +* Fri Sep 14 2007 Bill Nottingham - 1.1.2-6%{?dist} +- fix daemon abort when SELinux denies passing on a message (#283231) + +* Fri Sep 14 2007 Dan Walsh - 1.1.2-5%{?dist} +- Reverse we_were_root check to setpcap if we were root. Also only init +audit if we were root. So error dbus message will not show up when policy +reload happens. dbus -session will no longer try to send audit message, +only system will. + +* Tue Aug 28 2007 David Zeuthen - 1.1.2-4%{?dist} +- Make dbus require dbus-libs (#261721) + +* Mon Aug 27 2007 Adel Gadllah - 1.1.2-3 +- Add libs to a libs subpackage +- Update license tag + +* Wed Aug 01 2007 David Zeuthen - 1.1.2-2%{?dist} +- Move system bus activation helper to /{lib,lib64}/dbus-1. Also set + the correct mode and permissions. +- Own the directory /usr/share/dbus-1/system-services +- Delete the diretory /{lib,lib64}/dbus-1.0 as it's not used +- Pass 'dbus' instead of 81 as --with-dbus-user; otherwise the setuid + system bus activation helper fails + +* Sat Jul 28 2007 Matthias Clasen - 1.1.2-1 +- Update to 1.1.2 + +* Fri Jul 6 2007 Matthias Clasen - 1.1.1-3 +- Add LSB header to init script (#246902) + +* Thu Jun 28 2007 Ray Strode - 1.1.1-2 +- include session.d directory in package manifest + +* Thu Jun 28 2007 Ray Strode - 1.1.1-1 +- Update to 1.1.1 + +* Fri Jun 22 2007 Matthias Clasen - 1.0.2-6 +- Don't require libxml-python needlessly (#245300) + +* Sun Jun 17 2007 Matthias Clasen - 1.0.2-5 +- Require pkgconfig in -devel, not in -x11 (#244385) + +* Sat Apr 14 2007 Matthias Clasen - 1.0.2-4 +- Move the dbus-launch man page to the x11 subpackage + +* Thu Apr 12 2007 David Zeuthen - 1.0.2-3 +- Start SELinux thread after setuid call (#221168) + +* Wed Mar 28 2007 Matthias Clasen - 1.0.2-2 +- Require pkgconfig in the -devel package + +* Sun Mar 25 2007 Matthias Clasen - 1.0.2-1 +- Update to 1.0.2 +- Drop obsolete patches +- Fix directory ownership issues (#233753) + +* Fri Dec 15 2006 David Zeuthen - 1.0.1-3%{?dist} +- CVE-2006-6107: D-Bus denial of service + +* Sun Nov 26 2006 Matthias Clasen - 1.0.1-2 +- Include docs, and make them show up in devhelp + +* Mon Nov 20 2006 Ray Strode - 1.0.1-1 +- Update to 1.0.1 +- Apply patch from Thiago Macieira to + fix failed assertion in threading implementation +- Drop some crazy looking build time speed optimization + +* Tue Nov 14 2006 John (J5) Palmieri - 1.0.0-2 +- add patch to fix dbus_threads_init_default + +* Mon Nov 13 2006 John (J5) Palmieri - 1.0.0-1 +- update to D-Bus 1.0.0 "Blue Bird" +- build with verbose mode on but tests and asserts off + +* Sun Nov 12 2006 Ray Strode - 0.95-3 +- dont let dbus-launch session sitter crash in the + non-autolaunch code path (bug 214649) + +* Mon Nov 06 2006 John (J5) Palmieri - 0.95-2 +- Add /var/lib/dbus directory to %%files + +* Fri Nov 03 2006 John (J5) Palmieri - 0.95-1 +- Update to D-Bus 1.0 RC 3 (0.95) +- don't build with tests on + +* Sat Oct 14 2006 John (J5) Palmieri - 0.94-1 +- Update to D-Bus 1.0 RC 2 (0.94) + +* Sun Oct 01 2006 Jesse Keating - 0.93-3 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Tue Sep 19 2006 Matthias Clasen - 0.93-2 +- Add a Requires for libxml2-python (#201877) + +* Thu Sep 14 2006 John (J5) Palmieri - 0.93-1 +- Updated from upstream D-Bus 1.0 RC 1 (0.93) + +* Wed Sep 6 2006 Dan Walsh - 0.92-2 +- Only audit on the system bus + +* Fri Aug 18 2006 John (J5) Palmieri - 0.92-1 +- Update to 0.92 +- remove old patches + +* Thu Jul 22 2006 John (J5) Palmieri - 0.90-8 +- add patch to fix timeout removal assertion + +* Thu Jul 20 2006 John (J5) Palmieri - 0.90-7 +- add patch to fix taking a connection ref when it is locked + +* Wed Jul 19 2006 John (J5) Palmieri - 0.90-6 +- change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64] + in the dbus-1.pc file after compile + +* Wed Jul 19 2006 John (J5) Palmieri - 0.90-5 +- Move arch include file from lib to libdir + +* Tue Jul 18 2006 John (J5) Palmieri - 0.90-4 +- add patch that pregenerates the xml introspect file so d-bus doesn't + have to be running suring the build. + +* Tue Jul 18 2006 John (J5) Palmieri - 0.90-3 +- s/--libdir=\/lib/--libdir=%%{_lib}/ in configure stage +- add / before %%{_lib} + +* Tue Jul 18 2006 John (J5) Palmieri - 0.90-2 +- Remove some remnants of the GLIB bindings from configure.in + +* Mon Jul 17 2006 John (J5) Palmieri - 0.90-1 +- Update to upstream 0.90 +- Split out bindings + +* Wed Jul 12 2006 Jesse Keating - 0.62-1.1 +- rebuild + +* Mon Jun 12 2006 John (J5) Palmieri - 0.62-1 +- Update to upstream 0.62 +- Remove mono for s390s + +* Tue Jun 6 2006 Matthias Clasen 0.61-6 +- Rebuild + +* Wed May 17 2006 Karsten Hopp 0.61-5.2 +- add buildrequires libICE-devel, libSM-devel, libcap-devel +- change buildrequires form libX11 to libX11-devel + +* Mon May 15 2006 John (J5) Palmieri - 0.61-5.1 +- Bump and rebuild. Add a BR and R for libX11 + +* Tue Apr 25 2006 John (J5) Palmieri - 0.61-5 +- Backport patch from dbus-connection.c + - Allows interfaces to be NULL in the message header as per the spec + - Fixes a problem with pendings calls blocking on a data starved socket + +* Mon Apr 17 2006 John (J5) Palmieri 0.61-4 +- New audit patch + +* Fri Feb 24 2006 John (J5) Palmieri 0.61-3 +- ABI hasn't changed so add patch that makes dbus-sharp think + it is still 0.60 (mono uses hard version names so any change + means apps need to recompile) + +* Fri Feb 24 2006 John (J5) Palmieri 0.61-2 +- Make sure chkconfig rests the priorities so we can start earlier + +* Fri Feb 24 2006 John (J5) Palmieri 0.61-1 +- Upgrade to upstream version 0.61 +- remove python callchain patch +- update avc patch + +* Fri Feb 10 2006 Jesse Keating - 0.60-7.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 0.60-7.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Mon Jan 23 2006 John (J5) Palmieri 0.60-7 +- Add patch to fix the python callchain +- Symlink dbus-send to /usr/bin because some applications + look for it there + +* Fri Jan 20 2006 John (J5) Palmieri 0.60-6 +- Fix up patch to init script so it refrences /bin not /usr/bin + +* Fri Jan 20 2006 John (J5) Palmieri 0.60-5 +- move base libraries and binaries to /bin and /lib so they can be started + before /usr is mounted on network mounted /usr systems +- have D-Bus start early + +* Thu Jan 19 2006 Alexander Larsson 0.60-4 +- mono now built on s390x + +* Mon Jan 9 2006 Alexander Larsson 0.60-3 +- Don't exclude non-mono arches + +* Mon Jan 9 2006 Alexander Larsson - 0.60-2 +- Add dbus-sharp sub-package + +* Fri Dec 09 2005 Jesse Keating - 0.60-1.1 +- rebuilt + +* Thu Dec 01 2005 John (J5) Palmieri - 0.60-1 +- upgrade to 0.60 + +* Mon Sep 08 2005 John (J5) Palmieri - 0.50-1 +- upgrade to 0.50 + +* Mon Aug 29 2005 John (J5) Palmieri - 0.36.2-1 +- upgrade to 0.36.2 which fixes an exploit where + users can attach to another user's session bus (CAN-2005-0201) + +* Wed Aug 24 2005 John (J5) Palmieri - 0.36.1-1 +- Upgrade to dbus-0.36.1 +- Install all files to lib64/ on 64bit machines + +* Tue Aug 23 2005 John (J5) Palmieri - 0.36-1 +- Upgrade to dbus-0.36 +- Split modules that go into %%{_lib}/python2.4/site-packages/dbus +and those that go into %%{python_sitelib}/dbus (they differ on 64bit) +- Renable Qt bindings since packages in core can use them + +* Mon Jul 18 2005 John (J5) Palmieri - 0.35.2-1 +- Upgrade to dbus-0.35.2 +- removed dbus-0.34-kill-babysitter.patch +- removed dbus-0.34-python-threadsync.patch +- removed dbus-0.23-selinux-avc-audit.patch +- added dbus-0.35.2-selinux-avc-audit.patch +- take out restarts on upgrade + +* Tue Jun 28 2005 John (J5) Palmieri - 0.34-1 +- Upgrade to dbus-0.34 +- added dbus-0.34-kill-babysitter.patch +- added dbus-0.34-python-threadsync.patch +- remove dbus-0.32-print_child_pid.patch +- remove dbus-0.32-deadlock-fix.patch +- remove dbus-0.33-types.patch + +* Wed Jun 18 2005 John (J5) Palmieri - 0.33-4 +- Add new libaudit patch from Steve Grub and enable in configure + (Bug #159218) + +* Mon May 23 2005 Bill Nottingham - 0.33-3 +- remove static libraries from python bindings + +* Sun May 01 2005 John (J5) Palmieri - 0.33-2 +- Backport patch from CVS that fixes int32's being marshaled as +uint16's in the python bindings + +* Mon Apr 25 2005 John (J5) Palmieri - 0.33-1 +- update to upstream 0.33 +- renable selinux audit patch + +* Mon Apr 12 2005 John (J5) Palmieri - 0.32-6 +- Added patch to fix deadlocks when using recursive g_mains + +* Mon Apr 12 2005 John (J5) Palmieri - 0.32-5 +- replace selinux_init patch with selinux_chroot_workaround patch + to work around bad selinux interactions when using chroots + on the beehive build machines + +* Mon Apr 11 2005 John (J5) Palmieri - 0.32-4 +- add print_child_pid patch which make sure we prin the child's pid if we fork + +* Thu Apr 7 2005 David Zeuthen - 0.32-3 +- add fix for glib infinite loop (fdo #2889) + +* Thu Mar 31 2005 John (J5) Palmieri - 0.32-2 +- add selinux-init patch to fix dbus from segfaulting when + building on machines that don't have selinux enabled + +* Thu Mar 31 2005 John (J5) Palmieri - 0.32-1 +- update to upstream version 0.32 + +* Wed Mar 23 2005 John (J5) Palmieri - 0.31-4 +- Pyrex has been patched to generate gcc4.0 complient code +- Rebuild for gcc4.0 + +* Wed Mar 16 2005 John (J5) Palmieri - 0.31-3 +- change compat-gcc requirement to compat-gcc-32 +- rebuild with gcc 3.2 + +* Tue Mar 08 2005 John (J5) Palmieri - 0.31-2 +- Remove precompiled init script and let the sources generate it + +* Mon Mar 07 2005 John (J5) Palmieri - 0.31-1 +- update to upstream version 0.31 +- take out user has same id patch (merged upstream) +- udi patch updated +- dbus-daemon-1 renamed to dbus-daemon +- dbus-glib-tool renamed to dbus-binding-tool +- force gcc33 because pyrex generate improper lvalue code +- disable audit patch for now + +* Tue Feb 01 2005 John (J5) Palmieri - 0.23-4 +- Explicitly pass in the pid file location to ./configure instead of + letting it guess based on the build enviornment + +* Mon Jan 31 2005 John (J5) Palmieri - 0.23-3 +- Add patch to fix random users from connecting to a users session bus + +* Fri Jan 21 2005 John (J5) Palmieri - 0.23-2 +- Add Steve Grubb's SE-Linux audit patch (Bug# 144920) + +* Fri Jan 21 2005 John (J5) Palmieri - 0.23-1 +- Update to upstream version 0.23 +- Drop all patches except for the UDI patch as they have been + integrated upstream +- List of API changes: + * add setgroups() to drop supplementary groups + * removed dbus_bug_get_with_g_main since it's been replaced by dbus_g_bus_get + * added support for int64 and uint64 to the python bindings + * use SerivceOwnerChanges signal instead of ServiceCreated and ServiceDeleted + +* Mon Nov 8 2004 Jeremy Katz - 0.22-12 +- rebuild against python 2.4 + +* Tue Nov 02 2004 John (J5) Palmieri +- Add a requires for glib2-devel in the devel package +- Add SE-Linux backport from Colin Walters that fixes + messages getting lost in SE-Linux contexts + +* Wed Oct 13 2004 John (J5) Palmieri +- Bump up release and rebuild + +* Mon Oct 11 2004 Tim Waugh +- Run /sbin/ldconfig for glib sub-package (bug #134062). + +* Wed Sep 22 2004 John (J5) Palmieri +- Fixed patch to use dbus-1 instead of dbus-1.0 +- (configure.in): Exported just the datadir instead of + the full path to the dbus datadir for consistency + +* Wed Sep 22 2004 John (J5) Palmieri +- Adding patch to move /usr/lib/dbus-1.0/services to + /usr/share/dbus-1.0/services + +* Thu Sep 16 2004 John (J5) Palmieri +- reverting BuildRequires: redhat-release because of issues with build system +- added precompiled version of the messagebus init script + +* Thu Sep 16 2004 John (J5) Palmieri +- changed /etc/redhat-release to the package redhat-release + +* Thu Sep 16 2004 John (J5) Palmieri +- added python int64 patch from davidz + +* Thu Sep 16 2004 John (J5) Palmieri +- added BuildRequires: /etc/redhat-release (RH Bug #132436) + +* Wed Aug 18 2004 John (J5) Palmieri +- Added Steve Grubb's spec file patch (RH Bug #130201) + +* Mon Aug 16 2004 John (J5) Palmieri +- Disabled dbus-gtk since dbus-viewer doesn't do anything right now + +* Mon Aug 16 2004 John (J5) Palmieri +- Moved dbus-viewer to new dbus-gtk package so that dbus-glib + no longer requires X or GTK libraries. (RH Bug #130029) + +* Thu Aug 12 2004 John (J5) Palmieri +- Update to new 0.22 release + +* Thu Aug 05 2004 John (J5) Palmieri +- Added BuildRequires for libselinux-devel and Requires for libselinux + +* Tue Aug 02 2004 Colin Walters +- Add SE-DBus patch + +* Fri Jul 30 2004 John (J5) Palmieri +- Added lib64 workaround for python bindings installing to + the wrong lib directory on 64 bit archs + +* Fri Jul 30 2004 John (J5) Palmieri +- Updated console-auth patch +- rebuild + +* Thu Jul 22 2004 John (J5) Palmieri +- Update to upstream CVS build +- Added console-auth patch + +* Fri Jun 25 2004 John (J5) Palmieri +- Workaround added to fix gcc-3.4 bug on ia64 + +* Fri Jun 25 2004 John (J5) Palmieri +- require new Pyrex version and see if it builds this time + +* Fri Jun 25 2004 John (J5) Palmieri +- rebuild with updated Pyrex (0.9.2.1) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Jun 04 2004 John (J5) Palmieri +- Moved dbus-viewer, dbus-monitor and dbus-glib-tool + into the dbus-glib package so that the main dbus + package does not depend on glib (Bug #125285) + +* Thu Jun 03 2004 John (J5) Palmieri +- rebuilt + +* Thu May 27 2004 John (J5) Palmieri +- added my Python patch +- took out the qt build requires +- added a gtk+ build requires + +* Fri Apr 23 2004 John (J5) Palmieri +- Changed build requirement to version 0.9-3 of Pyrex + to fix problem with builing on x86_64 + +* Tue Apr 20 2004 John (J5) Palmieri +- update to upstream 0.21 +- removed dbus-0.20-varargs.patch patch (fixed upstream) + +* Mon Apr 19 2004 John (J5) Palmieri +- added a dbus-python package to generate python bindings +- added Pyrex build dependacy + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 25 2004 Bill Nottingham 0.20-4 +- fix dbus error functions on x86-64 (#116324) +- add prereq (#112027) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Tim Waugh +- Conflict with cups prior to configuration file change, so that the + %%postun service condrestart works. + +* Wed Feb 11 2004 Havoc Pennington 0.20-2 +- rebuild in fc2, cups now updated + +* Wed Jan 7 2004 Bill Nottingham 0.20-1 +- update to upstream 0.20 + +* Thu Oct 16 2003 Havoc Pennington 0.13-6 +- hmm, dbus doesn't support uids in the config file. fix. + +* Thu Oct 16 2003 Havoc Pennington 0.13-5 +- put uid instead of username in the config file, to keep things working with name change + +* Thu Oct 16 2003 Havoc Pennington 0.13-4 +- make subpackages require the specific release, not just version, of base package + +* Thu Oct 16 2003 Havoc Pennington 0.13-3 +- change system user "messagebus" -> "dbus" to be under 8 chars + +* Mon Sep 29 2003 Havoc Pennington 0.13-2 +- see if removing qt subpackage for now will get us through the build system, + qt bindings not useful yet anyway + +* Sun Sep 28 2003 Havoc Pennington 0.13-1 +- 0.13 fixes a little security oops + +* Mon Aug 4 2003 Havoc Pennington 0.11.91-3 +- break the tiny dbus-launch that depends on X into separate package + so a CUPS server doesn't need X installed + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sat May 17 2003 Havoc Pennington 0.11.91-1 +- 0.11.91 cvs snap properly merges system.d + +* Fri May 16 2003 Havoc Pennington 0.11.90-1 +- build a cvs snap with a few more fixes + +* Fri May 16 2003 Havoc Pennington 0.11-2 +- fix a crash that was breaking cups + +* Thu May 15 2003 Havoc Pennington 0.11-1 +- 0.11 + +* Thu May 15 2003 Havoc Pennington 0.10.90-1 +- use rc.d/init.d not init.d, bug #90192 +- include the new man pages + +* Fri Apr 11 2003 Havoc Pennington 0.9-1 +- 0.9 +- export QTDIR explicitly +- re-enable qt, the problem was most likely D-BUS configure + +* Tue Apr 1 2003 Havoc Pennington 0.6.94-1 +- update from CVS with a fix to set uid after gid + +* Tue Apr 1 2003 Havoc Pennington 0.6.93-1 +- new cvs snap that actually forks to background and changes + user it's running as and so forth +- create our system user in pre + +* Mon Mar 31 2003 Havoc Pennington 0.6.92-1 +- fix for "make check" test that required a home directory + +* Mon Mar 31 2003 Havoc Pennington 0.6.91-1 +- disable qt for now because beehive hates me +- pull a slightly newer cvs snap that creates socket directory +- cat the make check log after make check fails + +* Mon Mar 31 2003 Havoc Pennington 0.6.90-1 +- initial build