summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-11-14Update NEWS for 1.13.xSimon McVittie1-0/+4
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-14Add a missing space in logging outputThomas Zajic1-1/+1
Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103729
2017-11-13Merge branch 'dbus-1.12'Simon McVittie1-9/+16
2017-11-13Start 1.12.4Simon McVittie2-1/+6
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-131.12.2Simon McVittie2-4/+4
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-10Update NEWS for 1.12.xSimon McVittie1-0/+6
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-10Update NEWS for 1.13.xSimon McVittie1-0/+6
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-10bus_connections_setup_connection: If we can't set it up, log whySimon McVittie2-32/+29
While reviewing fd.o#101354, Philip Withnall pointed out that if we rejected a connection in the new code there, we didn't log why. It turns out we didn't log that in the more normal code path either. Redo the error handling so that failure to set up a connection is logged. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103592 (cherry picked from commit 56847ae818e8c144b9c7a8102efd1c926ead2f62)
2017-11-10bus_connections_setup_connection: If we can't set it up, log whySimon McVittie2-32/+29
While reviewing fd.o#101354, Philip Withnall pointed out that if we rejected a connection in the new code there, we didn't log why. It turns out we didn't log that in the more normal code path either. Redo the error handling so that failure to set up a connection is logged. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103592
2017-11-10Update NEWS for 1.13.xSimon McVittie1-0/+14
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-10Update NEWS for 1.12.xSimon McVittie1-1/+11
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-10travis-ci: Enable/disable more features in various buildsSimon McVittie1-0/+10
In the debug build, enable features that are off by default. In the reduced build, explicitly disable features, some of which are on by default. In the legacy build, check that we can compile the default feature-set without inotify, dnotify, systemd, etc. Reviewed-by: Philip Withnall <withnall@endlessm.com> [smcv: Rebase onto 1.13.x branch, fix minor conflicts] Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354 (cherry picked from commit 3c031ef5aa1f7f53c6344781cb38b78abe44dc96)
2017-11-07DBusNonceFile: Don't rely on caller preallocating the objectSimon McVittie3-49/+67
If we combine the dbus_new0, populating the DBusString members and the actual creation of the file, RAII-style, then we never need to worry about a partially-initialized or uninitialized DBusNonceFile becoming visible to a caller. Similarly, if we combine deletion of the file, freeing of the DBusString members, freeing the structure and clearing the pointer to the structure, then we can never be in an inconsistent situation, except during the actual implementation of _dbus_noncefile_delete(). Note that there are two implementations each of _dbus_noncefile_create() and _dbus_noncefile_delete(). This is because on Unix we must use a subdirectory of _dbus_get_tmpdir() (the nonce filename is not created atomically, so that would not be safe), while on Windows we use the directory directly (the Windows temp directory is private to a user, so this is OK). Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103597
2017-11-07_dbus_accept_with_noncefile: Don't leak nonceSimon McVittie1-5/+17
This was always leaked, both on success and on error. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103597 (cherry picked from commit 37d5af203c0fc22c9ae746b2ae4781ff648a792f)
2017-11-07do_noncefile_create: Avoid freeing uninitialized memory on errorSimon McVittie1-0/+6
We could free all of these without having ever successfully initialized them. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103597 (cherry picked from commit 6d08f5c04e601f16ef4ee2126a90c924b7e26df0)
2017-11-07do_check_nonce: Don't free uninitialized memory on OOMSimon McVittie1-0/+14
If _dbus_string_init() fails, it doesn't guarantee that the string is initialized to anything in particular. Worse, if _dbus_string_init (&buffer) fails, p would never have been initialized at all, due to the use of the short-circuiting || operator. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103597 (cherry picked from commit 0ea0e4b0fddd1109835b8b9f7a8319d59c8d9303)
2017-11-07_dbus_accept_with_noncefile: Don't leak nonceSimon McVittie1-5/+17
This was always leaked, both on success and on error. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103597
2017-11-07do_noncefile_create: Avoid freeing uninitialized memory on errorSimon McVittie1-0/+6
We could free all of these without having ever successfully initialized them. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103597
2017-11-07do_check_nonce: Don't free uninitialized memory on OOMSimon McVittie1-0/+14
If _dbus_string_init() fails, it doesn't guarantee that the string is initialized to anything in particular. Worse, if _dbus_string_init (&buffer) fails, p would never have been initialized at all, due to the use of the short-circuiting || operator. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103597
2017-11-07tests: Assert that _DBUS_STRING_DEFINE_STATIC looks as expectedSimon McVittie1-0/+12
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-07_DBUS_STRING_DEFINE_STATIC: Don't include zero termination in lengthSimon McVittie1-1/+1
_dbus_string_init_const() doesn't include the trailing '\0' in the DBusRealString->len, so this surely shouldn't either. In practice none of the users of _DBUS_STRING_DEFINE_STATIC care one way or the other, but it seems better to be consistent. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-06Update NEWSSimon McVittie1-0/+5
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-06test-utils-glib: Add function to connect with GDBus as another uidSimon McVittie2-0/+28
This will be used in a test for connecting to container servers as the wrong uid. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
2017-11-06test-utils-glib: Factor out functions for switching uidSimon McVittie1-28/+49
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
2017-11-06test-utils-glib: Add failable functions to connect to a busSimon McVittie3-22/+61
Instead of calling g_test_skip() internally, raise a distinctive error and let the caller handle it. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
2017-11-06_dbus_asv_add_object_path: AddSimon McVittie2-0/+39
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
2017-11-06Add a simplified backport of g_steal_pointer()Simon McVittie2-1/+16
This will be used in tests later in the branch. Sadly we can't use GLIB_VERSION_2_44 unless we are willing to have a hard dependency on GLib 2.44, which would force us to do all our Travis-CI builds in Docker containers rather than in ye olde base system, and that adds 50% to the time taken to do builds. Reviewed-by: Philip Withnall <withnall@endlessm.com> [smcv: Rebase onto 1.13.x branch, fix minor conflicts] Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
2017-11-06cmake: Match AC_DEFINE more precisely, respecting [] quotingSimon McVittie2-1/+4
The regular expression previously used here to select the second comma-delimited argument won't work when we introduce an argument containing a comma, which I need to do now. We can address this by recognising Autoconf's quoting mechanism (which uses square brackets). This is not 100% right (it doesn't understand nested square brackets), but it's good enough in practice. Signed-off-by: Simon McVittie <smcv@collabora.com> Acked-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
2017-11-06travis-ci: Enable/disable more features in various buildsSimon McVittie1-0/+10
In the debug build, enable features that are off by default. In the reduced build, explicitly disable features, some of which are on by default. In the legacy build, check that we can compile the default feature-set without inotify, dnotify, systemd, etc. Reviewed-by: Philip Withnall <withnall@endlessm.com> [smcv: Rebase onto 1.13.x branch, fix minor conflicts] Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
2017-11-06Use a micro version that won't break DBUS_VERSIONSimon McVittie1-1/+1
DBUS_VERSION assumes that major/minor/micro are numeric and less than 256 each. Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-31Update NEWSSimon McVittie1-0/+4
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-31build: Avoid using `echo -e`Tony Theodore1-1/+1
`echo -e` is a GNU extension, and in particular not available on Darwin. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103493 [smcv: Added commit message] Reviewed-by: Simon McVittie <smcv@collabora.com> (cherry picked from commit 216ae1adfcf9ce9274019b3c29b8f1245c26dec1)
2017-10-31Update NEWSSimon McVittie1-0/+4
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-31build: Avoid using `echo -e`Tony Theodore1-1/+1
`echo -e` is a GNU extension, and in particular not available on Darwin. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103493 [smcv: Added commit message] Reviewed-by: Simon McVittie <smcv@collabora.com>
2017-10-31Update NEWSSimon McVittie1-0/+5
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-31build: Use $(MKDIR_P) syntax suitable for install-shilovezfs1-1/+1
This fixes the build when a GNU-compatible `mkdir -p` is not available. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103521 [smcv: Add commit message] Reviewed-by: Simon McVittie <smcv@collabora.com> (cherry picked from commit c7d8b723eb53848f9a86f36d640ea5f564d34590)
2017-10-31Update NEWSSimon McVittie1-0/+5
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-31build: Use $(MKDIR_P) syntax suitable for install-shilovezfs1-1/+1
This fixes the build when a GNU-compatible `mkdir -p` is not available. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103521 [smcv: Add commit message] Reviewed-by: Simon McVittie <smcv@collabora.com>
2017-10-30Bump version for 1.12.x branchSimon McVittie2-1/+6
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-30Bump version for 1.13.x branchSimon McVittie2-4/+12
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-30Merge branch 'dbus-1.12'Simon McVittie2-10/+13
2017-10-30Prepare 1.12.0Simon McVittie2-10/+13
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-30Merge branch 'dbus-1.12', rejecting stable-branch-only changeSimon McVittie0-0/+0
2017-10-30Disable deprecation warnings for stable branchSimon McVittie1-0/+3
We're not going to replace deprecated functions here, similar to commit 88e0ccb2 in the dbus-1.10 branch. Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-23NEWS for #103420Simon McVittie1-1/+9
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-10-23build: Remove various unused files from build systemSimon McVittie5-1106/+0
These were in git but not distributed in source tarballs, and in fact not hooked up to the Autotools build system at all. test/data/valid-introspection-files was mentioned in the CMake build system (copied from the source directory to the build directory), but according to `git grep` is not used for anything. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103420
2017-10-23build: Include README.cmake in Autotools "make dist"Simon McVittie1-0/+1
Our official source releases are Autotools "make dist" tarballs, but there's no reason why CMake users can't use those too, and we already include the CMake build files. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103420
2017-10-23build: Distribute individual files and directories from cmake/Simon McVittie1-1/+16
If we distribute the entire directory in "make dist" tarballs, then we include the generated files cmake/DBus1Config.cmake and cmake/DBus1ConfigVersion.cmake, which we should not. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103420
2017-10-23build: Distribute more test data in source tarballsSimon McVittie1-0/+2
test-bus exercises the parser by trying to parse every file in these directories. A couple of files were accidentally left out, meaning those parsing code paths are tested when we build from git, but not when we build from a tarball release. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103420
2017-10-23build: Don't explicitly clean up configure-generated filesSimon McVittie1-5/+0
cmake/DBus1Config.cmake, cmake/DBus1ConfigVersion.cmake and dbus-1.pc are all generated by AC_CONFIG_FILES, so they are automatically listed in $(CONFIG_CLEAN_FILES) and cleaned in "make distclean" without further help from us. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103420
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 17:12:14 +0000