Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
D
dbus
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Daniel Reurich
dbus
Commits
201e26f2
Commit
201e26f2
authored
Jul 29, 2011
by
Simon McVittie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Imported Upstream version 1.4.14
parent
fbe6c26a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
48 changed files
with
969 additions
and
801 deletions
+969
-801
Makefile.am
Makefile.am
+1
-2
Makefile.in
Makefile.in
+2
-2
NEWS
NEWS
+40
-1
README
README
+23
-22
README.cygwin
README.cygwin
+1
-1
README.win
README.win
+4
-4
Makefile.am
bus/Makefile.am
+12
-10
Makefile.in
bus/Makefile.in
+14
-108
config-parser-trivial.c
bus/config-parser-trivial.c
+2
-2
config-parser.c
bus/config-parser.c
+4
-0
policy.c
bus/policy.c
+2
-2
CMakeLists.txt
cmake/CMakeLists.txt
+3
-0
CMakeLists.txt
cmake/bus/CMakeLists.txt
+6
-0
config.h.cmake
cmake/config.h.cmake
+1
-0
readme-cmake.txt
cmake/readme-cmake.txt
+0
-39
configure
configure
+16
-14
configure.ac
configure.ac
+5
-3
Makefile.am
dbus/Makefile.am
+4
-11
Makefile.in
dbus/Makefile.in
+6
-100
dbus-auth.c
dbus/dbus-auth.c
+2
-2
dbus-connection.c
dbus/dbus-connection.c
+33
-29
dbus-memory.c
dbus/dbus-memory.c
+17
-7
dbus-message-util.c
dbus/dbus-message-util.c
+2
-2
dbus-message.c
dbus/dbus-message.c
+22
-14
dbus-object-tree.c
dbus/dbus-object-tree.c
+14
-5
dbus-pending-call.c
dbus/dbus-pending-call.c
+10
-33
dbus-server.c
dbus/dbus-server.c
+64
-43
dbus-string.c
dbus/dbus-string.c
+3
-0
dbus-sysdeps-unix.c
dbus/dbus-sysdeps-unix.c
+34
-17
dbus-sysdeps-win.c
dbus/dbus-sysdeps-win.c
+31
-0
dbus-sysdeps.h
dbus/dbus-sysdeps.h
+1
-0
dbus-test.c
dbus/dbus-test.c
+1
-1
Makefile.am
doc/Makefile.am
+21
-13
Makefile.in
doc/Makefile.in
+99
-41
dbus-cleanup-sockets.1
doc/dbus-cleanup-sockets.1
+14
-14
dbus-daemon.1.in
doc/dbus-daemon.1.in
+77
-77
dbus-faq.html
doc/dbus-faq.html
+21
-21
dbus-launch.1
doc/dbus-launch.1
+57
-57
dbus-monitor.1
doc/dbus-monitor.1
+25
-25
dbus-send.1
doc/dbus-send.1
+23
-23
dbus-specification.html
doc/dbus-specification.html
+16
-16
dbus-test-plan.html
doc/dbus-test-plan.html
+2
-2
dbus-uuidgen.1
doc/dbus-uuidgen.1
+21
-21
Makefile.am
test/Makefile.am
+36
-5
Makefile.in
test/Makefile.in
+30
-11
session.conf
test/data/valid-config-files/session.conf
+63
-0
system.conf
test/data/valid-config-files/system.conf
+83
-0
dbus-launch-x11.c
tools/dbus-launch-x11.c
+1
-1
No files found.
Makefile.am
View file @
201e26f2
SUBDIRS
=
dbus bus doc tools
test
DIST_SUBDIRS
=
dbus bus doc tools
test
SUBDIRS
=
dbus bus tools
test
doc
pkgconfigdir
=
$(libdir)
/pkgconfig
pkgconfig_DATA
=
dbus-1.pc
...
...
Makefile.in
View file @
201e26f2
...
...
@@ -159,6 +159,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
distdir dist dist-all distcheck
ETAGS
=
etags
CTAGS
=
ctags
DIST_SUBDIRS
=
$(SUBDIRS)
DISTFILES
=
$(DIST_COMMON)
$(DIST_SOURCES)
$(TEXINFOS)
$(EXTRA_DIST)
distdir
=
$(PACKAGE)
-
$(VERSION)
top_distdir
=
$(distdir)
...
...
@@ -397,8 +398,7 @@ target_alias = @target_alias@
top_build_prefix
=
@top_build_prefix@
top_builddir
=
@top_builddir@
top_srcdir
=
@top_srcdir@
SUBDIRS
=
dbus bus doc tools
test
DIST_SUBDIRS
=
dbus bus doc tools
test
SUBDIRS
=
dbus bus tools
test
doc
pkgconfigdir
=
$(libdir)
/pkgconfig
pkgconfig_DATA
=
dbus-1.pc
DISTCLEANFILES
=
\
...
...
NEWS
View file @
201e26f2
D-Bus 1.4.14 (2011-07-29)
==
The "Puny receptacle!" release.
Changes:
• Use DBUS_ERROR_OBJECT_PATH_IN_USE if dbus_connection_try_register_object_path
or dbus_connection_try_register_fallback fails, not ...ADDRESS_IN_USE
(fd.o #38874, Jiří Klimeš)
• Consistently use atomic operations on everything that is ever manipulated
via atomic ops, as was done for changes to DBusConnection's refcount in
1.4.12 (fd.o #38005, Simon McVittie)
• Fix a file descriptor leak when connecting to a TCP socket (fd.o #37258,
Simon McVittie)
• Make "make check" in a clean tree work, by not running tests until
test data has been set up (fd.o #34405, Simon McVittie)
• Fix various typos (fd.o #27227, fd.o #38284; Sascha Silbe, Simon McVittie)
• Documentation (fd.o #36156, Simon McVittie):
· let xsltproc be overridden as usual: ./configure XSLTPROC=myxsltproc
· install more documentation automatically, including man2html output
· put dbus.devhelp in the right place (it must go in ${htmldir})
• Unix-specific:
· look for system services in /lib/dbus-1/system-services in addition to all
the other well-known locations; note that this should always be /lib,
even on platforms where shared libraries on the root FS would go in /lib64,
/lib/x86_64-linux-gnu or similar (fd.o #35229, Lennart Poettering)
· opt-in to fd passing on Solaris (fd.o #33465, Simon McVittie)
• Windows-specific (Ralf Habacker):
· fix use of a mutex for autolaunch server detection
· don't crash on malloc failure in _dbus_printf_string_upper_bound
D-Bus 1.4.12 (2011-06-10)
==
...
...
@@ -6,7 +45,7 @@ Security (local denial of service):
• Byte-swap foreign-endian messages correctly, preventing a long-standing
local DoS if foreign-endian messages are relayed through the dbus-daemon
(backporters: this is git commit c3223ba6c401ba81df1305851312a47c485e6cd7)
(
fd.o #38120, Debian #629938, no CVE number yet
; Simon McVittie)
(
CVE-2011-2200, fd.o #38120, Debian #629938
; Simon McVittie)
New things:
...
...
README
View file @
201e26f2
...
...
@@ -77,28 +77,8 @@ Configuration flags
When using autotools, run "./configure --help" to see the possible
configuration options and environment variables.
When using the cmake build system the dbus-specific configuration flags that can be given
to the cmake program are these (use -D<key>=<value> on command line)
CMAKE_BUILD_TYPE set dbus build mode - one of Debug|Release|RelWithDebInfo|MinSizeRel
DBUS_BUILD_TESTS enable unit test code default=ON
DBUS_BUILD_X11 Build with X11 autolaunch support default=ON
HAVE_CONSOLE_OWNER_FILE enable console owner file (solaris only) ) default=ON
DBUS_DISABLE_ASSERTS Disable assertion checking default=OFF
DBUS_DISABLE_CHECKS Disable public API sanity checking default=OFF
DBUS_ENABLE_ABSTRACT_SOCKETS enable support for abstract sockets (linux only) default=ON
DBUS_ENABLE_ANSI enable -ansi -pedantic gcc flags default=OFF
DBUS_ENABLE_DNOTIFY build with dnotify support (linux only) default=ON
DBUS_ENABLE_VERBOSE_MODE support verbose debug mode default=ON
DBUS_ENABLE_DOXYGEN_DOCS build DOXYGEN documentation (requires Doxygen) default=ON
DBUS_GCOV_ENABLED compile with coverage profiling instrumentation (gcc only) default=OFF
DBUS_INSTALL_SYSTEM_LIBS install required system libraries default (windows only) =OFF
DBUS_USE_EXPAT Use expat (== ON) or libxml2 (==OFF) default=ON [1]
DBUS_USE_NONCE_TCP_DEFAULT_ADDRESS Use nonce tcp default address default=OFF
DBUS_USE_OUTPUT_DEBUG_STRING enable win32 debug port for message output default=OFF
[1] requires installed development package of the related dependency
When using cmake, inspect README.cmake to see the possible
configuration options and environment variables.
API/ABI Policy
===
...
...
@@ -160,3 +140,24 @@ Note that the high-level bindings are _separate projects_ from the
main D-Bus package, and have their own release cycles, levels of
maturity, and ABI stability policies. Please consult the documentation
for your binding.
Bootstrapping D-Bus on new platforms
===
A full build of D-Bus, with all regression tests enabled and run, has some
dependencies which themselves depend on D-Bus, either for compilation or
for some of *their* regression tests: GLib, dbus-glib and dbus-python are
currently affected.
To avoid circular dependencies, when bootstrapping D-Bus for the first time
on a new OS or CPU architecture, you can either cross-compile some of
those components, or choose the build order and options carefully:
* build and install D-Bus without tests
- do not use the --enable-modular-tests=yes configure option
- do not use the --enable-tests=yes configure option
* build and install GLib, again without tests
* use those versions of libdbus and GLib to build and install dbus-glib
* ... and use those to install dbus-python
* rebuild libdbus; this time you can run all of the tests
* rebuild GLib; this time you can run all of the tests
README.cygwin
View file @
201e26f2
The cygwin dbus port is included in master branch of
dbus git repository since 1.3.1.
See cygwin/README for more information
s
about
See cygwin/README for more information about
the cygwin dbus port.
The cygwin port of dbus is maintained by:
...
...
README.win
View file @
201e26f2
...
...
@@ -14,9 +14,9 @@ test not running yet and there is help needed to get them running.
Building
--------
DBus c
ould be build
on windows using automake or cmake. See the
file README for more information
s
.
Special cmake build instructions c
ould
be found in cmake/readme-cmake.txt
DBus c
an be built
on windows using automake or cmake. See the
file README for more information.
Special cmake build instructions c
an
be found in cmake/readme-cmake.txt
windbus and dbus4win Ports
...
...
@@ -78,7 +78,7 @@ FAQ
- Do you have any clue if dbus-win32 can run in a Windows CE environment?
dbus has been ported to wince, see README.wince for more information
s
dbus has been ported to wince, see README.wince for more information
- Do you know if the C++ binding made by OpenWengo will be easily portable to Windows?
...
...
bus/Makefile.am
View file @
201e26f2
...
...
@@ -146,25 +146,27 @@ bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD \
-DACTIVATION_LAUNCHER_TEST
\
-DACTIVATION_LAUNCHER_DO_OOM
## we use noinst_PROGRAMS not check_PROGRAMS so that we build
## even when not doing "make check"
noinst_PROGRAMS
=
$(TESTS)
noinst_PROGRAMS
=
dbus_daemon_exec_PROGRAMS
=
dbus-daemon
if
DBUS_UNIX
libexec_PROGRAMS
=
dbus-daemon-launch-helper
endif
DBUS_UNIX
##
note that TESTS has special meaning (stuff to use in make check)
##
so if adding tests not to be run in make check, don't add them to
##
TESTS
TESTS
=
##
Note that TESTS has special meaning (stuff to use in make check).
##
We don't actually want to run any of these tests until test/ has been
##
compiled, so we don't put them in TESTS here; we run them in test/
## instead.
if
DBUS_BUILD_TESTS
TESTS_ENVIRONMENT
=
DBUS_TEST_DATA
=
$(top_builddir)
/test/data
DBUS_TEST_HOMEDIR
=
$(top_builddir)
/dbus
DBUS_FATAL_WARNINGS
=
1
DBUS_BLOCK_ON_ABORT
=
1
TESTS
+=
bus-test bus-test-system
## we use noinst_PROGRAMS not check_PROGRAMS so that we build
## even when not doing "make check"
# run as a test by test/Makefile.am
noinst_PROGRAMS
+=
bus-test bus-test-system
if
DBUS_UNIX
TESTS
+=
bus-test-launch-helper
# run as a test by test/Makefile.am
noinst_PROGRAMS
+=
bus-test-launch-helper
# this is used by the tests but is not,itself, a test
noinst_PROGRAMS
+=
dbus-daemon-launch-helper-test
endif
DBUS_UNIX
...
...
bus/Makefile.in
View file @
201e26f2
...
...
@@ -36,15 +36,19 @@ PRE_UNINSTALL = :
POST_UNINSTALL
=
:
build_triplet
=
@build@
host_triplet
=
@host@
noinst_PROGRAMS
=
$(am__EXEEXT_
3)
$(am__EXEEXT_4
)
noinst_PROGRAMS
=
$(am__EXEEXT_
1)
$(am__EXEEXT_2
)
dbus_daemon_exec_PROGRAMS
=
dbus-daemon
$(EXEEXT)
@DBUS_UNIX_TRUE@
libexec_PROGRAMS
=
dbus-daemon-launch-helper
$(EXEEXT)
TESTS
=
$(am__EXEEXT_1)
$(am__EXEEXT_2)
# run as a test by test/Makefile.am
@DBUS_BUILD_TESTS_TRUE@
am__append_1
=
bus-test bus-test-system
@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@
am__append_2
=
bus-test-launch-helper
# run as a test by test/Makefile.am
# this is used by the tests but is not,itself, a test
@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@
am__append_3
=
dbus-daemon-launch-helper-test
@HAVE_SYSTEMD_TRUE@
am__append_4
=
\
@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@
am__append_2
=
\
@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@ bus-test-launch-helper
\
@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@ dbus-daemon-launch-helper-test
@HAVE_SYSTEMD_TRUE@
am__append_3
=
\
@HAVE_SYSTEMD_TRUE@ dbus.service.in
\
@HAVE_SYSTEMD_TRUE@ dbus.socket.in
...
...
@@ -77,9 +81,8 @@ am__installdirs = "$(DESTDIR)$(dbus_daemon_execdir)" \
"
$(DESTDIR)$(configdir)
"
"
$(DESTDIR)$(systemdsystemunitdir)
"
@DBUS_BUILD_TESTS_TRUE@
am__EXEEXT_1
=
bus-test
$(EXEEXT)
\
@DBUS_BUILD_TESTS_TRUE@ bus-test-system
$(EXEEXT)
@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@
am__EXEEXT_2
=
bus-test-launch-helper
$(EXEEXT)
am__EXEEXT_3
=
$(am__EXEEXT_1)
$(am__EXEEXT_2)
@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@
am__EXEEXT_4
=
dbus-daemon-launch-helper-test
$(EXEEXT)
@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@
am__EXEEXT_2
=
bus-test-launch-helper
$(EXEEXT)
\
@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@ dbus-daemon-launch-helper-test
$(EXEEXT)
PROGRAMS
=
$(dbus_daemon_exec_PROGRAMS)
$(libexec_PROGRAMS)
\
$(noinst_PROGRAMS)
am__bus_test_SOURCES_DIST
=
activation.c activation.h
\
...
...
@@ -306,8 +309,6 @@ DIST_SOURCES = $(am__bus_test_SOURCES_DIST) \
DATA
=
$(agent_DATA)
$(config_DATA)
$(systemdsystemunit_DATA)
ETAGS
=
etags
CTAGS
=
ctags
am__tty_colors
=
\
red
=
;
grn
=
;
lgn
=
;
blu
=
;
std
=
DISTFILES
=
$(DIST_COMMON)
$(DIST_SOURCES)
$(TEXINFOS)
$(EXTRA_DIST)
ACLOCAL
=
@ACLOCAL@
AMTAR
=
@AMTAR@
...
...
@@ -632,7 +633,6 @@ bus_test_launch_helper_CPPFLAGS = -DDBUS_STATIC_BUILD \
-DACTIVATION_LAUNCHER_TEST
\
-DACTIVATION_LAUNCHER_DO_OOM
@DBUS_BUILD_TESTS_TRUE@
TESTS_ENVIRONMENT
=
DBUS_TEST_DATA
=
$(top_builddir)
/test/data
DBUS_TEST_HOMEDIR
=
$(top_builddir)
/dbus
DBUS_FATAL_WARNINGS
=
1
DBUS_BLOCK_ON_ABORT
=
1
bus_test_system_SOURCES
=
\
$(XML_SOURCES)
\
config-parser-common.c
\
...
...
@@ -656,7 +656,7 @@ bus_test_LDFLAGS = @R_DYNAMIC_LDFLAG@
#### Init scripts fun
SCRIPT_IN_FILES
=
messagebus.in messagebus-config.in rc.messagebus.in
\
$(am__append_
4
)
$(am__append_
3
)
@DBUS_INIT_SCRIPTS_RED_HAT_TRUE@
initddir
=
$(sysconfdir)
/rc.d/init.d
@DBUS_INIT_SCRIPTS_SLACKWARE_TRUE@
initddir
=
$(sysconfdir)
/rc.d/
@DBUS_INIT_SCRIPTS_RED_HAT_TRUE@
initd_SCRIPTS
=
\
...
...
@@ -2314,98 +2314,6 @@ GTAGS:
distclean-tags
:
-
rm
-f
TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS
:
$(TESTS)
@
failed
=
0
;
all
=
0
;
xfail
=
0
;
xpass
=
0
;
skip
=
0
;
\
srcdir
=
$(srcdir)
;
export
srcdir
;
\
list
=
'
$(TESTS)
'
;
\
$(am__tty_colors)
;
\
if
test
-n
"
$$
list"
;
then
\
for
tst
in
$$
list
;
do
\
if
test
-f
./
$$
tst
;
then
dir
=
./
;
\
elif
test
-f
$$
tst
;
then
dir
=
;
\
else
dir
=
"
$(srcdir)
/"
;
fi
;
\
if
$(TESTS_ENVIRONMENT)
$$
{
dir
}
$$
tst
;
then
\
all
=
`
expr
$$
all + 1
`
;
\
case
"
$(XFAIL_TESTS)
"
in
\
*
[
\ \
]
$$
tst[
\ \
]
*
)
\
xpass
=
`
expr
$$
xpass + 1
`
;
\
failed
=
`
expr
$$
failed + 1
`
;
\
col
=
$$
red
;
res
=
XPASS
;
\
;;
\
*
)
\
col
=
$$
grn
;
res
=
PASS
;
\
;;
\
esac
;
\
elif
test
$$
?
-ne
77
;
then
\
all
=
`
expr
$$
all + 1
`
;
\
case
"
$(XFAIL_TESTS)
"
in
\
*
[
\ \
]
$$
tst[
\ \
]
*
)
\
xfail
=
`
expr
$$
xfail + 1
`
;
\
col
=
$$
lgn
;
res
=
XFAIL
;
\
;;
\
*
)
\
failed
=
`
expr
$$
failed + 1
`
;
\
col
=
$$
red
;
res
=
FAIL
;
\
;;
\
esac
;
\
else
\
skip
=
`
expr
$$
skip + 1
`
;
\
col
=
$$
blu
;
res
=
SKIP
;
\
fi
;
\
echo
"
$$
{col}
$$
res
$$
{std}:
$$
tst"
;
\
done
;
\
if
test
"
$$
all"
-eq
1
;
then
\
tests
=
"test"
;
\
All
=
""
;
\
else
\
tests
=
"tests"
;
\
All
=
"All "
;
\
fi
;
\
if
test
"
$$
failed"
-eq
0
;
then
\
if
test
"
$$
xfail"
-eq
0
;
then
\
banner
=
"
$$
All
$$
all
$$
tests passed"
;
\
else
\
if
test
"
$$
xfail"
-eq
1
;
then
failures
=
failure
;
else
failures
=
failures
;
fi
;
\
banner
=
"
$$
All
$$
all
$$
tests behaved as expected (
$$
xfail expected
$$
failures)"
;
\
fi
;
\
else
\
if
test
"
$$
xpass"
-eq
0
;
then
\
banner
=
"
$$
failed of
$$
all
$$
tests failed"
;
\
else
\
if
test
"
$$
xpass"
-eq
1
;
then
passes
=
pass
;
else
passes
=
passes
;
fi
;
\
banner
=
"
$$
failed of
$$
all
$$
tests did not behave as expected (
$$
xpass unexpected
$$
passes)"
;
\
fi
;
\
fi
;
\
dashes
=
"
$$
banner"
;
\
skipped
=
""
;
\
if
test
"
$$
skip"
-ne
0
;
then
\
if
test
"
$$
skip"
-eq
1
;
then
\
skipped
=
"(
$$
skip test was not run)"
;
\
else
\
skipped
=
"(
$$
skip tests were not run)"
;
\
fi
;
\
test
`
echo
"
$$
skipped"
|
wc
-c
`
-le
`
echo
"
$$
banner"
|
wc
-c
`
||
\
dashes
=
"
$$
skipped"
;
\
fi
;
\
report
=
""
;
\
if
test
"
$$
failed"
-ne
0
&&
test
-n
"
$(PACKAGE_BUGREPORT)
"
;
then
\
report
=
"Please report to
$(PACKAGE_BUGREPORT)
"
;
\
test
`
echo
"
$$
report"
|
wc
-c
`
-le
`
echo
"
$$
banner"
|
wc
-c
`
||
\
dashes
=
"
$$
report"
;
\
fi
;
\
dashes
=
`
echo
"
$$
dashes"
|
sed
s/./
=
/g
`
;
\
if
test
"
$$
failed"
-eq
0
;
then
\
echo
"
$$
grn
$$
dashes"
;
\
else
\
echo
"
$$
red
$$
dashes"
;
\
fi
;
\
echo
"
$$
banner"
;
\
test
-z
"
$$
skipped"
||
echo
"
$$
skipped"
;
\
test
-z
"
$$
report"
||
echo
"
$$
report"
;
\
echo
"
$$
dashes
$$
std"
;
\
test
"
$$
failed"
-eq
0
;
\
else
:
;
fi
distdir
:
$(DISTFILES)
@
srcdirstrip
=
`
echo
"
$(srcdir)
"
|
sed
's/[].[^$$\\*]/\\\\&/g'
`
;
\
topsrcdirstrip
=
`
echo
"
$(top_srcdir)
"
|
sed
's/[].[^$$\\*]/\\\\&/g'
`
;
\
...
...
@@ -2437,7 +2345,6 @@ distdir: $(DISTFILES)
fi
;
\
done
check-am
:
all-am
$(MAKE)
$(AM_MAKEFLAGS)
check-TESTS
check
:
check-am
all-am
:
Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
installdirs
:
...
...
@@ -2549,10 +2456,9 @@ uninstall-am: uninstall-agentDATA uninstall-binSCRIPTS \
uninstall-initdSCRIPTS uninstall-libexecPROGRAMS
\
uninstall-systemdsystemunitDATA
.MAKE
:
check-am install-am install-data-am install-exec-am
\
install-strip
.MAKE
:
install-am install-data-am install-exec-am install-strip
.PHONY
:
CTAGS GTAGS all all-am check check-
TESTS check-
am clean
\
.PHONY
:
CTAGS GTAGS all all-am check check-am clean
\
clean-dbus_daemon_execPROGRAMS clean-generic
\
clean-libexecPROGRAMS clean-libtool clean-local
\
clean-noinstPROGRAMS ctags distclean distclean-compile
\
...
...
bus/config-parser-trivial.c
View file @
201e26f2
...
...
@@ -188,7 +188,7 @@ bus_config_parser_start_element (BusConfigParser *parser,
default:
{
/* we really don't care about the others... */
_dbus_verbose
(
" START We dont care about '%s' type '%i'
\n
"
,
element_name
,
parser
->
type
);
_dbus_verbose
(
" START We don
'
t care about '%s' type '%i'
\n
"
,
element_name
,
parser
->
type
);
break
;
}
}
...
...
@@ -289,7 +289,7 @@ bus_config_parser_content (BusConfigParser *parser,
default:
{
/* we don't care about the others... really */
_dbus_verbose
(
" CONTENTS We don
t care
'%s' type '%i'
\n
"
,
_dbus_string_get_const_data
(
&
content_sane
),
parser
->
type
);
_dbus_verbose
(
" CONTENTS We don
't care about
'%s' type '%i'
\n
"
,
_dbus_string_get_const_data
(
&
content_sane
),
parser
->
type
);
break
;
}
}
...
...
bus/config-parser.c
View file @
201e26f2
...
...
@@ -3395,6 +3395,10 @@ static const char *test_system_service_dir_matches[] =
"/testusr/testshare/dbus-1/system-services"
,
#endif
DBUS_DATADIR
"/dbus-1/system-services"
,
#ifdef DBUS_UNIX
"/lib/dbus-1/system-services"
,
#endif
#ifdef DBUS_WIN
NULL
,
#endif
...
...
bus/policy.c
View file @
201e26f2
...
...
@@ -403,8 +403,8 @@ list_allows_user (dbus_bool_t def,
}
else
if
(
rule
->
type
==
BUS_POLICY_RULE_GROUP
)
{
_dbus_verbose
(
"List %p group rule
uid="
DBUS_U
ID_FORMAT
"
\n
"
,
list
,
rule
->
d
.
user
.
u
id
);
_dbus_verbose
(
"List %p group rule
gid="
DBUS_G
ID_FORMAT
"
\n
"
,
list
,
rule
->
d
.
group
.
g
id
);
if
(
rule
->
d
.
group
.
gid
==
DBUS_GID_UNSET
)
;
/* '*' wildcard */
...
...
cmake/CMakeLists.txt
View file @
201e26f2
...
...
@@ -98,6 +98,8 @@ endif(NOT WIN32)
#AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)
OPTION
(
DBUS_DISABLE_ASSERTS
"Disable assertion checking"
OFF
)
option
(
DBUS_ENABLE_STATS
"enable bus daemon usage statistics"
OFF
)
# do config checks
INCLUDE
(
ConfigureChecks.cmake
)
...
...
@@ -557,6 +559,7 @@ message(" Building unit tests: ${DBUS_BUILD_TESTS} "
message
(
" Building verbose mode:
${
DBUS_ENABLE_VERBOSE_MODE
}
"
)
message
(
" Building w/o assertions:
${
DBUS_DISABLE_ASSERTS
}
"
)
message
(
" Building w/o checks:
${
DBUS_DISABLE_CHECKS
}
"
)
message
(
" Building bus stats API:
${
DBUS_ENABLE_STATS
}
"
)
message
(
" installing system libs:
${
DBUS_INSTALL_SYSTEM_LIBS
}
"
)
#message(" Building SELinux support: ${have_selinux} ")
#message(" Building dnotify support: ${have_dnotify} ")
...
...
cmake/bus/CMakeLists.txt
View file @
201e26f2
...
...
@@ -74,6 +74,12 @@ set (BUS_SOURCES
${
XML_SOURCES
}
${
DIR_WATCH_SOURCE
}
)
if
(
DBUS_ENABLE_STATS
)
list
(
APPEND BUS_SOURCES
${
BUS_DIR
}
/stats.c
${
BUS_DIR
}
/stats.h
)
endif
()
include_directories
(
${
XML_INCLUDE_DIR
}
)
...
...
cmake/config.h.cmake
View file @
201e26f2
...
...
@@ -25,6 +25,7 @@
#cmakedefine DBUS_MICRO_VERSION @DBUS_MICRO_VERSION@
#cmakedefine DBUS_VERSION ((@DBUS_MAJOR_VERSION@ << 16) | (@DBUS_MINOR_VERSION@ << 8) | (@DBUS_MICRO_VERSION@))
#cmakedefine DBUS_VERSION_STRING "@DBUS_VERSION_STRING@"
#cmakedefine DBUS_ENABLE_STATS
#define VERSION DBUS_VERSION_STRING
...
...
cmake/readme-cmake.txt
deleted
100644 → 0
View file @
fbe6c26a
This directory contains configuration files for the cmake build system
Requirements
------------
- cmake version >= 2.4.4 see http://www.cmake.org
- installed libxml2 or libexpat
Building
--------
unix
1. install cmake and libxml or libexpat
2. get dbus sources
3. mkdir dbus-build
4. cd dbus-build
5. cmake <dbus-src-root>/cmake or cmake -DDBUS_USE_EXPAT=on <dbus-src-root>/cmake in case libexpat should de used
5. make
6. make install
win32-mingw
1. install cmake and libxml or libexpat in <ProgramDir>\gnuwin32
2. get dbus sources
3. mkdir dbus-build
4. cd dbus-build
5. cmake -G "MinGW Makefiles" <dbus-src-root>/cmake
6. make
7. make install
win32-msvc
1. install cmake and libxml or libexpat in <ProgramDir>\gnuwin32
2. get dbus sources
3. mkdir dbus-build
4. cd dbus-build
5. cmake -G <msvc available target, see cmake --help for a list> <dbus-src-root>/cmake
6. make
7. make install
A list of all available build options could be find in the file ../README.
configure
View file @
201e26f2
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for dbus 1.4.1
2
.
# Generated by GNU Autoconf 2.68 for dbus 1.4.1
4
.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus>.
#
...
...
@@ -571,8 +571,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME
=
'dbus'
PACKAGE_TARNAME
=
'dbus'
PACKAGE_VERSION
=
'1.4.1
2
'
PACKAGE_STRING
=
'dbus 1.4.1
2
'
PACKAGE_VERSION
=
'1.4.1
4
'
PACKAGE_STRING
=
'dbus 1.4.1
4
'
PACKAGE_BUGREPORT
=
'https://bugs.freedesktop.org/enter_bug.cgi?product=dbus'
PACKAGE_URL
=
''
...
...
@@ -1484,7 +1484,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat
<<
_ACEOF
\`configure' configures dbus 1.4.1
2
to adapt to many kinds of systems.
\`configure' configures dbus 1.4.1
4
to adapt to many kinds of systems.
Usage:
$0
[OPTION]... [VAR=VALUE]...
...
...
@@ -1558,7 +1558,7 @@ fi
if
test
-n
"
$ac_init_help
"
;
then
case
$ac_init_help
in
short
|
recursive
)
echo
"Configuration of dbus 1.4.1
2
:"
;;
short
|
recursive
)
echo
"Configuration of dbus 1.4.1
4
:"
;;
esac
cat
<<
\
_ACEOF
...
...
@@ -1736,7 +1736,7 @@ fi
test
-n
"
$ac_init_help
"
&&
exit
$ac_status
if
$ac_init_version
;
then
cat
<<
\
_ACEOF
dbus configure 1.4.1
2
dbus configure 1.4.1
4
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
...
...
@@ -2450,7 +2450,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by dbus
$as_me
1.4.1
2
, which was
It was created by dbus
$as_me
1.4.1
4
, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0
$@
...
...
@@ -3342,7 +3342,7 @@ fi
# Define the identity of the package.
PACKAGE
=
'dbus'
VERSION
=
'1.4.1
2
'
VERSION
=
'1.4.1
4
'
cat
>>
confdefs.h
<<
_ACEOF
...
...
@@ -3539,8 +3539,8 @@ LT_AGE=5
DBUS_MAJOR_VERSION
=
1
DBUS_MINOR_VERSION
=
4
DBUS_MICRO_VERSION
=
1
2
DBUS_VERSION
=
1.4.1
2
DBUS_MICRO_VERSION
=
1
4
DBUS_VERSION
=
1.4.1
4
...
...
@@ -20758,6 +20758,9 @@ case $host_os in
solaris
*
)
# Solaris' C library apparently needs these runes to be threadsafe...
CFLAGS
=
"
$CFLAGS
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
# ... and this opt-in to get file descriptor passing support
CFLAGS
=
"
$CFLAGS
-D_XOPEN_SOURCE=500"
;;
esac
### Doxygen Documentation
...
...
@@ -20838,7 +20841,6 @@ fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$enable_doxygen_docs
"
>
&5
$as_echo
"
$enable_doxygen_docs
"
>
&6
;
}
XSLTPROC
=
false
for
ac_prog
in
xsltproc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
...
...
@@ -20881,7 +20883,7 @@ fi
test
-n
"
$XSLTPROC
"
&&
break
done
if
test
"
$XSLTPROC
"
!=
false
;
then
if
test
"
x
$XSLTPROC
"
!=
"x"
;
then
DBUS_HAVE_XSLTPROC_TRUE
=
DBUS_HAVE_XSLTPROC_FALSE
=
'#'
else
...
...
@@ -22268,7 +22270,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by dbus
$as_me
1.4.1
2
, which was
This file was extended by dbus
$as_me
1.4.1
4
, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES =
$CONFIG_FILES
...
...
@@ -22334,7 +22336,7 @@ _ACEOF
cat
>>
$CONFIG_STATUS
<<
_ACEOF
|| ac_write_fail=1
ac_cs_config="`
$as_echo
"
$ac_configure_args
" | sed 's/^ //; s/[\\""\`\
$]
/\\\\&/g'`"
ac_cs_version="\\
dbus config.status 1.4.1
2
dbus config.status 1.4.1
4
configured by
$0
, generated by GNU Autoconf 2.68,
with options \\"\
$ac_cs_config
\\"
...
...
configure.ac
View file @
201e26f2
...
...
@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
m4_define([dbus_major_version], [1])
m4_define([dbus_minor_version], [4])
m4_define([dbus_micro_version], [1
2
])
m4_define([dbus_micro_version], [1
4
])
m4_define([dbus_version],
[dbus_major_version.dbus_minor_version.dbus_micro_version])
AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus])
...
...
@@ -1231,6 +1231,9 @@ case $host_os in
solaris*)
# Solaris' C library apparently needs these runes to be threadsafe...
CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
# ... and this opt-in to get file descriptor passing support
CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
;;
esac
### Doxygen Documentation
...
...
@@ -1262,9 +1265,8 @@ fi
AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes)
AC_MSG_RESULT($enable_doxygen_docs)
XSLTPROC=false
AC_CHECK_PROGS([XSLTPROC], [xsltproc])
AM_CONDITIONAL(
DBUS_HAVE_XSLTPROC, test "$XSLTPROC" != false
)
AM_CONDITIONAL(
[DBUS_HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]
)
### XML Documentation
...
...
dbus/Makefile.am
View file @
201e26f2
...
...
@@ -269,20 +269,13 @@ libdbus_internal_la_CPPFLAGS = -DDBUS_STATIC_BUILD
libdbus_internal_la_LIBADD
=
$(DBUS_CLIENT_LIBS)
libdbus_internal_la_LDFLAGS
=
$(export_symbols_internal)
@R_DYNAMIC_LDFLAG@
## note that TESTS has special meaning (stuff to use in make check)
## so if adding tests not to be run in make check, don't add them to
## TESTS
noinst_PROGRAMS
=
if
DBUS_BUILD_TESTS
TESTS_ENVIRONMENT
=
DBUS_TEST_DATA
=
$(top_builddir)
/test/data
DBUS_TEST_HOMEDIR
=
$(top_builddir)
/dbus
TESTS
=
dbus-test
else
TESTS
=
# We can't actually run this til we've reached test/
noinst_PROGRAMS
+=
dbus-test
endif
## we use noinst_PROGRAMS not check_PROGRAMS so that we build
## even when not doing "make check"
noinst_PROGRAMS
=
$(TESTS)
dbus_test_SOURCES
=
\
dbus-test-main.c
...
...
dbus/Makefile.in
View file @
201e26f2
...
...
@@ -37,8 +37,10 @@ POST_UNINSTALL = :
build_triplet
=
@build@
host_triplet
=
@host@
@DBUS_WIN_FALSE@
libdbus_1_la_DEPENDENCIES
=
$(am__DEPENDENCIES_1)
@DBUS_BUILD_TESTS_TRUE@
TESTS
=
dbus-test
$(EXEEXT)
noinst_PROGRAMS
=
$(am__EXEEXT_1)
# We can't actually run this til we've reached test/
@DBUS_BUILD_TESTS_TRUE@
am__append_1
=
dbus-test
subdir
=
dbus
DIST_COMMON
=
$(dbusinclude_HEADERS)
$(srcdir)
/Makefile.am
\
$(srcdir)
/Makefile.in
$(srcdir)
/dbus-arch-deps.h.in
\
...
...
@@ -342,8 +344,6 @@ DIST_SOURCES = $(am__libdbus_1_la_SOURCES_DIST) \
HEADERS
=
$(dbusinclude_HEADERS)
$(nodist_dbusarchinclude_HEADERS)
ETAGS
=
etags
CTAGS
=
ctags
am__tty_colors
=
\
red
=
;
grn
=
;
lgn
=
;
blu
=
;
std
=
DISTFILES
=
$(DIST_COMMON)
$(DIST_SOURCES)
$(TEXINFOS)
$(EXTRA_DIST)
ACLOCAL
=
@ACLOCAL@
AMTAR
=
@AMTAR@
...
...
@@ -782,7 +782,6 @@ libdbus_1_la_LDFLAGS = $(export_symbols) -version-info $(LT_CURRENT):$(LT_REVISI
libdbus_internal_la_CPPFLAGS
=
-DDBUS_STATIC_BUILD
libdbus_internal_la_LIBADD
=
$(DBUS_CLIENT_LIBS)
libdbus_internal_la_LDFLAGS
=
$(export_symbols_internal)
@R_DYNAMIC_LDFLAG@
@DBUS_BUILD_TESTS_TRUE@
TESTS_ENVIRONMENT
=
DBUS_TEST_DATA
=
$(top_builddir)
/test/data
DBUS_TEST_HOMEDIR
=
$(top_builddir)
/dbus
dbus_test_SOURCES
=
\
dbus-test-main.c
...
...
@@ -2175,98 +2174,6 @@ GTAGS:
distclean-tags
:
-
rm
-f
TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS
:
$(TESTS)
@
failed
=
0
;
all
=
0
;
xfail
=
0
;
xpass
=
0
;
skip
=
0
;
\
srcdir
=
$(srcdir)
;
export
srcdir
;
\
list
=
'
$(TESTS)
'
;
\
$(am__tty_colors)
;
\
if
test
-n
"
$$
list"
;
then
\
for
tst
in
$$
list
;
do
\
if
test
-f
./
$$
tst
;
then
dir
=
./
;
\
elif
test
-f
$$
tst
;
then
dir
=
;
\
else
dir
=
"
$(srcdir)
/"
;
fi
;
\
if
$(TESTS_ENVIRONMENT)
$$
{
dir
}
$$
tst
;
then
\
all
=
`
expr
$$
all + 1
`
;
\
case
"
$(XFAIL_TESTS)
"
in
\
*
[
\ \
]
$$
tst[
\ \
]
*
)
\
xpass
=
`
expr
$$
xpass + 1
`
;
\
failed
=
`
expr
$$
failed + 1
`
;
\
col
=
$$
red
;
res
=
XPASS
;
\
;;
\
*
)
\
col
=
$$
grn
;
res
=
PASS
;
\
;;
\
esac
;
\
elif
test
$$
?
-ne
77
;
then
\
all
=
`
expr
$$
all + 1
`
;
\
case
"
$(XFAIL_TESTS)
"
in
\
*
[
\ \
]
$$
tst[
\ \
]
*
)
\
xfail
=
`
expr
$$
xfail + 1
`
;
\
col
=
$$
lgn
;
res
=
XFAIL
;
\
;;
\
*
)
\
failed
=
`
expr
$$
failed + 1
`
;
\
col
=
$$
red
;
res
=
FAIL
;
\
;;
\