summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-01-04NEWS so farSimon McVittie1-1/+21
2012-01-04Remove some dead code related to fd.o #37258eXeC001er1-1/+0
This would now just attempt to close fd -1, which is useless. [commit message added by smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37258 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2012-01-04Revert all changes since a36d4918a6f646e085Simon McVittie117-3307/+2608
Someone seems to have merged part of master into 1.4. Again. Let's go back to the "last known good" point (the branch-point of some 1.4 branches I had locally), then we can cherry-pick the changes that should have gone in.
2011-12-25Merge branch 'dbus-1.4'Ralf Habacker1-1/+2
Conflicts: dbus/dbus-spawn-win.c
2011-12-251.4 branch need a fix to be compilable with msvcRalf Habacker1-1/+2
2011-12-22keep cmake in sync with automake related to default bus addressesRalf Habacker1-2/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38201
2011-12-22windows fix: use install root as base path for relative pathes in dbus ↵Ralf Habacker1-6/+38
service file Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44030
2011-12-22keep cmake in sync with automake related to default bus addressesRalf Habacker1-2/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38201
2011-12-21windows fix: use install root as base path for relative pathes in dbus ↵Ralf Habacker1-6/+38
service file
2011-12-21Merge branch 'dbus-1.4'Ralf Habacker3-14/+48
2011-12-21Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4Ralf Habacker7-41/+120
2011-12-21Adds a configure time key --with-dbus-session-bus-default-addressSiraj Razick1-1/+2
With this key we can specifiy the default session bus address at compile time with autotool builds made with mingw32. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43639 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2011-12-21Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4Ralf Habacker3-24/+40
2011-12-21added notes about supported compilersRalf Habacker2-32/+42
2011-11-21made session service dirs customizable: autotools partRalf Habacker1-0/+2
2011-11-21made session service dirs customizable: cmake partRalf Habacker3-1/+6
2011-11-02_dbus_loop_new: don't crash on OOM allocating socket setSimon McVittie1-1/+7
Also don't leak the socket set if allocating watches failed, or vice versa. Based on review feedback from wjt. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33337
2011-11-02Merge branch 'dbus-1.4'Simon McVittie3-24/+40
2011-11-02corrupt test: compile successfully against older GLib (Debian stable)Simon McVittie1-23/+37
We don't really need g_socket_send_with_blocking here. Also, don't leak the GLib socket objects. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41219 Reviewed-by: Lennart Poettering <lennart@poettering.net>
2011-11-02Set DBUS_TEST_HOMEDIR when running installcheckSimon McVittie1-0/+1
This avoids spamming ~/.dbus and ~/.dbus-keyrings with filesystem activity while running the tests. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41218 Reviewed-by: Lennart Poettering <lennart@poettering.net>
2011-11-02_dbus_listen_tcp_socket: avoid leaking listen_fd in unlikely circumstancesSimon McVittie1-1/+2
If getaddrinfo (with port == 0) succeeds, the kernel gives us a port when we first listen on a socket, we jump back to redo_lookup_with_port, and getaddrinfo (with the nonzero port) fails, we leak listen_fd and all the fds in it. From the department of "without static analysis we'd never have spotted this", or possibly "backward goto considered harmful". Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29881 Bug-NB: NB#180486 CID-2389 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-10-29refactored cmake version extracting from configure.acRalf Habacker2-13/+46
2011-10-28Merge branch 'dbus-1.4'Ralf Habacker1-3/+32
2011-10-28Optimized error handling of previous patchRalf Habacker1-3/+18
2011-10-28Find dbus-daemon executable next to dbus shared libaray on windows.Jesper Dam1-3/+17
If the dbus shared library and the daemon executable are both in a dir that is not part of the default search path and dbus-1.dll is dynamically loaded with LoadLibrary(), it will fail to locate and launch the daemon without this patch. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41558 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2011-10-17Install empty session.d config directory using cmake, otherwise dbus-daemon ↵Ralf Habacker1-0/+1
will not start Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41319
2011-10-12cmake: don't include -util sources in the shared librarySimon McVittie1-4/+0
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34976 Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
2011-10-12Remove dbus-auth-script from the shared librarySimon McVittie2-4/+4
Only the tests use this. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34976 Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
2011-09-29Merged cmake and autotools session bus configurationRalf Habacker2-33/+2
cmake and autotools session bus configuration templates are identical, so cmake now uses the autotools. Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41319
2011-09-28Remove EXT variable from CMake, just use Automake-compatible EXEEXTSimon McVittie2-3/+3
According to Ralf, there's no standard name for this in CMake, so we might as well use the standard Automake name. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-28sysdeps: remove misleading commentsSimon McVittie2-10/+0
The comment claims that _dbus_full_duplex_pipe() is only used for the debug-pipe server, but in fact the process-spawning code uses it now (on both Unix and Windows platforms). Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-28Merge tests' cmake and autotools bus configurationSimon McVittie13-93/+27
In Unix, the tests listened on both debug-pipe (which is a socketpair, or a TCP emulation of socketpair on Windows) and a Unix socket. In the Windows port, the tests were hard-coded to listen on a particular port, which allowed the dispatch test to connect to that port, as long as no two tests ran simultaneously (which I don't think was ever guaranteed - make -j can violate this). That's valid out-of-process, and also fully-specified, so they only needed one <listen> directive, so the CMake input only had one. To make the tests work under CMake on Unix, there was a hack: the string substituted for the content of the <listen> directive contained </listen><listen> to get the other address in, which is pretty nasty. Instead of doing that, I've made both build systems, on both Unix and Windows, use both debug-pipe and a more normal transport (Unix or TCP). debug-pipe has a Windows implementation and it's used in dbus-spawn-win.c, so it'd better work. The use of debug-pipe is now hard-coded rather than being a configure parameter (there's no reason to vary it in different builds), and I used TEST_LISTEN as the name of the Unix/TCP address, because it's a "vague" address (no specific Unix path, no TCP port), that you can listen on but not connect to. This in turn means that we can merge the Autoconf .in and CMake .cmake files, similar to Bug #41033. You might wonder why I've kept debug-pipe. I did try to get rid of it, but it turns out that the tests in dispatch.c rely on dbus_connection_open_private() not blocking, and normal socket connections block on connect(). Until we fix that by adding an async version of dbus_connection_open_private(), it won't be safe to have a test like dispatch.c that "talks to itself", unless it uses a transport as trivial as debug-pipe in which neither end has to block on the other. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-28cmake: remove unused TEST_SERVICE_DIR variableSimon McVittie1-2/+0
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-28Simplify substitution of test executables to use fewer variablesSimon McVittie17-54/+144
Also use EXEEXT in all the service files, even in the automake build system. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-28Simplify generation of bus configuration filesSimon McVittie10-21/+12
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-24Merge branch 'dbus-1.4'Ralf Habacker3-95/+24
2011-09-23Use dbus/dbus-arch-deps.h.in as source for cmake tooRalf Habacker3-95/+24
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41033 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22Merge branch 'dbus-1.4'Ralf Habacker2-15/+27
Conflicts: cmake/CMakeLists.txt
2011-09-22Added cmake 'help-options' target to print out all available configure optionsRalf Habacker1-0/+5
cherry-picked 5a0c5663ebf0b75503dfa6a60c01df07a29d3334
2011-09-22fixed cmake error: doc says CACHE needs type *and* doc stringRalf Habacker1-6/+5
cherry-picked aba867f2422d06393f610c6cd8c6b147b4fd6c38
2011-09-22Limit batch file creating to windowsRalf Habacker1-0/+4
cherry-picked 84b03cae585274bfe54e2a234dff72469cef581d
2011-09-22Fixed cmake buildsystem - option command only supports boolean valuesRalf Habacker1-3/+3
Conflicts: cmake/CMakeLists.txt cherry picked 4ee7b07b208f64f3b76f253c449e86e86849fca8 from master Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22cmake fix: generate build timestampRalf Habacker2-5/+18
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41029 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22Simplified cmake xml parser dependencies.Ralf Habacker1-9/+9
Find either expat or libxml2 xml parser libraries, depending on -DDBUS_USE_EXPAT=ON|OFF Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41027 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-21Micro versionSimon McVittie2-1/+6
2011-09-21Prepare version 1.5.8dbus-1.5.8Simon McVittie3-4/+9
2011-09-21Merge branch 'dbus-1.4'Simon McVittie1-6/+5
Conflicts: NEWS configure.ac
2011-09-21Micro versionSimon McVittie2-1/+6
2011-09-21Prepare version 1.4.16dbus-1.4.16Simon McVittie3-9/+8
2011-09-21Enable more compiler warnings by defaultSimon McVittie1-5/+21
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 03:45:25 +0000