Commit graph

7084 commits

Author SHA1 Message Date
Simon McVittie
4acb9d7cea Merge branch 'auth-timeout-comment' into 'main'
bus: Correct commented-out default auth_timeout in system.conf

See merge request dbus/dbus!519
2025-03-07 16:03:39 +00:00
Simon McVittie
9746758a2e bus: Correct commented-out default auth_timeout in system.conf
Commit 54d26df5 "config: change default auth_timeout to 5 seconds"
reduced the hard-coded default from 30 to 5 seconds, and the
commented-out informational copy of this information in system.conf
reflected that.

Commit 02e1ddf9 'Revert "config: change default auth_timeout to 5 seconds"'
subsequently increased hard-coded default back to 30 seconds, but did
not update the commented-out version in this file.

See also CVE-2014-3639, fd.o #80919, fd.o #86431.

Fixes: 1a36f983 "Document default limits in system.conf.in"
Fixes: 02e1ddf9 'Revert "config: change default auth_timeout to 5 seconds"'
Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-03-07 16:02:50 +00:00
Simon McVittie
fb07df7cab Merge branch 'ci-jobs' into 'main'
CI: Adjust which CI jobs are run by default

See merge request dbus/dbus!518
2025-02-28 15:11:45 +00:00
Simon McVittie
0c7ecfd8cd CI: Don't build on FreeBSD with CMake by default
We recommend the Meson build system for all target operating systems
other than Windows. We do try to keep CMake builds operational on Linux
to make life easier for developers, but the `opensuse cmake debug` job,
which runs by default, is sufficient for that.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-28 14:44:19 +00:00
Simon McVittie
1cb9b8bffe CI: Enable Windows build with Meson, gcc and UCRT64
This was broken for a while (see dbus#462, dbus!426, dbus!429, dbus!512)
but now it works again. Let's not allow it to regress without someone
noticing.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-28 14:42:50 +00:00
Simon McVittie
c6780cbd31 Merge branch 'subprojects' into 'main'
build: Improve options used for fallback Meson subprojects

See merge request dbus/dbus!516
2025-02-28 14:36:56 +00:00
Simon McVittie
0a01eb02ae build: If GLib is a subproject, disable GObject-Introspection
We don't need this and it will only slow down the build.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-28 13:03:13 +00:00
Simon McVittie
57abac5bc8 build: Link subprojects statically if built as a subproject
If we're building a dependency as a fallback subproject, we don't want
to be responsible for installing it as a shared library. Anyone wanting
shared libraries should install the dependencies separately.

Ideally we'd do this with MSVC too, but that doesn't currently link
successfully (dbus#549).

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-28 13:03:07 +00:00
Simon McVittie
3ca6a3fec4 build: Never make compiler warnings in subprojects fatal
If one of our subprojects has compiler warnings, fixing them is
out-of-scope for dbus.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-28 12:29:55 +00:00
Simon McVittie
0d820a6e17 build: Indent GLib subproject options consistently
Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-28 12:05:02 +00:00
Simon McVittie
8514f7bfa0 build: If expat is a submodule, explicitly disable its unit tests
If we're falling back to building a local copy of expat, running or
debugging its unit tests is out-of-scope for maintenance of dbus.
In fact this is the default in the meson_options.txt provided by
WrapDB[1], but explicit is better than implicit.

[1] https://github.com/mesonbuild/wrapdb/blob/HEAD/subprojects/packagefiles/expat/meson_options.txt

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-28 12:03:55 +00:00
Simon McVittie
20de6d82c6 Merge branch 'update-wraps' into 'main'
Update GLib fallback subproject to latest stable release

See merge request dbus/dbus!426
2025-02-27 23:10:31 +00:00
Simon McVittie
0a3b1f9d11 CI: Never run the test suites of subprojects
Some of them fail when run on Windows, and debugging the test suite
for a subproject is out-of-scope for dbus.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 19:27:06 +00:00
Simon McVittie
5602dace0d subprojects: Update fallback GLib subproject
Updated with:

    meson wrap update

We need a newer GLib when building on Windows using Meson, because the
removal of distutils in recent versions of Python breaks older GLib.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 19:27:06 +00:00
Simon McVittie
2537199d44 CI: Install meson from bookworm-backports when using GLib subproject
Debian 12 'bookworm' has Meson 1.0.1, which is too old for the current
stable branch of GLib. Use the version from bookworm-backports when
running on Debian and building with a mingw-w64 compiler.

We can stop doing this and put meson back in the normal list of
packages when we update to the Debian 13 stable release, expected to be
released in mid 2025.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 19:27:06 +00:00
Simon McVittie
e116a3774a CI: Avoid hard-coding the version of Expat and GLib in use
Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 19:06:50 +00:00
Simon McVittie
203515a0c0 Merge branch 'update-expat' into 'main'
subprojects: Update fallback expat subproject

See merge request dbus/dbus!429
2025-02-27 18:38:51 +00:00
Simon McVittie
4201789223 subprojects: Update fallback expat subproject
Updated with:

    meson wrap update

expat 2.6.4 contains security fixes. In practice these don't affect
dbus, because we only use expat to parse trusted message bus
configuration, but we might as well use the newest available version.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 17:50:34 +00:00
Simon McVittie
2cc490f460 CI: Bump FreeBSD version to 14.2
FreeBSD 13.1 has been EOL since July 2023, but because there are
apparently no FreeBSD users among the dbus maintainers, nobody noticed.

dbus/dbus#308 is still present in FreeBSD 14.2, so remove the version
check when skipping that particular test.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 17:06:37 +00:00
Simon McVittie
b4be89b9df CI: Use a separate tagged Docker image for each dbus branch
The image contains build-dependencies from tools/ci-install.sh, so it
can be different for 1.16.x vs. main. Include the upstream branch name
in the tag name, like we already did for the Windows image, so that
an image with the same timestamp but different content can be different.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 16:35:16 +00:00
Simon McVittie
149165840d Merge branch 'issue546'
Resolves: dbus#546
Resolves: dbus#547
Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 16:31:48 +00:00
Simon McVittie
a995205c18 CI: Rebuild openSUSE image to update it to Leap 15.6
dbus#548

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 16:03:15 +00:00
Simon McVittie
d38940dec3 CI: Build a newer GLib on Windows
GLib 2.70.x has been EOL for years, and is incompatible with newer
versions of Python.

dbus#547

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 15:30:27 +00:00
Simon McVittie
f72402ce1e CI: Fetch a different URL on sourceforge.net
Commit a56de468 "CI: Avoid using a no-op download location that gives
a 403 error" changed this, but now the direct URL to the file *also*
gives a 403 error. According to the comments in this file, the only
reason we're fetching these URLs is in an effort to pre-seed the
cache of intermediate certificates, so the specific URL that we're
requesting is uninteresting: we just need to fetch *something*.

dbus#546

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-27 15:12:25 +00:00
Simon McVittie
e5ed920852 Document the change of development branch name to main
Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-18 14:38:19 +00:00
Simon McVittie
0670360363 Rename the git branch used for development to 'main'
This follows the convention used by many projects and hosting platforms.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-18 14:31:28 +00:00
Simon McVittie
4c0d7e551f Update NEWS
Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-18 14:25:42 +00:00
Simon McVittie
01f224420a Merge branch 'debian-1096212' into 'master'
selinux: Don't include unused reference count in verbose logging

See merge request dbus/dbus!511
2025-02-18 14:23:05 +00:00
Simon McVittie
a57bb89673 selinux: Don't include unused reference count in verbose logging
libselinux 3.8 includes an API break in which the `refcnt` field of
struct security_id_t (originally intended to be a reference count, but
in practice always initialized to 1 and never modified) was renamed and
repurposed as an `id` field. This caused a build failure if dbus was
compiled with both SELinux support and verbose mode, for example in the
instrumented debug build that Debian includes in the `dbus-tests` package.

This particular piece of debug logging has little value, so just
remove it.

Reference: e5fd7b078f
Bug-Debian: https://bugs.debian.org/1096212
Signed-off-by: Simon McVittie <smcv@collabora.com>
2025-02-18 10:37:37 +00:00
Simon McVittie
8ca823d38f NEWS: Add notes about Meson behaviour not being identical to Autotools
See dbus/dbus#542 for an example of one particularly significant
behaviour change.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-18 14:03:10 +00:00
Simon McVittie
70eafceeb0 Update NEWS
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:49:13 +00:00
Simon McVittie
b7ea5a3aad README: Mention the -alpha, -beta, -rc tags since 1.17.x
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:48:18 +00:00
Simon McVittie
c1a3be5276 README: Stop describing odd/even as Linux kernel versioning
The Linux kernel hasn't used this versioning scheme for years
(the last odd-numbered development branch was 2.5).

We are still using the odd/even versioning scheme, and so are some other
library projects. Cite GLib and SDL as better examples of projects that
still use it.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:48:00 +00:00
Simon McVittie
33d4876806 README.win, README.cygwin: Describe dbus4win, etc. as historical
The merge of Windows-specific dbus ports into the same git repository
as the original Unix-only implementation was a long time ago now,
and exists on several stable-branches, not just master.

This also avoids explicitly mentioning the name of the master branch,
which is likely to be renamed to main in future.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:45:27 +00:00
Simon McVittie
6ea7644852 README.win: Capitalize "Windows"
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:43:37 +00:00
Simon McVittie
209ad5c761 README.win: Mention Meson instead of Autotools
The choice of build system is now Meson/CMake rather than Autotools/CMake.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:43:25 +00:00
Simon McVittie
7f362782d6 INSTALL, README: Simplify Meson vs. CMake recommendation
Now that 1.16.0 has been released and 1.15.x is EOL, it's misleading
to say that Meson is the recommended build system for Unix only on the
master branch: it's the recommended build system for Unix on the
dbus-1.16 branch, too.

This also avoids explicitly naming the master branch, which is likely
to get renamed to main.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:42:36 +00:00
Simon McVittie
8e17865aca CONTRIBUTING: Replace Autotools build options with Meson equivalents
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:40:48 +00:00
Simon McVittie
3d809e6223 CONTRIBUTING: Update details of the current branch
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:40:10 +00:00
Simon McVittie
9affc8a09d tools: Fix a cross-reference to Mesa's master branch
Mesa has renamed its default branch to main.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:29:37 +00:00
Simon McVittie
5b4dca37f9 build: Bump ABI current and age parameters to distinguish from 1.16.x
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 15:29:15 +00:00
Simon McVittie
8301c2c98f Merge branch 'dbus-1.16' 2024-12-16 15:28:29 +00:00
Simon McVittie
69e79b896a Prepare v1.16.0
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 12:21:54 +00:00
Simon McVittie
880c3d1f73 Merge branch 'dbus-1.16' 2024-12-16 11:01:14 +00:00
Simon McVittie
971060ad73 NEWS: Update
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 11:00:00 +00:00
Simon McVittie
60d6f41c67 INSTALL: libexpat is not required if the dbus-daemon is not built
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 10:59:42 +00:00
Simon McVittie
f1a4c1c481 INSTALL: Mention how to build as a Meson subproject
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 10:59:20 +00:00
Simon McVittie
25e370ce8f meson: Don't interpolate the result of configure_file() into a format()
configure_file() returns a file object, which was not intended to be a
valid parameter for format() (even though in practice it works the way
we wanted it to), causing newer Meson versions to report deprecation
warnings.

If the version of Meson is new enough, we can use the full_path()
method. Otherwise, we'll have to re-compute the output filename.

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 872ce4d29a)
2024-12-16 10:41:31 +00:00
Simon McVittie
7094a4047e meson: Consistently use boolean defaults for boolean options
Meson accepts either booleans or strings as defaults for a boolean
option, but recommends booleans, and raises deprecation warnings for
strings.

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit dc56afed59)
2024-12-16 10:41:25 +00:00
Simon McVittie
7d3bc75835 Merge branch 'meson' into 'master'
meson: Fix deprecation warnings

See merge request dbus/dbus!507
2024-12-13 17:39:58 +00:00